Sync git 1:1.7.4.1-1 (main) from Debian unstable (main)

[Anders Kaseorg]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

 affects ubuntu/git
 status new
 importance wishlist
 subscribe ubuntu-sponsors
 done

Please sync git 1:1.7.4.1-1 (main) from Debian unstable (main)

Changelog entries since current natty version 1:1.7.2.3-2.2:

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).

 -- Jonathan Nieder <email address hidden> Tue, 15 Feb 2011 19:27:38 -0600

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iQGcBAEBCAAGBQJNXbEpAAoJEN/zqzdPFvc6TU0L/3MhknUaieUyezKceTsD7Gh2
7cAO7xktQYRsTDBuKmHs6RmGgC2E4+2LifFeL5jUwE17Dx2trKY8HqwnT6BJ6kPh
v0ZNLboUt6J3H92cbALkqknUGaLYm5CZUi0hB1qIarmo6O3iSlFUXdPQNQiWxG4+
/Pywp8PSVkwuos5scsykXEwjk1o/1ITlKi1Vp3jMGHwIwvUDLEz+0UyWk9QJ2cdc
1P4FkpUfFNpwOH0fjUqspZto+W4DsrxfQQiV80ilAr/hkPn99kGR3WIVcN6cCBeD
67V/uF64jSNcTPp0IA1aLBcYi+UEEQXLdvpAje6qtb0A9HgelWCVLuih1ZSe9c7I
mRpEu9sIW97Sf5/bKr/sUn32VwqwwwRK5ePvq3iAk/BrS4cxHSuauAI4daIxbLOD
dZRV9C6vTo880BeT6ZWs1FMz8qupQGlYB4lfINKrZCVYlY9br7sxMgaHRWpXWM+r
JuIVeG8qTg4WsBvBFUPxUSth8s01nVCV4G9TmpsLHA==
=Y90P
-----END PGP SIGNATURE-----

[Benjamin Drung (bdrung)]

git 1:1.7.4.1-1 builds on amd64. Sync request ACK'd.

[Colin Watson (cjwatson)]

[Updating] git (1:1.7.2.3-2.2 [Ubuntu] < 1:1.7.4.1-1 [Debian])
 * Trying to add git...
2011-02-20 02:15:10 INFO - <git_1.7.4.1.orig.tar.gz: downloading from http://ftp.debian.org/debian/>
2011-02-20 02:15:13 INFO - <git_1.7.4.1-1.diff.gz: downloading from http://ftp.debian.org/debian/>
2011-02-20 02:15:13 INFO - <git_1.7.4.1-1.dsc: downloading from http://ftp.debian.org/debian/>
I: git [main] -> git_1:1.7.2.3-2.2 [main].
I: git [main] -> git-core_1:1.7.2.3-2.2 [main].
I: git [main] -> git-doc_1:1.7.2.3-2.2 [main].
I: git [main] -> git-arch_1:1.7.2.3-2.2 [universe].
I: git [main] -> git-cvs_1:1.7.2.3-2.2 [universe].
I: git [main] -> git-svn_1:1.7.2.3-2.2 [universe].
I: git [main] -> git-email_1:1.7.2.3-2.2 [universe].
I: git [main] -> git-daemon-run_1:1.7.2.3-2.2 [universe].
I: git [main] -> git-gui_1:1.7.2.3-2.2 [universe].
I: git [main] -> gitk_1:1.7.2.3-2.2 [main].
I: git [main] -> gitweb_1:1.7.2.3-2.2 [universe].
I: git [main] -> git-all_1:1.7.2.3-2.2 [universe].