{"thread":{"id":"2935","subject":"[ANNOUNCE] GIT 1.0.5","startedAt":"2005-12-27T08:47:14Z","lastAt":"2006-01-07T22:05:17Z","messageCount":7,"participants":["Junio C Hamano","Gerrit Pape","Kalle Valo","Yann Dirson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"14058","messageId":"7v64pbc4fh.fsf@assigned-by-dhcp.cox.net","threadId":"2935","inReplyTo":null,"subject":"[ANNOUNCE] GIT 1.0.5","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-12-27T08:47:14Z","receivedAt":"2005-12-27T08:47:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This is a minor bugfix release. There is one real fix by\nJohannes that would help people who manage symlinks with git.\n\nStarting from this one I won't be touching debian/ directory,\nnor supplying pre-built Debian binaries anymore.\nThe official maintainer seems to be reasonably quick to package\nup things. The packaging procedure used there seems to be quite\ndifferent from what I have, so I'd like to avoid potential\nconfusion and reduce work by the official maintainer and myself.\n\nAlso I've enhanced the post-update hook of git.git repository to\nautomatically prepare preformatted documentation, which I'll\ncover in a separate message.\n"},{"id":"14084","messageId":"20051228112018.19646.qmail@c226d15586b0bf.315fe32.mid.smarden.org","threadId":"2935","inReplyTo":"7v64pbc4fh.fsf@assigned-by-dhcp.cox.net","subject":"[PATCH] debian/ directory","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2005-12-28T11:20:18Z","receivedAt":"2005-12-28T11:20:18Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"On Tue, Dec 27, 2005 at 12:47:14AM -0800, Junio C Hamano wrote:\n> Starting from this one I won't be touching debian/ directory,\n> nor supplying pre-built Debian binaries anymore.\n> The official maintainer seems to be reasonably quick to package\n> up things. The packaging procedure used there seems to be quite\n\nYes, I'm trying to keep up with your development speed..\n\n> different from what I have, so I'd like to avoid potential\n> confusion and reduce work by the official maintainer and myself.\n\nThanks. The most notable change is that debhelper isn't used to do the\npackaging stuff, and the build-dependency has been dropped; this is\nafter my personal preference.\n\nBelow is the diff for reference, I think though it might be better if\nyou don't include the debian/ directory in the upstream package at all.\nIt may well be that I'm not always available immediately if things need\nto be changed in debian/, but do as you wish.\n\nRegards, Gerrit.\n\n\n* don't use debhelper, use implicit rules.\n* rename package git-tk to gitk; adjust Build-Depends*, Depends, Recommends,\n Suggests, Section, Description; Replaces: cogito (<< 0.16rc2-0) (ease\n upgrade from previous cogito packages which include git-core); Conflicts:\n git (<< 4.3.20-8) (/usr/bin/git transition).\n* build with NO_OPENSSL=1 WITH_SEND_EMAIL=1 WITH_OWN_SUBPROCESS_PY=1\n prefix=/usr, python 2.3; disable t/t6001-rev-list-merge-order.sh (test\n fails with NO_OPENSSL=1).\n\nSigned-off-by: Gerrit Pape \n\n---\n\n debian/changelog | 114 ++++++++++++++----------\n debian/compat | 1 \n debian/control | 141 +++++++++++++++++++++---------\n debian/copyright | 38 ++++----\n debian/docs | 1 \n debian/git-arch.files | 2 \n debian/git-core.doc-base | 13 ---\n debian/git-core.docs | 1 \n debian/git-core.files | 1 \n debian/git-core.postinst | 5 +\n debian/git-core.prerm | 5 +\n debian/git-cvs.files | 2 \n debian/git-doc.docs | 2 \n debian/git-doc.files | 4 -\n debian/git-email.files | 2 \n debian/git-svn.files | 2 \n debian/git-tk.files | 2 \n debian/implicit | 93 ++++++++++++++++++++\n debian/rules | 215 ++++++++++++++++++++++++++--------------------\n 19 files changed, 410 insertions(+), 234 deletions(-)\n delete mode 100644 debian/compat\n delete mode 100644 debian/docs\n delete mode 100644 debian/git-arch.files\n delete mode 100644 debian/git-core.doc-base\n create mode 100644 debian/git-core.docs\n delete mode 100644 debian/git-core.files\n create mode 100755 debian/git-core.postinst\n create mode 100755 debian/git-core.prerm\n delete mode 100644 debian/git-cvs.files\n create mode 100644 debian/git-doc.docs\n delete mode 100644 debian/git-doc.files\n delete mode 100644 debian/git-email.files\n delete mode 100644 debian/git-svn.files\n delete mode 100644 debian/git-tk.files\n create mode 100644 debian/implicit\n\n580d1d4562b44410f2cc5b7c1f81ced6b0b3d646\ndiff --git a/debian/changelog b/debian/changelog\nindex d7f7591..1df7491 100644\n--- a/debian/changelog\n+++ b/debian/changelog\n@@ -1,73 +1,93 @@\n-git-core (1.0.GIT-0) unstable; urgency=low\n+git-core (1.0.5-1) unstable; urgency=low\n \n- * Post GIT 1.0 development track.\n+ * new upstream point release.\n+ * debian/rules: don't take upstream changelog from upstream\n+ debian/changelog.\n+ * debian/changelog.upstream: remove again.\n \n- -- Junio C Hamano Wed, 21 Dec 2005 22:28:33 -0800\n+ -- Gerrit Pape Tue, 27 Dec 2005 13:25:53 +0000\n \n-git-core (1.0.0.GIT-0) unstable; urgency=low\n+git-core (1.0.3-1) unstable; urgency=low\n \n- * Post GIT 1.0.0 development track.\n+ * new upstream point release.\n+ * debian/changelog.upstream: new: upstream changelog taken from upstream\n+ debian/changelog.\n+ * debian/rules: install debian/changelog.upstream as upstream changelog;\n+ remove obsolete VERSION variable.\n \n- -- Junio C Hamano Wed, 21 Dec 2005 12:12:05 -0800\n+ -- Gerrit Pape Fri, 23 Dec 2005 14:58:14 +0000\n \n-git-core (1.0.4-0) unstable; urgency=low\n+git-core (1.0.0-1) unstable; urgency=medium\n \n- * GIT 1.0.4.\n+ * new upstream release: GIT 1.0.0.\n \n- -- Junio C Hamano Sat, 24 Dec 2005 00:01:20 -0800\n+ -- Gerrit Pape Wed, 21 Dec 2005 16:17:18 +0000\n \n-git-core (1.0.3-0) unstable; urgency=low\n+git-core (0.99.9n-1) unstable; urgency=low\n \n- * GIT 1.0.3 maintenance release.\n+ * new upstream version: GIT 0.99.9n aka 1.0rc6.\n+ * debian/rules: rename git program in git-core package to git-scm,\n+ handle /usr/bin/git program through update-alternatives (as suggested\n+ by Ian Beckwith, see #342363).\n+ * debian/control: git-core: Conflicts: git (<< 4.3.20-8) (closes:\n+ #342363).\n+ * debian/git-core.postinst, debian/git-core.prerm: new: run\n+ update-alternatives --install /usr/bin/git git /usr/bin/git-scm with\n+ priority 70 on configure, and --remove on remove respectively.\n \n- -- Junio C Hamano Thu, 22 Dec 2005 18:13:33 -0800\n+ -- Gerrit Pape Thu, 15 Dec 2005 11:24:51 +0000\n \n-git-core (1.0.0b-0) unstable; urgency=low\n+git-core (0.99.9m-1) unstable; urgency=low\n \n- * GIT 1.0.0b to include two more fixes.\n+ * new upstream version: GIT 0.99.9m aka 1.0rc5.\n+ * sets PYTHONPATH for selftests (fixes autobuild test failures).\n+ * switch from tarball-in-tarball approach to original upstream tarball.\n+ * debian/changelog: add changelog history, Junio C Hamano, Ryan Anderson,\n+ Eric Biederman previously were maintaining this package unofficially.\n+ * debian/control: Build-Depends: rcs (for selftests); git-core:\n+ Recommends: patch, less, Suggests: cogito; git-arch: Suggests: tla,\n+ bazzar; git-cvs: Depends: cvsps, Suggests: cvs; git-svn: Depends:\n+ libsvn-core-perl (closes:#342617), Suggests: subversion; git-email:\n+ Depends: libmail-sendmail-perl, libemail-valod-perl; update short\n+ description (lots taken from upstream unofficial package, thx).\n+ * debian/git-core.docs, debian/git-doc.docs: adapt.\n+ * debian/rules: adapt; remove target unpack; add target patch; adapt\n+ target clean.\n \n- -- Junio C Hamano Wed, 21 Dec 2005 13:50:21 -0800\n+ -- Gerrit Pape Wed, 14 Dec 2005 19:48:41 +0000\n \n-git-core (1.0.0a-0) unstable; urgency=low\n+git-core (0.99.9l-1) unstable; urgency=low\n \n- * GIT 1.0.0a to include the following fixes:\n- \n- - Avoid misleading success message on error (Johannes)\n- - objects/info/packs: work around bug in http-fetch.c::fetch_indices()\n- - http-fetch.c: fix objects/info/pack parsing.\n- - An off-by-one bug found by valgrind (Pavel)\n+ * new upstream version.\n+ * debian/rules: apply diffs with patch -p1.\n+ * debian/control, debian/rules: split off git-arch, git-cvs, git-svn,\n+ git-email packages, as suggested by upstream:\n+ http://article.gmane.org/gmane.comp.version-control.git/13185\n+ * debian/git-doc.docs: get docs from temporary install directory;\n+ include *.txt docs.\n+ * debian/control: git-doc: Section: doc; Suggests: git-core, git-arch,\n+ git-cvs, git-svn, git-email, gitk; git-core: Suggests: git-arch,\n+ git-cvs, git-svn, git-email, gitk.\n \n- -- Junio C Hamano Wed, 21 Dec 2005 13:17:17 -0800\n+ -- Gerrit Pape Mon, 5 Dec 2005 18:04:37 +0000\n \n-git-core (1.0.0-0) unstable; urgency=low\n+git-core (0.99.9k-1) unstable; urgency=low\n \n- * GIT 1.0.0\n+ * new upstream version.\n+ * debian/implicit: update to revision 1.11.\n+ * debian/git-doc.docs: add git/Documentation/howto,\n+ git/Documentation/technical (closes: #341178).\n \n- -- Junio C Hamano Wed, 21 Dec 2005 00:01:00 -0800\n+ -- Gerrit Pape Tue, 29 Nov 2005 21:45:53 +0000\n \n-git-core (0.99.9n-0) unstable; urgency=low\n+git-core (0.99.9j-1) unstable; urgency=low\n \n- * GIT 0.99.9n aka 1.0rc6\n+ * initial version.\n+ * debian/control: git-core: Replaces: cogito (<< 0.16rc2-0); cogito >=\n+ 0.16rc2-0 no longer includes the git core components, but depends on\n+ the git-core package (see #338789).\n \n- -- Junio C Hamano Wed, 14 Dec 2005 17:27:08 -0800\n-\n-git-core (0.99.9m-0) unstable; urgency=low\n-\n- * GIT 0.99.9m aka 1.0rc5\n-\n- -- Junio C Hamano Sun, 11 Dec 2005 16:48:06 -0800\n-\n-git-core (0.99.9l-0) unstable; urgency=low\n-\n- * GIT 0.99.9l aka 1.0rc4\n-\n- -- Junio C Hamano Sat, 3 Dec 2005 23:45:23 -0800\n-\n-git-core (0.99.9k-0) unstable; urgency=low\n-\n- * GIT 0.99.9k but not 1.0rc yet.\n-\n- -- Junio C Hamano Fri, 25 Nov 2005 16:33:11 -0800\n+ -- Gerrit Pape Fri, 18 Nov 2005 22:26:36 +0000\n \n git-core (0.99.9j-0) unstable; urgency=low\n \ndiff --git a/debian/compat b/debian/compat\ndeleted file mode 100644\nindex b8626c4..0000000\n--- a/debian/compat\n+++ /dev/null\n@@ -1 +0,0 @@\n-4\ndiff --git a/debian/control b/debian/control\nindex ded0a57..33551b5 100644\n--- a/debian/control\n+++ b/debian/control\n@@ -1,63 +1,118 @@\n Source: git-core\n Section: devel\n Priority: optional\n-Maintainer: Junio C Hamano \n-Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 7), xmlto, debhelper (>= 4.0.0), bc, libexpat-dev\n-Standards-Version: 3.6.1\n+Maintainer: Gerrit Pape \n+Build-Depends: libz-dev, libcurl3-gnutls-dev, asciidoc, xmlto, libexpat1-dev, rcs\n+Standards-Version: 3.6.2.0\n \n Package: git-core\n Architecture: any\n-Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, rcs\n-Recommends: rsync, curl, ssh, python (>= 2.4.0), less\n-Suggests: cogito, patch\n-Conflicts: git, cogito (<< 0.13)\n-Description: The git content addressable filesystem\n- GIT comes in two layers. The bottom layer is merely an extremely fast\n- and flexible filesystem-based database designed to store directory trees\n- with regard to their history. The top layer is a SCM-like tool which\n- enables human beings to work with the database in a manner to a degree\n- similar to other SCM tools.\n+Depends: ${shlibs:Depends}, rcs\n+Recommends: git-doc, patch, less, rsync, curl, openssh-client, python\n+Suggests: git-arch, git-cvs, git-svn, git-email, gitk, cogito\n+Replaces: cogito (<< 0.16rc2-0)\n+Conflicts: git (<< 4.3.20-8)\n+Description: content addressable filesystem\n+ This is a stupid (but extremely fast) directory content manager. It\n+ doesn't do a whole lot, but what it 'does' do is track directory\n+ contents efficiently.\n+ .\n+ Amongst other projects, the Linux kernel source tree is managed through\n+ the git content manager.\n+ .\n+ This package provides the git core components.\n \n Package: git-doc\n+Section: doc\n Architecture: all\n-Depends: ${shlibs:Depends}, ${misc:Depends}, git-core\n-Description: The git content addressable filesystem, Documentation\n- This package contains documentation for GIT.\n-\n-Package: git-tk\n-Architecture: all\n-Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4\n-Description: The git content addressable filesystem, GUI add-on\n- This package contains 'gitk', the git revision tree visualizer.\n-\n-Package: git-svn\n-Architecture: all\n-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core, libsvn-core-perl (>= 1.2.1)\n-Suggests: subversion\n-Description: The git content addressable filesystem, SVN interoperability\n- This package contains 'git-svnimport', to import development history from\n- SVN repositories.\n+Suggests: git-core, git-arch, git-cvs, git-svn, git-email, gitk\n+Description: content addressable filesystem (documentation)\n+ This is a stupid (but extremely fast) directory content manager. It\n+ doesn't do a whole lot, but what it 'does' do is track directory\n+ contents efficiently.\n+ .\n+ Amongst other projects, the Linux kernel source tree is managed through\n+ the git content manager.\n+ .\n+ This package provides the documentation.\n \n Package: git-arch\n Architecture: all\n-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core\n+Depends: git-core (= ${Source-Version})\n+Recommends: git-doc\n Suggests: tla, bazaar\n-Description: The git content addressable filesystem, GNUArch interoperability\n- This package contains 'git-archimport', to import development history from\n- GNUArch repositories.\n+Replaces: cogito (<< 0.16rc2-0)\n+Description: content addressable filesystem (arch interoperability)\n+ This is a stupid (but extremely fast) directory content manager. It\n+ doesn't do a whole lot, but what it 'does' do is track directory\n+ contents efficiently.\n+ .\n+ Amongst other projects, the Linux kernel source tree is managed through\n+ the git content manager.\n+ .\n+ This package provides tools for importing development history from arch\n+ repositories.\n \n Package: git-cvs\n Architecture: all\n-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core, cvsps (>= 2.1)\n+Depends: git-core (= ${Source-Version}), cvsps\n+Recommends: git-doc\n Suggests: cvs\n-Description: The git content addressable filesystem, CVS interoperability\n- This package contains 'git-cvsimport', to import development history from\n- CVS repositories.\n+Replaces: cogito (<< 0.16rc2-0)\n+Description: content addressable filesystem (cvs interoperability)\n+ This is a stupid (but extremely fast) directory content manager. It\n+ doesn't do a whole lot, but what it 'does' do is track directory\n+ contents efficiently.\n+ .\n+ Amongst other projects, the Linux kernel source tree is managed through\n+ the git content manager.\n+ .\n+ This package provides tools for importing development history from cvs\n+ repositories.\n \n-Package: git-email\n+Package: git-svn\n Architecture: all\n-Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, libmail-sendmail-perl, libemail-valid-perl\n-Description: The git content addressable filesystem, e-mail add-on\n- This package contains 'git-send-email', to send a series of patch e-mails.\n-\n+Depends: git-core (= ${Source-Version}), libsvn-core-perl\n+Recommends: git-doc\n+Suggests: subversion\n+Replaces: cogito (<< 0.16rc2-0)\n+Description: content addressable filesystem (svn interoperability)\n+ This is a stupid (but extremely fast) directory content manager. It\n+ doesn't do a whole lot, but what it 'does' do is track directory\n+ contents efficiently.\n+ .\n+ Amongst other projects, the Linux kernel source tree is managed through\n+ the git content manager.\n+ .\n+ This package provides tools for importing development history from\n+ subversion repositories.\n \n+Package: git-email\n+Architecture: all\n+Depends: git-core (= ${Source-Version}), libmail-sendmail-perl, libemail-valid-perl\n+Recommends: git-doc\n+Replaces: cogito (<< 0.16rc2-0)\n+Description: content addressable filesystem (email add-on)\n+ This is a stupid (but extremely fast) directory content manager. It\n+ doesn't do a whole lot, but what it 'does' do is track directory\n+ contents efficiently.\n+ .\n+ Amongst other projects, the Linux kernel source tree is managed through\n+ the git content manager.\n+ .\n+ This package provides tools for sending series of patch emails.\n+\n+Package: gitk\n+Architecture: all\n+Depends: git-core (= ${Source-Version}), tk8.4\n+Recommends: git-doc\n+Replaces: cogito (<< 0.16rc2-0)\n+Description: content addressable filesystem (revision tree visualizer)\n+ This is a stupid (but extremely fast) directory content manager. It\n+ doesn't do a whole lot, but what it 'does' do is track directory\n+ contents efficiently.\n+ .\n+ Amongst other projects, the Linux kernel source tree is managed through\n+ the git content manager.\n+ .\n+ This package provides the gitk program, a tcl/tk revision tree visualizer.\ndiff --git a/debian/copyright b/debian/copyright\nindex ea61eff..d84775a 100644\n--- a/debian/copyright\n+++ b/debian/copyright\n@@ -1,24 +1,24 @@\n-This package was downloaded from ftp.kernel.org:/pub/software/scm/git/.\n+This package was debianized by Sebastian Kuzminsky \n+on Thu, 5 May 2005 10:27:14 -0600,\n+and was adopted by Gerrit Pape \n+on Wed, 16 Nov 2005 19:37:14 +0000.\n \n-Upstream Author: Linus Torvalds and many others\n+It was downloaded from http://www.kernel.org/pub/software/scm/git/\n+\n+Upstream authors: Linus Torvalds and many others\n \n Copyright:\n \n- Copyright 2005, Linus Torvalds and others.\n- \n- This package is free software; you can redistribute it and/or modify\n- it under the terms of the GNU General Public License as published by\n- the Free Software Foundation; version 2 dated June, 1991.\n-\n- This package is distributed in the hope that it will be useful,\n- but WITHOUT ANY WARRANTY; without even the implied warranty of\n- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n- GNU General Public License for more details.\n-\n- You should have received a copy of the GNU General Public License\n- along with this package; if not, write to the Free Software\n- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n- 02111-1307, USA.\n+This software is copyright (c) 2005, Linus Torvalds and others.\n+\n+You can redistribute this software and/or modify it under the terms of\n+the GNU General Public License as published by the Free Software\n+Foundation; version 2 dated June, 1991.\n+\n+This program is distributed in the hope that it will be useful, but\n+WITHOUT ANY WARRANTY; without even the implied warranty of\n+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n+General Public License for more details.\n \n-On Debian GNU/Linux systems, the complete text of the GNU General\n-Public License can be found in `/usr/share/common-licenses/GPL'.\n+On Debian systems, the complete text of the GNU General Public License\n+can be found in /usr/share/common-licenses/GPL-2 file.\ndiff --git a/debian/docs b/debian/docs\ndeleted file mode 100644\nindex e845566..0000000\n--- a/debian/docs\n+++ /dev/null\n@@ -1 +0,0 @@\n-README\ndiff --git a/debian/git-arch.files b/debian/git-arch.files\ndeleted file mode 100644\nindex d744954..0000000\n--- a/debian/git-arch.files\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-/usr/bin/git-arch*\n-/usr/share/man/*/git-arch*\ndiff --git a/debian/git-core.doc-base b/debian/git-core.doc-base\ndeleted file mode 100644\nindex eff1a95..0000000\n--- a/debian/git-core.doc-base\n+++ /dev/null\n@@ -1,13 +0,0 @@\n-Document: git-core\n-Title: git reference\n-Abstract: This manual describes git\n-Section: Devel\n-\n-Format: HTML\n-Index: /usr/share/doc/git-core/git.html\n-Files: /usr/share/doc/git-core/*.html\n- /usr/share/doc/git-core/*/*.html\n-\n-Format: text\n-Files: /usr/share/doc/git-core/*.txt\n- /usr/share/doc/git-core/*/*.txt\ndiff --git a/debian/git-core.docs b/debian/git-core.docs\nnew file mode 100644\nindex 0000000..e845566\n--- /dev/null\n+++ b/debian/git-core.docs\n@@ -0,0 +1 @@\n+README\ndiff --git a/debian/git-core.files b/debian/git-core.files\ndeleted file mode 100644\nindex 74e4e23..0000000\n--- a/debian/git-core.files\n+++ /dev/null\n@@ -1 +0,0 @@\n-/usr\ndiff --git a/debian/git-core.postinst b/debian/git-core.postinst\nnew file mode 100755\nindex 0000000..230f515\n--- /dev/null\n+++ b/debian/git-core.postinst\n@@ -0,0 +1,5 @@\n+#!/bin/sh\n+set -e\n+\n+test \"$1\" = 'configure' || exit 0\n+update-alternatives --install /usr/bin/git git /usr/bin/git-scm 70\ndiff --git a/debian/git-core.prerm b/debian/git-core.prerm\nnew file mode 100755\nindex 0000000..26feff4\n--- /dev/null\n+++ b/debian/git-core.prerm\n@@ -0,0 +1,5 @@\n+#!/bin/sh\n+set -e\n+\n+test \"$1\" = 'remove' || exit 0\n+update-alternatives --remove git /usr/bin/git-scm\ndiff --git a/debian/git-cvs.files b/debian/git-cvs.files\ndeleted file mode 100644\nindex a6b40ff..0000000\n--- a/debian/git-cvs.files\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-/usr/bin/git-cvs*\n-/usr/share/man/*/git-cvs*\ndiff --git a/debian/git-doc.docs b/debian/git-doc.docs\nnew file mode 100644\nindex 0000000..b0a52bc\n--- /dev/null\n+++ b/debian/git-doc.docs\n@@ -0,0 +1,2 @@\n+tmp/html/*\n+Documentation/technical\ndiff --git a/debian/git-doc.files b/debian/git-doc.files\ndeleted file mode 100644\nindex 0daf545..0000000\n--- a/debian/git-doc.files\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-/usr/share/doc/git-core/*.txt\n-/usr/share/doc/git-core/*.html\n-/usr/share/doc/git-core/*/*.html\n-/usr/share/doc/git-core/*/*.txt\ndiff --git a/debian/git-email.files b/debian/git-email.files\ndeleted file mode 100644\nindex 2d6a51f..0000000\n--- a/debian/git-email.files\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-/usr/bin/git-send-email\n-/usr/share/man/*/git-send-email.*\ndiff --git a/debian/git-svn.files b/debian/git-svn.files\ndeleted file mode 100644\nindex eea8d83..0000000\n--- a/debian/git-svn.files\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-/usr/bin/git-svn*\n-/usr/share/man/*/git-svn*\ndiff --git a/debian/git-tk.files b/debian/git-tk.files\ndeleted file mode 100644\nindex 478ec94..0000000\n--- a/debian/git-tk.files\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-/usr/bin/gitk\n-/usr/share/man/man1/gitk.*\ndiff --git a/debian/implicit b/debian/implicit\nnew file mode 100644\nindex 0000000..7a7ee98\n--- /dev/null\n+++ b/debian/implicit\n@@ -0,0 +1,93 @@\n+# $Id: implicit,v 1.11 2005/11/29 21:57:55 pape Exp $\n+\n+.PHONY: deb-checkdir deb-checkuid\n+\n+deb-checkdir:\n+\t@test -e debian/control || sh -cx '! : wrong directory'\n+deb-checkuid:\n+\t@test \"`id -u`\" -eq 0 || sh -cx '! : need root privileges'\n+\n+%.deb: %.deb-docs %.deb-DEBIAN\n+\t@rm -f $*.deb $*.deb-checkdir $*.deb-docs $*.deb-docs-base \\\n+\t $*.deb-docs-docs $*.deb-docs-examples $*.deb-DEBIAN \\\n+\t $*.deb-DEBIAN-dir $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums\n+\n+%.udeb: %.deb-DEBIAN\n+\t@rm -f $*.deb $*.deb-checkdir $*.deb-DEBIAN $*.deb-DEBIAN-dir \\\n+\t $*.deb-DEBIAN-scripts $*.deb-DEBIAN-md5sums\n+\n+%.deb-checkdir:\n+\t@test -d debian/$* || sh -cx '! : directory debian/$* missing'\n+\t@test \"`id -u`\" -eq 0 || sh -cx '! : need root privileges'\n+\n+%.deb-docs-base:\n+\t: implicit\n+\t@rm -f debian/$*/usr/share/doc/$*/* || :\n+\t@install -d -m0755 debian/$*/usr/share/doc/$*\n+\t: debian/$*/usr/share/doc/$*/\n+\t@sh -cx 'install -m0644 debian/copyright debian/$*/usr/share/doc/$*/'\n+\t@sh -cx 'install -m0644 debian/changelog \\\n+\t debian/$*/usr/share/doc/$*/changelog.Debian'\n+\t@test ! -r changelog || \\\n+\t sh -cx 'install -m0644 changelog debian/$*/usr/share/doc/$*/'\n+\t@test -r debian/$*/usr/share/doc/$*/changelog || \\\n+\t sh -cx 'mv debian/$*/usr/share/doc/$*/changelog.Debian \\\n+\t debian/$*/usr/share/doc/$*/changelog'\n+\t@test -s debian/$*/usr/share/doc/$*/changelog || \\\n+\t sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog'\n+\t@gzip -9 debian/$*/usr/share/doc/$*/changelog*\n+%.deb-docs-docs:\n+\t@for i in `cat debian/$*.docs 2>/dev/null || :`; do \\\n+\t if test -d $$i; then \\\n+\t sh -cx \"install -d -m0755 debian/$*/usr/share/doc/$*/$${i##*/}\" && \\\n+\t for j in $$i/*; do \\\n+\t sh -cx \"install -m0644 $$j \\\n+\t debian/$*/usr/share/doc/$*/$${i##*/}/\" || exit 1; \\\n+\t done || exit 1; \\\n+\t continue; \\\n+\t fi; \\\n+\t sh -cx \"install -m0644 $$i debian/$*/usr/share/doc/$*/\" || exit 1; \\\n+\tdone\n+\t@test ! -r debian/$*.README.Debian || \\\n+\t sh -cx 'install -m0644 debian/$*.README.Debian \\\n+\t debian/$*/usr/share/doc/$*/README.Debian'\n+\t@if test -r debian/$*.NEWS.Debian; then \\\n+\t sh -cx 'install -m0644 debian/$*.NEWS.Debian \\\n+\t debian/$*/usr/share/doc/$*/NEWS.Debian && \\\n+\t gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \\\n+\tfi\n+%.deb-docs-examples:\n+\t@rm -rf debian/$*/usr/share/doc/$*/examples\n+\t: debian/$*/usr/share/doc/$*/examples/\n+\t@test ! -r debian/$*.examples || \\\n+\t install -d -m0755 debian/$*/usr/share/doc/$*/examples\n+\t@for i in `cat debian/$*.examples 2>/dev/null || :`; do \\\n+\t sh -cx \"install -m0644 $$i debian/$*/usr/share/doc/$*/examples/\" \\\n+\t || exit 1; \\\n+\tdone\n+%.deb-docs: %.deb-checkdir %.deb-docs-base %.deb-docs-docs %.deb-docs-examples\n+\t: debian/$*/usr/share/doc/$*/ ok\n+\n+%.deb-DEBIAN-base:\n+\t@rm -rf debian/$*/DEBIAN\n+\t: debian/$*/DEBIAN/\n+\t@install -d -m0755 debian/$*/DEBIAN\n+\t@for i in conffiles shlibs templates; do \\\n+\t test ! -r debian/$*.$$i || \\\n+\t sh -cx \"install -m0644 debian/$*.$$i debian/$*/DEBIAN/$$i\" \\\n+\t || exit 1; \\\n+\tdone\n+%.deb-DEBIAN-scripts:\n+\t@for i in preinst prerm postinst postrm config; do \\\n+\t test ! -r debian/$*.$$i || \\\n+\t sh -cx \"install -m0755 debian/$*.$$i debian/$*/DEBIAN/$$i\" \\\n+\t || exit 1; \\\n+\tdone\n+%.deb-DEBIAN-md5sums:\n+\t: debian/$*/DEBIAN/md5sums\n+\t@rm -f debian/$*/DEBIAN/md5sums\n+\t@cd debian/$* && find * -path 'DEBIAN' -prune -o \\\n+\t -type f -exec md5sum {} >>DEBIAN/md5sums \\;\n+%.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \\\n+\t %.deb-DEBIAN-md5sums\n+\t: debian/$*/DEBIAN/ ok\ndiff --git a/debian/rules b/debian/rules\nindex 4ab221c..b0607ed 100755\n--- a/debian/rules\n+++ b/debian/rules\n@@ -1,109 +1,134 @@\n #!/usr/bin/make -f\n-# -*- makefile -*-\n \n-# Uncomment this to turn on verbose mode.\n-#export DH_VERBOSE=1\n+ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH)\n \n-CFLAGS = -g -Wall\n+CC =gcc\n+CFLAGS =-g -Wall\n+STRIP =strip\n+OPTS =NO_OPENSSL=1 WITH_SEND_EMAIL=1 WITH_OWN_SUBPROCESS_PY=1 prefix=/usr\n+\n+ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))\n+ STRIP =: strip\n+endif\n ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))\n- CFLAGS += -O0\n+ CFLAGS +=-O0\n else\n- CFLAGS += -O2\n+ CFLAGS +=-O2\n endif\n-export CFLAGS\n-\n-#\n-# On PowerPC we compile against the hand-crafted assembly, on all\n-# other architectures we compile against GPL'ed sha1 code lifted\n-# from Mozilla. OpenSSL is strangely licensed and best avoided\n-# in Debian.\n-#\n-HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)\n-ifeq (${HOST_ARCH},powerpc)\n-\texport PPC_SHA1=YesPlease\n+ifeq (powerpc,$(ARCH))\n+ OPTS +=PPC_SHA1=1\n else\n-\texport MOZILLA_SHA1=YesPlease\n+ifeq (arm,$(ARCH))\n+ OPTS +=ARM_SHA1=1\n+endif\n endif\n \n-# We do have the requisite perl modules in the mainline, and\n-# have no reason to shy away from this script.\n-export WITH_SEND_EMAIL=YesPlease\n-\n-PREFIX := /usr\n-MANDIR := /usr/share/man/\n-\n-SRC := ./\n-DOC := Documentation/\n-DESTDIR := $(CURDIR)/debian/tmp\n-DOC_DESTDIR := $(DESTDIR)/usr/share/doc/git-core/\n-MAN_DESTDIR := $(DESTDIR)/$(MANDIR)\n-\n-build: debian/build-stamp\n-debian/build-stamp:\n-\tdh_testdir\n-\t$(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all test doc\n-\ttouch debian/build-stamp\n-\n-debian-clean:\n-\tdh_testdir\n-\tdh_testroot\n-\trm -f debian/build-stamp\n-\tdh_clean\n+TMP =$(shell pwd)/tmp\n+GIT =$(shell pwd)/debian/git\n \n-clean: debian-clean\n-\t$(MAKE) clean\n+patch: deb-checkdir patch-stamp\n+patch-stamp:\n+\tfor i in `ls -t debian/diff/*.diff || :`; do \\\n+\t patch -p1 <$$i || exit 1; \\\n+\tdone\n+\ttouch patch-stamp\n+\n+build: deb-checkdir build-arch-stamp build-indep-stamp\n+build-arch-stamp: patch-stamp\n+\t-gcc -v\n+\t# don't run git-rev-list --merge-order tests\n+\trm -f t/t6001-rev-list-merge-order.sh\n+\t$(MAKE) all test CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS)\n+\t$(MAKE) -CDocumentation man\n+\ttouch build-arch-stamp\n+build-indep-stamp: build-arch-stamp\n+\t$(MAKE) -CDocumentation man html\n+\ttouch build-indep-stamp\n \n-install: build\n-\tdh_testdir\n-\tdh_testroot\n-\tdh_clean -k \n-\tdh_installdirs \n-\n-\tmake DESTDIR=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \\\n-\t\tinstall install-doc\n-\n-\tmake -C Documentation DESTDIR=$(DESTDIR) prefix=$(PREFIX) \\\n-\t\tWEBDOC_DEST=$(DOC_DESTDIR) install-webdoc\n-\n-\tdh_movefiles -p git-arch\n-\tdh_movefiles -p git-cvs\n-\tdh_movefiles -p git-svn\n-\tdh_movefiles -p git-tk\n-\tdh_movefiles -p git-email\n-\tdh_movefiles -p git-doc\n-\tdh_movefiles -p git-core\n-\tfind debian/tmp -type d -o -print | sed -e 's/^/? /'\n-\n-binary-arch: build install\n-\tdh_testdir\n-\tdh_testroot\n-\tdh_installchangelogs -a\n-\tdh_installdocs -a\n-\tdh_strip -a\n-\tdh_compress -a\n-\tdh_fixperms -a\n-\tdh_perl -a\n-\tdh_makeshlibs -a\n-\tdh_installdeb -a\n-\tdh_shlibdeps -a\n-\tdh_gencontrol -a\n-\tdh_md5sums -a\n-\tdh_builddeb -a\n-\n-binary-indep: build install\n-\tdh_testdir\n-\tdh_testroot\n-\tdh_installchangelogs -i\n-\tdh_installdocs -i\n-\tdh_compress -i\n-\tdh_fixperms -i\n-\tdh_makeshlibs -i\n-\tdh_installdeb -i\n-\tdh_shlibdeps -i\n-\tdh_gencontrol -i\n-\tdh_md5sums -i\n-\tdh_builddeb -i\n+clean: deb-checkdir deb-checkuid\n+\t$(MAKE) clean\n+\trm -f git-send-email compat/subprocess.pyc\n+\t! test -e patch-stamp || \\\n+\t for i in `ls -tr debian/diff/*.diff || :`; do patch -p1 -R <$$i; done\n+\trm -rf '$(TMP)'\n+\trm -f patch-stamp build-arch-stamp build-indep-stamp\n+\trm -rf '$(GIT)'-core '$(GIT)'-doc '$(GIT)'-arch '$(GIT)'-cvs \\\n+\t '$(GIT)'-svn '$(GIT)'-email '$(GIT)'k\n+\trm -f debian/files debian/substvars changelog\n+\n+install: install-arch install-indep\n+install-arch: deb-checkdir deb-checkuid build-arch-stamp\n+\t# git-core\n+\trm -rf '$(GIT)-core'\n+\tinstall -d -m0755 '$(GIT)'-core/usr/bin\n+\t$(MAKE) install install-doc $(OPTS) DESTDIR='$(GIT)'-core\n+\t# don't include arch, cvs, svn, email tools, and gitk program\n+\tfor i in git-arch git-cvs git-svn git-send-email; do \\\n+\t rm -f '$(GIT)'-core/usr/bin/$$i*; \\\n+\tdone\n+\trm -f '$(GIT)'-core/usr/bin/gitk\n+\t# handle git program through alternatives mechanism (see #342363), rename\n+\t# to git-scm\n+\tmv -f '$(GIT)'-core/usr/bin/git '$(GIT)'-core/usr/bin/git-scm\n+\tfor i in '$(GIT)'-core/usr/bin/*; do \\\n+\t test \"`head -c2 $$i`\" = '#!' || $(STRIP) -R .comment -R .note $$i; \\\n+\tdone\n+\tinstall -d -m0755 '$(GIT)'-core/usr/share\n+\tmv -f '$(GIT)'-core/usr/man '$(GIT)'-core/usr/share/\n+\t# don't include arch, cvs, svn, email, and gitk man pages\n+\tfor i in git-arch git-cvs git-svn git-send-email; do \\\n+\t rm -f '$(GIT)'-core/usr/share/man/man1/$$i*; \\\n+\tdone\n+\trm -f '$(GIT)'-core/usr/share/man/man1/gitk.1\n+\tchmod 0644 '$(GIT)'-core/usr/share/man/man?/*.[0-9]\n+\tgzip -9 '$(GIT)'-core/usr/share/man/man?/*.[0-9]\n+\t# no upstream changelog\n+\tcp /dev/null changelog\n+install-indep: build-arch-stamp build-indep-stamp\n+\trm -rf '$(TMP)'\n+\tinstall -d -m0755 '$(TMP)'\n+\t$(MAKE) install install-doc $(OPTS) DESTDIR='$(TMP)'\n+\t$(MAKE) -CDocumentation install-webdoc WEBDOC_DEST='$(TMP)'/html \\\n+\t 2>/dev/null\n+\t# git-doc\n+\trm -rf '$(GIT)'-doc\n+\tinstall -d -m0755 '$(GIT)'-doc\n+\t# git-arch, git-cvs, git-svn, git-email\n+\tfor i in arch cvs svn email; do \\\n+\t rm -rf '$(GIT)'-$$i && \\\n+\t install -d -m0755 '$(GIT)'-$$i/usr/bin && \\\n+\t install -m0755 '$(TMP)'/usr/bin/git-*$$i* '$(GIT)'-$$i/usr/bin/ && \\\n+\t install -d -m0755 '$(GIT)'-$$i/usr/share/man/man1 && \\\n+\t install -m0644 '$(TMP)'/usr/man/man1/git-*$$i* \\\n+\t '$(GIT)'-$$i/usr/share/man/man1/ && \\\n+\t gzip -9 '$(GIT)'-$$i/usr/share/man/man1/*.1 || exit 1; \\\n+\tdone\n+\t# gitk\n+\trm -rf '$(GIT)'k\n+\tinstall -d -m0755 '$(GIT)'k/usr/bin\n+\tinstall -m0755 '$(TMP)'/usr/bin/gitk '$(GIT)'k/usr/bin/gitk\n+\tinstall -d -m0755 '$(GIT)'k/usr/share/man/man1\n+\tinstall -m0644 '$(TMP)'/usr/man/man1/gitk.1 \\\n+\t '$(GIT)'k/usr/share/man/man1/\n+\tgzip -9 '$(GIT)'k/usr/share/man/man1/*.1\n+\t# no upstream changelog\n+\tcp /dev/null changelog\n \n binary: binary-arch binary-indep\n+binary-arch: install-arch git-core.deb\n+\trm -f debian/substvars\n+\tdpkg-shlibdeps '$(GIT)'-core/usr/bin/*\n+\tdpkg-gencontrol -isp -pgit-core -P'$(GIT)'-core\n+\tdpkg -b '$(GIT)'-core ..\n+binary-indep: install-indep git-doc.deb git-arch.deb git-cvs.deb git-svn.deb \\\n+\t git-email.deb gitk.deb\n+\trm -f debian/substvars\n+\tfor i in -doc -arch -cvs -svn -email k; do \\\n+\t dpkg-gencontrol -isp -pgit$$i -P'$(GIT)'$$i && \\\n+\t dpkg -b '$(GIT)'$$i .. || exit 1; \\\n+\tdone\n+\n+.PHONY: patch build clean install install-arch install-indep binary \\\n+\t binary-arch binary-indep\n \n-.PHONY: build clean binary install clean debian-clean\n+include debian/implicit\n-- \n1.0.3\n"},{"id":"14088","messageId":"87oe31urge.kvalo.fsf@purkki.valo.iki.fi","threadId":"2935","inReplyTo":"20051228112018.19646.qmail@c226d15586b0bf.315fe32.mid.smarden.org","subject":"Re: [PATCH] debian/ directory","fromName":"Kalle Valo","fromEmail":"kalle.valo@iki.fi","sentAt":"2005-12-28T16:17:05Z","receivedAt":"2005-12-28T16:17:05Z","isPatch":true,"sender":{"key":"kalle.valo@iki.fi","avatar":null},"body":"Gerrit Pape writes:\n\n>> different from what I have, so I'd like to avoid potential\n>> confusion and reduce work by the official maintainer and myself.\n>\n> Thanks. The most notable change is that debhelper isn't used to do the\n> packaging stuff, and the build-dependency has been dropped; this is\n> after my personal preference.\n>\n> Below is the diff for reference, I think though it might be better if\n> you don't include the debian/ directory in the upstream package at all.\n\nOne upside in Junio's debian packages is that they[1] work also in\nsarge[2]. If he stops building them, we sarge users will miss them.\nAny volunteers to maintain them, for example, through backports.org?\n\n[1] at least git-core and git-doc work\n[2] Debian 3.1\n\n-- \nKalle Valo\n"},{"id":"14125","messageId":"20060102103138.3414.qmail@e631ec7a6a8b9a.315fe32.mid.smarden.org","threadId":"2935","inReplyTo":"87oe31urge.kvalo.fsf@purkki.valo.iki.fi","subject":"Re: [PATCH] debian/ directory","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2006-01-02T10:31:38Z","receivedAt":"2006-01-02T10:31:38Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"On Wed, Dec 28, 2005 at 06:17:05PM +0200, Kalle Valo wrote:\n> Gerrit Pape writes:\n> > Below is the diff for reference, I think though it might be better if\n> > you don't include the debian/ directory in the upstream package at all.\n> \n> One upside in Junio's debian packages is that they[1] work also in\n> sarge[2]. If he stops building them, we sarge users will miss them.\n> Any volunteers to maintain them, for example, through backports.org?\n\nThanks to Norbert Tretkowski, the git* and cogito packages are now\navailable for Debian sarge through http://backports.org/.\n\nRegards, Gerrit.\n"},{"id":"14207","messageId":"7vzmm9rnj7.fsf@assigned-by-dhcp.cox.net","threadId":"2935","inReplyTo":"20060102103138.3414.qmail@e631ec7a6a8b9a.315fe32.mid.smarden.org","subject":"Re: [PATCH] debian/ directory","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-01-06T22:37:16Z","receivedAt":"2006-01-06T22:37:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Gerrit Pape writes:\n\n> Thanks to Norbert Tretkowski, the git* and cogito packages are now\n> available for Debian sarge through http://backports.org/.\n\nGood to hear. Does that mean nobody would suffer if I drop\ndebian/ subdirectory along with deb target in the main Makefile\nanymore? If so I would.\n"},{"id":"14245","messageId":"20060107111948.GC32585@nowhere.earth","threadId":"2935","inReplyTo":"7vzmm9rnj7.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] debian/ directory","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2006-01-07T11:19:48Z","receivedAt":"2006-01-07T11:19:48Z","isPatch":true,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"On Fri, Jan 06, 2006 at 02:37:16PM -0800, Junio C Hamano wrote:\n> Gerrit Pape writes:\n> \n> > Thanks to Norbert Tretkowski, the git* and cogito packages are now\n> > available for Debian sarge through http://backports.org/.\n> \n> Good to hear. Does that mean nobody would suffer if I drop\n> debian/ subdirectory along with deb target in the main Makefile\n> anymore? If so I would.\n\nWell, it's probably still a quick way to produce snapshot packages\nwhen needed. An alternative could be to have Norbert's tree\naccessible, and possibly advertized in the docs, so a simple merge\nwould be sufficient to build a snapshot package.\n\nBest regards,\n-- \nYann Dirson |\nDebian-related: | Support Debian GNU/Linux:\n | Freedom, Power, Stability, Gratis\n http://ydirson.free.fr/ | Check \n"},{"id":"14266","messageId":"7vace7elsy.fsf@assigned-by-dhcp.cox.net","threadId":"2935","inReplyTo":"20060107111948.GC32585@nowhere.earth","subject":"Re: [PATCH] debian/ directory","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-01-07T22:05:17Z","receivedAt":"2006-01-07T22:05:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Yann Dirson writes:\n\n> Well, it's probably still a quick way to produce snapshot packages\n> when needed. An alternative could be to have Norbert's tree\n> accessible, and possibly advertized in the docs, so a simple merge\n> would be sufficient to build a snapshot package.\n\nI took a brief look at backports.org and git-core_$V.diff there.\nIt is my understanding that Norbert's tree is essentially a copy\nof Gerrit's, with inevitable differences in debian/changelog.\nIf we _were_ to replace it with something else, I'd rather get\npatches fed from Gerrit.\n"}]}