Re: Next upload 2008-05-06 (dpkg 1.14.19)

[Christian Perrier]

Quoting Guillem Jover ([EMAIL PROTECTED]):

> If you have a cloned repo w/o pending commits, just do:
> 
>   $ git co -b lenny origin/lenny
> 
> and then operate normally.


That branch will be used as reference for the so-called "D-I level 5"
statistics, as dpkg l10n is counted there...

Translators, just leave me a few days to set that up so that you can
get the material from http://d-i.alioth.debian.org/l10n-stats.

Then, I'll send a formal "call for translation updates" as well.

Please note that neither dselect translations (dselect/po), nor
scripts translations (scripts/po) nor documentation translations
(man/po) will be available through this way. For those, you'll have to
dig into the git repository.




signature.asc
Description: Digital signature

Re: Next upload 2008-05-06 (dpkg 1.14.19)

[Sven Joachim]

On 2008-04-29 06:07 +0200, Guillem Jover wrote:

> If you have a cloned repo w/o pending commits, just do:
>
>   $ git co -b lenny origin/lenny

That should read "checkout" instead of "co", git told me that 'co' is
not a git command.

> I've updated the instructions for translators at:
>
>   

I've updated the wiki to say checkout instead of co.

Regards,
Sven


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: Please verify translations before committing

[Sven Joachim]

On 2008-04-29 07:15 +0200, Peter Karlsson wrote:

> I was recommended somewhere to change from using
>
>   msgfmt -vvv -o /dev/null sv.po
>
> to
>
>   msgfmt --statistics sv.po
>
> but it seems that the latter does not catch the mistake I made, so I'm
> back to using the first form to make sure I will not commit broken
> files again.

You should use the -c switch, that is the one that reports mistakes:

  msgfmt -c -o /dev/null sv.po

> As to the manual page translation that I have had some problems with
> before (the matching of "<"s and ">"s), I've taken care to
> double-check all my changes now. I still am unable to build manual
> pages on Etch, and I haven't got a working Sid setup at the moment, so
> I can't test it as extensively as I would like to.

Maybe you or someone else can backport po4a to Etch?  Judging by the
build dependencies, a simple rebuild might be sufficient.

Regards,
Sven


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: Bug#478295: Sha1 and sha256 in .changes and .dsc file

[Raphael Hertzog]

On Tue, 29 Apr 2008, Kurt Roeckx wrote:
> Various other software, like debsign and dak, had to be changed.  The
> policy is not just about what the general package maintainer should
> know, it's also how our tools should interact.
> 
> If you don't think the format of the .dsc and .changes should be
> mentioned in the policy, I suggest you also remove the current one.
> 
> dpkg-source(1) has minimal documentation about the different source
> versions, but doesn't seem to mention anything about the format
> of the .dsc or .changes file.

That said, I would like dpkg to provide the required documentation
directly. If anyone feels like writing it, that would be great and I'd
happily integrate it.

In fact, there's an item concerning this in our TODO list:
http://git.debian.org/?p=dpkg/dpkg.git;a=blob;f=TODO;hb=master

Cheers,
-- 
Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Re: Next upload 2008-05-06 (dpkg 1.14.19)

[Guillem Jover]

On Tue, 2008-04-29 at 14:05:51 +0200, Sven Joachim wrote:
> On 2008-04-29 06:07 +0200, Guillem Jover wrote:
> 
> > If you have a cloned repo w/o pending commits, just do:
> >
> >   $ git co -b lenny origin/lenny
> 
> That should read "checkout" instead of "co", git told me that 'co' is
> not a git command.

Oh, right, I've that defined as a git alias everywhere.

> > I've updated the instructions for translators at:
> >
> >   
> 
> I've updated the wiki to say checkout instead of co.

Thanks!

regards,
guillem


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Appending unstable - typo in git.pm:309?

[Helge Kreutzmann]

Hello,
looking at the source, the string
   unstable to append to %s
probably means
   unable to append to %s

Could you update the lenny branch accordingly after fixing?

Greetings

   Helge

P.S. The nice git-wrapper script does not work on the lenny branch, is
 it acceptable to run "git commit files" and "git push" (with only
 one commit before the push) on this branch?
-- 
  Dr. Helge Kreutzmann [EMAIL PROTECTED]
   Dipl.-Phys.   http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
   Help keep free software "libre": http://www.ffii.de/


signature.asc
Description: Digital signature

Re: Appending unstable - typo in git.pm:309?

[Raphael Hertzog]

Hi,

On Tue, 29 Apr 2008, Helge Kreutzmann wrote:
> Hello,
> looking at the source, the string
>unstable to append to %s
> probably means
>unable to append to %s
> 
> Could you update the lenny branch accordingly after fixing?

I pushed a fix in the lenny branch, it will be merged in the master
branch later on (probably right after the upload).

> P.S. The nice git-wrapper script does not work on the lenny branch, is
>  it acceptable to run "git commit files" and "git push" (with only
>  one commit before the push) on this branch?

Please find attached an updated version that should also work on the lenny
branch (and any other branch which has a origin/$branch counterpart).

Thanks for reporting!

Cheers,
-- 
Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/
#!/bin/sh

# Copyright 2007-2008 Raphael Hertzog <[EMAIL PROTECTED]>
#
# This program is free software; you may redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This is distributed in the hope that it will be useful, but without
# any warranty; without even the implied warranty of merchantability or
# fitness for a particular purpose. See the GNU General Public License
# for more details.
#
# A copy of the GNU General Public License is available as
# /usr/share/common-licenses/GPL in the Debian GNU/Linux distribution
# or on the World Wide Web at http://www.gnu.org/copyleft/gpl.html.
# You can also obtain it by writing to the Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.

# This script is only meant to be used in the master branch of dpkg
# This branch is created by default by a git clone
# ssh://git.debian.org/git/dpkg/dpkg.git

# Git 1.5.3 is required (for git-stash)

has_changes_in_index() {
# git-diff --quiet returns 1 when there are changes
if git diff --quiet --cached; then
return 1
else
return 0
fi
}
has_changes_in_working_tree() {
# git-diff --quiet returns 1 when there are changes
if git diff --quiet; then
return 1
else
return 0
fi
}
is_uptodate() {
unmerged=`git rev-list origin/$branch ^HEAD`
if test -z "$unmerged"; then
return 0
else
return 1
fi
}
has_unpushed_commits() {
unpushed=`git rev-list HEAD ^origin/$branch`
if test -n "$unpushed"; then
return 0
else
return 1
fi
}

test -d .git || {
echo "This script must be called from the root of dpkg's git repository." 
>&2
exit
}
branch=`git branch | grep ^* | awk '{print $2}'`
if ! git branch -r | grep -q " origin/$branch$"; then
echo "This script must be called from a branch which also exist on the 
remote side." >&2
echo "The current branch is '$branch' but 'origin/$branch' doesn't exist." 
>&2
exit
fi

case $1 in
update)
git fetch --quiet origin

if has_unpushed_commits; then
echo "** You have local commits that were not pushed to the remote 
repository."
if is_uptodate; then
echo "** They are still OK to be pushed."
else
echo "** The remote repository has evolved. Rebasing your work."
$0 rebase
fi
else
if ! is_uptodate; then
echo "** The remote repository has changed. Trying to update."
git merge origin/$branch
result=$?
if [ $result -eq 0 ]; then
echo "** The repository has been updated."
elif [ $result -eq 1 ]; then
echo "** The repository has been updated but there have 
been conflicts:"
git ls-files --unmerged | awk '{print $4}' | uniq -c
else
echo "** The automatic merge failed. Trying another 
strategy."
echo "** Pushing local changes aside with git stash."
git stash save "WIP saved by dpkg-vcs"
echo "** Merging remote changes, should result in 
fast-forward."
git merge origin/$branch
echo "** Reapplying local changes with git stash apply."
git stash apply
result=$?
if [ $result -eq 0 ]; then
echo "** Local changes have been merged."
elif [ $result -eq 1 ]; then
echo "** Local changes have been merged but there have 
been conflicts:"
git ls-files --unmerged | awk '{print $4}' | uniq -c
else
echo "** git stash apply failed badly and returned 
$result."
echo "** You're on your own..."
exit 2
fi
fi