Debian Bug report logs - #578752
apply: handle spaces in filenames from traditional patches

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Giuseppe Iuculano <iuculano@debian.org>

To: Debian Bug Tracking System <submit@bugs.debian.org>

Subject: git-import-dsc: Error importing chromium-browser dsc

Date: Thu, 22 Apr 2010 15:48:12 +0200

Package: git-buildpackage
Version: 0.4.65
Severity: normal
File: /usr/bin/git-import-dsc

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

It seems git-import-dsc fails with chromium-browser in ubuntu:

# git-import-dsc chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
No git repository found, creating one.
Initialized empty Git repository in /home/debian/chromium/chromium/chromium-browser/.git/
tag upstream/5.0.342.9.r43360 not found, importing Upstream tarball
pristine-tar: committed chromium-browser_5.0.342.9~r43360.orig.tar.gz.delta to branch pristine-tar
Merging to master
Already up-to-date.
error: patch failed: debian/licenses/LICENSE.global:0
error: debian/licenses/LICENSE.global: patch does not apply
Error import /home/debian/chromium/chromium/chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz: 256



To reproduce this issue: dget https://edge.launchpad.net/ubuntu/+archive/primary/+files/chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc

- -- System Information:
Debian Release: squeeze/sid
  APT prefers testing-proposed-updates
  APT policy: (990, 'testing-proposed-updates'), (990, 'testing'), (990, 'stable'), (500, 'proposed-updates'), (500, 'oldstable'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-3-686 (SMP w/2 CPU cores)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git-buildpackage depends on:
ii  devscripts                   2.10.61     scripts to make the life of a Debi
ii  git [git-core]               1:1.7.0.5-1 fast, scalable, distributed revisi
ii  git-core                     1:1.7.0.5-1 fast, scalable, distributed revisi
ii  python                       2.5.4-9     An interactive high-level object-o
ii  python-dateutil              1.4.1-3     powerful extensions to the standar
ii  python-support               1.0.7       automated rebuilding support for P

Versions of packages git-buildpackage recommends:
ii  pristine-tar                  1.01       regenerate pristine tarballs

Versions of packages git-buildpackage suggests:
ii  git-load-dirs                 1.1.8      Import upstream archives into git

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvQU5gACgkQNxpp46476apUAACdEzvjYdn+jZvadFwatKpV7Aks
bJcAnjws7qxYILT0Q0SHXnqE275u/BMN
=8mtA
-----END PGP SIGNATURE-----

Message #10 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Guido Günther <agx@sigxcpu.org>

To: Giuseppe Iuculano <iuculano@debian.org>, 578752@bugs.debian.org

Subject: Re: Bug#578752: git-import-dsc: Error importing chromium-browser dsc

Date: Thu, 22 Apr 2010 18:35:21 +0200

reassign 578752 git
found 578752 1:1.7.0.4-2
affects 578752 git-buildpackage
retirle 578752 git-apply: doesn't handle filenames with spaces correctly
Thanks

Hi Giuseppe,

On Thu, Apr 22, 2010 at 03:48:12PM +0200, Giuseppe Iuculano wrote:
> Package: git-buildpackage
> Version: 0.4.65
> Severity: normal
> File: /usr/bin/git-import-dsc
> 
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Hi,
> 
> It seems git-import-dsc fails with chromium-browser in ubuntu:
> 
> # git-import-dsc chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
> No git repository found, creating one.
> Initialized empty Git repository in /home/debian/chromium/chromium/chromium-browser/.git/
> tag upstream/5.0.342.9.r43360 not found, importing Upstream tarball
> pristine-tar: committed chromium-browser_5.0.342.9~r43360.orig.tar.gz.delta to branch pristine-tar
> Merging to master
> Already up-to-date.
> error: patch failed: debian/licenses/LICENSE.global:0
> error: debian/licenses/LICENSE.global: patch does not apply
> Error import /home/debian/chromium/chromium/chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz: 256

The bug is actually in git-apply. To reproduce:

Get the dsc and import it:

	dget https://edge.launchpad.net/ubuntu/+archive/primary/+files/chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
	mkdir chromium-browser	
	cd chromium-browser	
	git init
	git-import-orig ../chromium-browser_5.0.342.9~r43360.orig.tar.gz

Try applying the patch using patch:

	gunzip -c ../chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz | patch -p1 --dry-run	

Works. Now use git-apply:

	gunzip -c ../chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz | git apply  --check --index --apply --whitespace=nowarn -

Fails with:

error: patch failed: debian/licenses/LICENSE.global:0
error: debian/licenses/LICENSE.global: patch does not apply

The issue is that git-apply doesn't handle the filenames containing
spaces correctly like

  'debian/licenses/LICENSE.global BSD-style Chromium' and
  'debian/licenses/LICENSE.Apache (v2.0)'.

So I''m reassigning to git.
Cheers,
 -- Guido
	
> 
> 
> To reproduce this issue: dget https://edge.launchpad.net/ubuntu/+archive/primary/+files/chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
> 
> - -- System Information:
> Debian Release: squeeze/sid
>   APT prefers testing-proposed-updates
>   APT policy: (990, 'testing-proposed-updates'), (990, 'testing'), (990, 'stable'), (500, 'proposed-updates'), (500, 'oldstable'), (500, 'unstable'), (1, 'experimental')
> Architecture: i386 (i686)
> 
> Kernel: Linux 2.6.32-3-686 (SMP w/2 CPU cores)
> Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> 
> Versions of packages git-buildpackage depends on:
> ii  devscripts                   2.10.61     scripts to make the life of a Debi
> ii  git [git-core]               1:1.7.0.5-1 fast, scalable, distributed revisi
> ii  git-core                     1:1.7.0.5-1 fast, scalable, distributed revisi
> ii  python                       2.5.4-9     An interactive high-level object-o
> ii  python-dateutil              1.4.1-3     powerful extensions to the standar
> ii  python-support               1.0.7       automated rebuilding support for P
> 
> Versions of packages git-buildpackage recommends:
> ii  pristine-tar                  1.01       regenerate pristine tarballs
> 
> Versions of packages git-buildpackage suggests:
> ii  git-load-dirs                 1.1.8      Import upstream archives into git
> 
> - -- no debconf information
> 
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
> 
> iEYEARECAAYFAkvQU5gACgkQNxpp46476apUAACdEzvjYdn+jZvadFwatKpV7Aks
> bJcAnjws7qxYILT0Q0SHXnqE275u/BMN
> =8mtA
> -----END PGP SIGNATURE-----
> 
> 

Message #25 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Jonathan Nieder <jrnieder@gmail.com>

To: Guido Günther <agx@sigxcpu.org>

Cc: Giuseppe Iuculano <iuculano@debian.org>, 578752@bugs.debian.org, git@vger.kernel.org

Subject: filenames with spaces in traditional patches (Re: git-import-dsc: Error importing chromium-browser dsc)

Date: Thu, 22 Apr 2010 12:29:23 -0500

retitle 578752 apply: handle spaces in filenames from traditional patches
tags 578752 + upstream
thanks

Hi,

Guido Günther wrote:
> On Thu, Apr 22, 2010 at 03:48:12PM +0200, Giuseppe Iuculano wrote:

>> error: patch failed: debian/licenses/LICENSE.global:0
>> error: debian/licenses/LICENSE.global: patch does not apply
>> Error import /home/debian/chromium/chromium/chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz: 256
[...]
> 	dget https://edge.launchpad.net/ubuntu/+archive/primary/+files/chromium-browser_5.0.342.9~r43360-0ubuntu2.dsc
[...]
> The issue is that git-apply doesn't handle the filenames containing
> spaces correctly like
> 
>   'debian/licenses/LICENSE.global BSD-style Chromium' and
>   'debian/licenses/LICENSE.Apache (v2.0)'.

Thanks, both.  The problem is in the parse_traditional_path() function
in builtin/apply.c; it simply doesn’t handle paths with spaces.

Posix [1] says:

| The name and last modification time of each file shall be output in
| the following format:
|
| "---[space]%s  %s%s%s", file1, <file1 timestamp>, <file1 frac>, <file1 zone>
| "+++[space]%s  %s%s%s", file2, <file2 timestamp>, <file2 frac>, <file2 zone>
|
| Each <file> field shall be the pathname of the corresponding file
| being compared, or the single character '-' if standard input is
| being compared. However, if the pathname contains a <tab> or a
| <newline>, or if it does not consist entirely of characters taken
| from the portable character set, the behavior is
| implementation-defined.
|
| Each <timestamp> field shall be equivalent to the output from the
| following command:
|
| date '+%Y-%m-%d%H:%M:%S'
|
| without the trailing <newline>
[...]

If this is really describing the format of patches in the wild, that
means we should only look for a tab character to terminate the filename.
If someone ends up wanting to use a non-git patch to change a file with
a tab in its name, well, we can deal with that then. :)

A big downside: this does not cope with copy-and-pasted patches with
tabs transformed to spaces.  The example [2] consists mostly of
file-creation patches, so we can’t look to the repository for hints.
Maybe the space-plus-date-plus-newline sequence should be used as a
delimiter.

Here’s a rough patch to give an idea of where to start.

[1] http://www.opengroup.org/onlinepubs/9699919799/utilities/diff.html#tag_20_34_10_07
[2] https://edge.launchpad.net/ubuntu/+archive/primary/+files/chromium-browser_5.0.342.9~r43360-0ubuntu2.diff.gz

-- 8< --
Subject: apply: handle traditional patches with spaces in filename

According to Posix, the --- and +++ lines of a unified diff always
include a tab after the filename.  By not treating a space as a
terminating character, we get support for filenames with spaces
automatically.

Noticed while patching a program with filenames such as
“LICENSE.Apache (v2.0)”.

Thanks to Giuseppe Iuculano <iuculano@debian.org> for the report
and Guido Günther <agx@sigxcpu.org> for the analysis.

Fixes: http://bugs.debian.org/578752
Breaks: copy-and-pasted patches
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 builtin/apply.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index 771c972..7e1c6b9 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -519,7 +519,7 @@ static int guess_p_value(const char *nameline)
 
 	if (is_dev_null(nameline))
 		return -1;
-	name = find_name(nameline, NULL, 0, TERM_SPACE | TERM_TAB);
+	name = find_name(nameline, NULL, 0, TERM_TAB);
 	if (!name)
 		return -1;
 	cp = strchr(name, '/');
@@ -638,16 +638,16 @@ static void parse_traditional_patch(const char *first, const char *second, struc
 	if (is_dev_null(first)) {
 		patch->is_new = 1;
 		patch->is_delete = 0;
-		name = find_name(second, NULL, p_value, TERM_SPACE | TERM_TAB);
+		name = find_name(second, NULL, p_value, TERM_TAB);
 		patch->new_name = name;
 	} else if (is_dev_null(second)) {
 		patch->is_new = 0;
 		patch->is_delete = 1;
-		name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
+		name = find_name(first, NULL, p_value, TERM_TAB);
 		patch->old_name = name;
 	} else {
-		name = find_name(first, NULL, p_value, TERM_SPACE | TERM_TAB);
-		name = find_name(second, name, p_value, TERM_SPACE | TERM_TAB);
+		name = find_name(first, NULL, p_value, TERM_TAB);
+		name = find_name(second, name, p_value, TERM_TAB);
 		if (has_epoch_timestamp(first)) {
 			patch->is_new = 1;
 			patch->is_delete = 0;
-- 
1.7.1.rc2.8.g5f4cb

Message #34 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Guido Günther <agx@sigxcpu.org>

To: 578752@bugs.debian.org

Subject: Does not affect git-buildpackage if it stops to use git-apply

Date: Sun, 4 Jul 2010 17:12:12 +0200

clone 578752 -1
retitle -1 Shoudn't not use git-apply
affects 578752 -git-buildpackage
thanks

Hi,
this bug won't be an issue for gbp anymore since we'll stop using
git-apply soon.
Cheers,
 -- Guido

Message #43 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Jonathan Nieder <jrnieder@gmail.com>

To: Guido Günther <agx@sigxcpu.org>, 578752@bugs.debian.org

Subject: Re: Bug#578752: Does not affect git-buildpackage if it stops to use git-apply

Date: Sun, 4 Jul 2010 11:16:26 -0500

Hi Guido,

Guido Günther wrote:

> clone 578752 -1
> retitle -1 Shoudn't not use git-apply
> affects 578752 -git-buildpackage
> thanks
> 
> Hi,
> this bug won't be an issue for gbp anymore since we'll stop using
> git-apply soon.

And what will you use instead?  Maybe git apply can copy its
semantics here.

Jonathan

Message #48 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Guido Günther <agx@sigxcpu.org>

To: Jonathan Nieder <jrnieder@gmail.com>

Cc: 578752@bugs.debian.org

Subject: Re: Bug#578752: Does not affect git-buildpackage if it stops to use git-apply

Date: Sun, 4 Jul 2010 19:56:59 +0200

Hi Jonathan,
On Sun, Jul 04, 2010 at 11:16:26AM -0500, Jonathan Nieder wrote:
> Hi Guido,
> 
> Guido Günther wrote:
> 
> > clone 578752 -1
> > retitle -1 Shoudn't not use git-apply
> > affects 578752 -git-buildpackage
> > thanks
> > 
> > Hi,
> > this bug won't be an issue for gbp anymore since we'll stop using
> > git-apply soon.
> 
> And what will you use instead?  Maybe git apply can copy its
> semantics here.
I'm just using plain patch. git-import-dsc changed a bit so I couldn't
even use git-apply anymore, so this issue got resolved by pure
"accident".
 -- Guido

Message #53 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Jonathan Nieder <jrnieder@gmail.com>

To: Guido Günther <agx@sigxcpu.org>

Cc: 578752@bugs.debian.org

Subject: Re: Bug#578752: Does not affect git-buildpackage if it stops to use git-apply

Date: Sun, 4 Jul 2010 13:09:29 -0500

Guido Günther wrote:
> On Sun, Jul 04, 2010 at 11:16:26AM -0500, Jonathan Nieder wrote:

>> And what will you use instead?  Maybe git apply can copy its
>> semantics here.
>
> I'm just using plain patch.

Oh, that makes sense.  Thanks for the explanation.

Jonathan

Message #58 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Jonathan Nieder <jrnieder@gmail.com>

To: Guido Günther <agx@sigxcpu.org>

Cc: Giuseppe Iuculano <iuculano@debian.org>, 578752@bugs.debian.org

Subject: Re: filenames with spaces in traditional patches (Re: git-import-dsc: Error importing chromium-browser dsc)

Date: Tue, 13 Jul 2010 23:58:23 -0500

[Message part 1 (text/plain, inline)]

Jonathan Nieder wrote:

> Maybe the space-plus-date-plus-newline sequence should be used as a
> delimiter.

And here’s how that would work.

Patches are attached, because debbugs seems to handle that best.

Still to do:

 * add tests for ‘-p’ value detection
 * skip tests that require ‘diff -u’ and ‘pr’ when those commands
   are not present.  Or find some other workaround, like
   including output from those commands with the patch.

Thoughts?

Jonathan Nieder (3):
  apply: Split quoted filename handling into new function
  tests: Add test for handling of weird filenames
  apply: Handle traditional patches with space in filename

 builtin/apply.c                  |  251 ++++++++++++++++++++++++++++++++------
 t/t4135-apply-weird-filenames.sh |   73 +++++++++++
 2 files changed, 285 insertions(+), 39 deletions(-)
 create mode 100755 t/t4135-apply-weird-filenames.sh

[01-split-off-easy-case (text/plain, attachment)]

[02-file-creation-tests (text/plain, attachment)]

[03-patch-filename-parser (text/plain, attachment)]

Message #63 received at 578752@bugs.debian.org (full text, mbox, reply):

From: Guido Günther <agx@sigxcpu.org>

To: Jonathan Nieder <jrnieder@gmail.com>

Cc: Giuseppe Iuculano <iuculano@debian.org>, 578752@bugs.debian.org

Subject: Re: filenames with spaces in traditional patches (Re: git-import-dsc: Error importing chromium-browser dsc)

Date: Wed, 21 Jul 2010 18:11:48 +0200

On Tue, Jul 13, 2010 at 11:58:23PM -0500, Jonathan Nieder wrote:
> Jonathan Nieder wrote:
> 
> > Maybe the space-plus-date-plus-newline sequence should be used as a
> > delimiter.
> 
> And here’s how that would work.
> 
> Patches are attached, because debbugs seems to handle that best.
> 
> Still to do:
> 
>  * add tests for ‘-p’ value detection
>  * skip tests that require ‘diff -u’ and ‘pr’ when those commands
>    are not present.  Or find some other workaround, like
>    including output from those commands with the patch.
> 
> Thoughts?
I only skimmed this quickly but this makes sense to me.
 -- Guido

Message #72 received at 578752-close@bugs.debian.org (full text, mbox, reply):

From: Jonathan Nieder <jrnieder@gmail.com>

To: 578752-close@bugs.debian.org

Subject: Bug#578752: fixed in git 1:1.7.4.1-1

Date: Thu, 17 Feb 2011 12:17:30 +0000

Source: git
Source-Version: 1:1.7.4.1-1

We believe that the bug you reported is fixed in the latest version of
git, which is due to be installed in the Debian FTP archive:

git-all_1.7.4.1-1_all.deb
  to main/g/git/git-all_1.7.4.1-1_all.deb
git-arch_1.7.4.1-1_all.deb
  to main/g/git/git-arch_1.7.4.1-1_all.deb
git-core_1.7.4.1-1_all.deb
  to main/g/git/git-core_1.7.4.1-1_all.deb
git-cvs_1.7.4.1-1_all.deb
  to main/g/git/git-cvs_1.7.4.1-1_all.deb
git-daemon-run_1.7.4.1-1_all.deb
  to main/g/git/git-daemon-run_1.7.4.1-1_all.deb
git-doc_1.7.4.1-1_all.deb
  to main/g/git/git-doc_1.7.4.1-1_all.deb
git-email_1.7.4.1-1_all.deb
  to main/g/git/git-email_1.7.4.1-1_all.deb
git-gui_1.7.4.1-1_all.deb
  to main/g/git/git-gui_1.7.4.1-1_all.deb
git-man_1.7.4.1-1_all.deb
  to main/g/git/git-man_1.7.4.1-1_all.deb
git-svn_1.7.4.1-1_all.deb
  to main/g/git/git-svn_1.7.4.1-1_all.deb
git_1.7.4.1-1.diff.gz
  to main/g/git/git_1.7.4.1-1.diff.gz
git_1.7.4.1-1.dsc
  to main/g/git/git_1.7.4.1-1.dsc
git_1.7.4.1.orig.tar.gz
  to main/g/git/git_1.7.4.1.orig.tar.gz
gitk_1.7.4.1-1_all.deb
  to main/g/git/gitk_1.7.4.1-1_all.deb
gitweb_1.7.4.1-1_all.deb
  to main/g/git/gitweb_1.7.4.1-1_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 578752@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jonathan Nieder <jrnieder@gmail.com> (supplier of updated git package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Tue, 15 Feb 2011 19:27:38 -0600
Source: git
Binary: git git-man git-core git-doc git-arch git-cvs git-svn git-email git-daemon-run git-gui gitk gitweb git-all
Architecture: all source
Version: 1:1.7.4.1-1
Distribution: unstable
Urgency: low
Maintainer: Gerrit Pape <pape@smarden.org>
Changed-By: Jonathan Nieder <jrnieder@gmail.com>
Description: 
 git        - fast, scalable, distributed revision control system
 git-all    - fast, scalable, distributed revision control system (all subpacka
 git-arch   - fast, scalable, distributed revision control system (arch interop
 git-core   - fast, scalable, distributed revision control system (obsolete)
 git-cvs    - fast, scalable, distributed revision control system (cvs interope
 git-daemon-run - fast, scalable, distributed revision control system (git-daemon s
 git-doc    - fast, scalable, distributed revision control system (documentatio
 git-email  - fast, scalable, distributed revision control system (email add-on
 git-gui    - fast, scalable, distributed revision control system (GUI)
 git-man    - fast, scalable, distributed revision control system (manual pages
 git-svn    - fast, scalable, distributed revision control system (svn interope
 gitk       - fast, scalable, distributed revision control system (revision tre
 gitweb     - fast, scalable, distributed revision control system (web interfac
Closes: 465776 466471 499002 507476 524309 540001 575917 576887 577471 578752 581691 583693 583699 585725 588103 598245 600566 600785 606975 607044 610423 610481 611608
Changes: 
 git (1:1.7.4.1-1) unstable; urgency=low
 .
   * new upstream release (closes: #600566, #575917, #578752, #583693,
     #583699, #588103, #507476, #540001, #524309, #581691, #600785,
     #577471, #607044, #606975, #610423, #610481).
 .
   [ Anders Kaseorg ]
   * debian/git.docs, debian/rules: deal with RelNotes subdirectory.
   * debian/diff/0007-gitk-Take-only-numeric-...diff: new; gitk: do
     not error out when git version number contains "-rc".
 .
   [ Jonathan Nieder ]
   * add myself as uploader.
   * debian/diff/0003, 0007, 0010-0034: remove, applied upstream.
   * debian/rules: accept patches with .patch suffix, too (thx Anders
     Kaseorg).
   * debian/rules: use patch -N -r- so patch application is idempotent.
   * update debian/copyright.
   * debian/diff/0001-ident-check-etc-mailname...diff: avoid calls to
     gethostbyname when mailname is not an fqdn (closes: #611608).
   * debian/diff/0005-gitk-use-...diff: new; gitk: use standard desktop
     fonts by default.  The appearance for users that already have a
     generated ~/.gitk file is not affected (closes: #466471).
   * debian/diff/0006-gitk-...diff: new; gitk: avoid spurious matches
     in "All fields" search (thx Frédéric Brière, closes: #465776).
   * debian/control: git-cvs: recommend cvs2git for one-time conversions
     (closes: #585725).
   * debian/control: git-core: explain that it still may be needed (thx
     Denis Laxalde).
   * debian/control: gitweb: allow lynx-cur to satisfy dependency on a
     CGI implementation (thx Ivan Shmakov).
   * debian/control, debian/rules: new architecture-independent package
     git-man: manual pages that were previously in the main git package.
   * debian/rules: do not build documentation on autobuilders (closes:
     #499002).
   * debian/control: Build-Depends-Indep: asciidoc, xmlto, docbook-xsl.
   * debian/rules: git-gui: install git-gui--askpass helper to
     /usr/lib/git-core (closes: #598245).
   * debian/rules: git-doc: install symlink to html documentation in
     /usr/share/doc/git (thx Ian Jackson).
   * debian/watch: new; point to upstream sources.
   * debian/implicit: create DEBIAN/md5sums with correct permissions.
   * debian/diff/0003-remove-shebang...diff: new; do not start shell
     libraries with #!/bin/sh.
   * debian/rules: do not try to strip scripts even if they begin
     with "# " in place of "#!".
   * debian/diff/0004-pre-rebase-hook-capture...diff: new;
     hooks/pre-rebase: use a <<HERE document to prevent syntax checkers
     from treating documentation as code.
   * debian/implicit: check for debian/$pkg.doc-base.$docid.
   * debian/git-doc.doc-base.*: new; catalog provided documentation.
   * debian/implicit: check for debian/$pkg.lintian-overrides.
   * debian/git.lintian-overrides: new; document some deviations from
     lintian guidelines.
   * debian/control: Standards-Version: 3.9.1.0.
 .
   * debian/git.README.Debian: server logs go in /var/log/apache2.
   * debian/diff/0002-Revert-Merge-branch-jn-gitweb...diff: remove.
   * debian/diff/0006, 0008, 0009-instaweb...diff: remove, no longer
     needed.
   * debian/rules, debian/control: move gitweb script to the main git
     package for use by instaweb; make gitweb into a configuration
     package.
   * debian/gitweb.NEWS.Debian, debian/git.README.Debian,
     debian/gitweb.conf: static files moved to /usr/share/gitweb/static.
   * debian/gitweb.conf: disable rename patches (@diff_opts = ()).
   * debian/diff/0001-Revert-gitweb-...diff: remove; no longer needed.
   * debian/rules: gitweb: move gitweb.cgi script to /usr/share;
     add a symlink at /usr/lib/cgi-bin/gitweb.cgi for compatibility.
 .
   * debian/git.emacsen-install, debian/rules, debian/git.postinst,
     debian/git.prerm: put emacs support files in /usr/share/git-core
     instead of /usr/share/doc/git/contrib.
   * debian/implicit: check for arbitrary debian/$pkg.README.*, not just
     README.source and README.Debian.
   * debian/git.README.emacs: new; introduction to the emacs support
     (text taken from contrib/emacs/README).
 .
   [ Kevin Ryde ]
   * debian/rules, debian/git.emacsen-*, debian/git.postinst,
     debian/git.prerm: Make M-x git-status and git-blame modes available
     with emacs23 (closes: #576887).
Checksums-Sha1: 
 454abccda82b0e5ae7d82c60df95f5fe30d51e69 1436 git_1.7.4.1-1.dsc
 2c9c9ac6dd6ae284df2282bb0c4145c0ae0e7e35 3266745 git_1.7.4.1.orig.tar.gz
 a2cdc8ed70b6c7b7c81050db851eed4ae7c46d98 402484 git_1.7.4.1-1.diff.gz
 96abd1b428884ff1658e25460c78990f249dd566 1639718 git-doc_1.7.4.1-1_all.deb
 6c4e9a61f6e7e50e626ad6666863eb14aa3115f3 386026 git-arch_1.7.4.1-1_all.deb
 452028cba6abaa84d5f3cdf94402d5a6b47455d8 457992 git-cvs_1.7.4.1-1_all.deb
 1aa1567131b1f52c30b43b9e9954afb1dd56a9d7 437754 git-svn_1.7.4.1-1_all.deb
 c1810309d276d79e3899ac85c9ff8dc022ee89b0 373080 git-daemon-run_1.7.4.1-1_all.deb
 e0500154020a1339bbab0d7db6af8d356676540b 390972 git-email_1.7.4.1-1_all.deb
 49b76d65cc7c06a16a9c80931b2eccd7d4f7a241 633922 git-gui_1.7.4.1-1_all.deb
 c5da6c0326defee5a2772b32f9c2b529757ea555 498734 gitk_1.7.4.1-1_all.deb
 4aa64839c62ac780e1e0c3720ac678e7733f3286 383134 gitweb_1.7.4.1-1_all.deb
 397d1bb3abf61e4f43951f5b8ad4574e31ddc16e 371460 git-all_1.7.4.1-1_all.deb
 ffd6bd7b39b91dd66c5d2b98239492a826cbee9e 1336 git-core_1.7.4.1-1_all.deb
 5c133d9d1654d094463e0fddba797de60b1d2e0e 938934 git-man_1.7.4.1-1_all.deb
Checksums-Sha256: 
 ac242c36ec673683dc6a165ea15ab4659924c90a97ccaa0d53000966a691a2b0 1436 git_1.7.4.1-1.dsc
 1855df9f23f8296c24482416cf10bbbaef40f837d30ff02ecf31f2694c325277 3266745 git_1.7.4.1.orig.tar.gz
 bfd435ff77f364ac4e6054b8506e2b110703aa53675091b72557dcf943e962b2 402484 git_1.7.4.1-1.diff.gz
 46cd7b1ed2338f34ea44ad0b336941d5713be0277300681f3140fecc853483c6 1639718 git-doc_1.7.4.1-1_all.deb
 65318f6f273c516cbb885dcd8674c66be1487209d283ea73816988acf4ac5c9c 386026 git-arch_1.7.4.1-1_all.deb
 296f41e0b8deeec79f53ce8a11524b6714a6711bcbe08c02c01843e666d5faed 457992 git-cvs_1.7.4.1-1_all.deb
 0633ba3b3a9e390ce0b7f2a443f3f717772ae2e62fe0f9497078f080a8dc02f2 437754 git-svn_1.7.4.1-1_all.deb
 85a7a8a4e9cfe1ec18dfceb5207b39794a62e35fe91af7d7bb4dd848eaa98f52 373080 git-daemon-run_1.7.4.1-1_all.deb
 f470ce38eba3671ba46103289e2a15274610cb8d6698357ee402637f8bde25f8 390972 git-email_1.7.4.1-1_all.deb
 662393f15a90faf0749982afcddd9bc393b38acca1fe8fe1f57b6fab11fa8bd4 633922 git-gui_1.7.4.1-1_all.deb
 9d40ff6646ae2f1898a9bdef0e3fdebecea3ae2ed8925ac9a458f3e5e3649843 498734 gitk_1.7.4.1-1_all.deb
 dec1a6dd4db7e572bb7c54b5774b3d3b67ddbdbc2472dbd609e82e72bbc88013 383134 gitweb_1.7.4.1-1_all.deb
 65609c1132f1a11330c50ecfc4b3ab7dc9a0c87ad96991bdfd9f7c4852f41c98 371460 git-all_1.7.4.1-1_all.deb
 ac6b3f5d86005b49957b6a6f3ffe4c403bdc41f47ccf811f6f9b735bff17bf99 1336 git-core_1.7.4.1-1_all.deb
 2a4ec7d8c40ef8cfc1c107de1df99ababddfa77634e98ca1b2ef8bd54ed961b3 938934 git-man_1.7.4.1-1_all.deb
Files: 
 19aec48a88c642f378a9933a504fcab5 1436 vcs optional git_1.7.4.1-1.dsc
 1276aa1366bd3c670e9c51f1bff12f36 3266745 vcs optional git_1.7.4.1.orig.tar.gz
 36e04488680d57b513ac3b840844b94a 402484 vcs optional git_1.7.4.1-1.diff.gz
 e7f79fd736d1c476383c52d1cd19496d 1639718 doc optional git-doc_1.7.4.1-1_all.deb
 760acf52d5a99ed3fd19178f23372f41 386026 vcs optional git-arch_1.7.4.1-1_all.deb
 0dd4d96de84ab8ee6e7fc275430ab49e 457992 vcs optional git-cvs_1.7.4.1-1_all.deb
 bbe84f5bb1724082834313cdff3a9cff 437754 vcs optional git-svn_1.7.4.1-1_all.deb
 499ea96dbd14deccac0a089c03921779 373080 vcs optional git-daemon-run_1.7.4.1-1_all.deb
 0cfb71b4f253fe88269d76b710ce2462 390972 vcs optional git-email_1.7.4.1-1_all.deb
 04535918668f71bea565ae7496590254 633922 vcs optional git-gui_1.7.4.1-1_all.deb
 a2156ce5c0a15aacdb9df7ae63999703 498734 vcs optional gitk_1.7.4.1-1_all.deb
 d3aaef1ded07729024375a9bf1f8e2a1 383134 vcs optional gitweb_1.7.4.1-1_all.deb
 e84c9ac9452c37e6011ffc48ca053711 371460 vcs optional git-all_1.7.4.1-1_all.deb
 5ccaeef1abbb1debf65c09766c2ff86c 1336 vcs optional git-core_1.7.4.1-1_all.deb
 28d0be6d985e3f9bf8071601a6c1c6bf 938934 vcs optional git-man_1.7.4.1-1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAk1bqScACgkQGJoyQbxwpv/CiACgidlYAgvKP9U626u4US+/jj1p
4qQAni2trKCqN6+c4N2F/gOvbJU5hgIb
=aIcU
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.