{"thread":{"id":"1282","subject":"[PATCH] Deb packages should include the binaries","startedAt":"2005-07-21T06:15:45Z","lastAt":"2005-07-22T06:36:07Z","messageCount":3,"participants":["Ryan Anderson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"6287","messageId":"20050721061545.GM20369@mythryan2.michonline.com","threadId":"1282","inReplyTo":null,"subject":"[PATCH] Deb packages should include the binaries","fromName":"Ryan Anderson","fromEmail":"ryan@michonline.com","sentAt":"2005-07-21T06:15:45Z","receivedAt":"2005-07-21T06:15:45Z","isPatch":true,"sender":{"key":"ryan@michonline.com","avatar":null},"body":"\nThe Deb packages were mising a dependency on \"build install\" from the\nbinary target - this fixes that, and cleans up some inconsistencies\nelsewhere in the rulesets.\n\nTraditionally, Debian packaging uses a file called \"build-stamp\" (or\n\"install-stamp\", etc) in the main source tree.  The initial deb package\nsupport for Git tried to move this \"build-stamp\" file into the debian/\ndirectory, but some instances were missed.  That problem, however, was\nincidental - the real fix is the missing dependency mentioned above.\n\n\ndiff --git a/debian/changelog b/debian/changelog\n--- a/debian/changelog\n+++ b/debian/changelog\n@@ -1,5 +1,11 @@\n+git-core (0.99-1) unstable; urgency=low\n+\n+  * Update deb package support to build correctly. \n+\n+ -- Ryan Anderson <ryan@michonline.com>  Thu, 21 Jul 2005 02:03:32 -0400\n+\n git-core (0.99-0) unstable; urgency=low\n-\t\n+\n   * Initial deb package support\n \n  -- Eric Biederman <ebiederm@xmission.com>  Tue, 12 Jul 2005 10:57:51 -0600\ndiff --git a/debian/rules b/debian/rules\n--- a/debian/rules\n+++ b/debian/rules\n@@ -21,8 +21,8 @@ DESTDIR  := $(CURDIR)/debian/tmp\n DOC_DESTDIR := $(DESTDIR)/usr/share/doc/git-core/\n MAN_DESTDIR := $(DESTDIR)/$(MANDIR)\n \n-build: build-stamp\n-build-stamp:\n+build: debian/build-stamp\n+debian/build-stamp:\n \tdh_testdir\n \t$(MAKE) all doc\n \ttouch debian/build-stamp\n@@ -36,7 +36,7 @@ debian-clean:\n clean: debian-clean\n \t$(MAKE) clean\n \n-install: debian/build-stamp\n+install: build\n \tdh_testdir\n \tdh_testroot\n \tdh_clean -k \n@@ -49,7 +49,7 @@ install: debian/build-stamp\n \n \tdh_install --list-missing --sourcedir=$(DESTDIR)\n \n-binary:\n+binary: build install\n \tdh_testdir\n \tdh_testroot\n \tdh_installchangelogs\n-- \n\nRyan Anderson\n  sometimes Pug Majere\n"},{"id":"6302","messageId":"20050722055556.GR20369@mythryan2.michonline.com","threadId":"1282","inReplyTo":"20050721061545.GM20369@mythryan2.michonline.com","subject":"[PATCH] Deb packages should include the binaries (Try 2 - this time it actually applies)","fromName":"Ryan Anderson","fromEmail":"ryan@michonline.com","sentAt":"2005-07-22T05:55:56Z","receivedAt":"2005-07-22T05:55:56Z","isPatch":true,"sender":{"key":"ryan@michonline.com","avatar":null},"body":"\nThe Deb packages were mising a dependency on \"build install\" from the\nbinary target - this fixes that, and cleans up some inconsistencies\nelsewhere in the rulesets.\n\nTraditionally, Debian packaging uses a file called \"build-stamp\" (or\n\"install-stamp\", etc) in the main source tree.  The initial deb package\nsupport for Git tried to move this \"build-stamp\" file into the debian/\ndirectory, but some instances were missed.  That problem, however, was\nincidental - the real fix is the missing dependency mentioned above.\n\n(version 2 of this patch.  I missed an early commit in v1 that made the old\npatch impossible to apply.)\n\nSigned-off-by: Ryan Anderson <ryan@michonline.com>\n\n\ndiff --git a/debian/changelog b/debian/changelog\n--- a/debian/changelog\n+++ b/debian/changelog\n@@ -1,5 +1,11 @@\n+git-core (0.99-1) unstable; urgency=low\n+\n+  * Update deb package support to build correctly. \n+\n+ -- Ryan Anderson <ryan@michonline.com>  Thu, 21 Jul 2005 02:03:32 -0400\n+\n git-core (0.99-0) unstable; urgency=low\n-\t\n+\n   * Initial deb package support\n \n  -- Eric Biederman <ebiederm@xmission.com>  Tue, 12 Jul 2005 10:57:51 -0600\ndiff --git a/debian/control b/debian/control\n--- a/debian/control\n+++ b/debian/control\n@@ -7,7 +7,7 @@ Standards-Version: 3.6.1\n \n Package: git-core\n Architecture: any\n-Depends: ${shlibs:Depends}, shellutils, diff, rsync, rcs\n+Depends: ${misc:Depends}, shellutils, diff, rsync, rcs\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\ndiff --git a/debian/rules b/debian/rules\n--- a/debian/rules\n+++ b/debian/rules\n@@ -21,8 +21,8 @@ DESTDIR  := $(CURDIR)/debian/tmp\n DOC_DESTDIR := $(DESTDIR)/usr/share/doc/git-core/\n MAN_DESTDIR := $(DESTDIR)/$(MANDIR)\n \n-build: build-stamp\n-build-stamp:\n+build: debian/build-stamp\n+debian/build-stamp:\n \tdh_testdir\n \t$(MAKE) all doc\n \ttouch debian/build-stamp\n@@ -36,7 +36,7 @@ debian-clean:\n clean: debian-clean\n \t$(MAKE) clean\n \n-install: debian/build-stamp\n+install: build\n \tdh_testdir\n \tdh_testroot\n \tdh_clean -k \n@@ -47,9 +47,9 @@ install: debian/build-stamp\n \tmkdir -p $(DOC_DESTDIR)\n \tfind $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'\n \n-\tdh_install --sourcedir=$(DESTDIR)\n+\tdh_install --list-missing --sourcedir=$(DESTDIR)\n \n-binary:\n+binary: build install\n \tdh_testdir\n \tdh_testroot\n \tdh_installchangelogs\n-- \n\nRyan Anderson\n  sometimes Pug Majere\n"},{"id":"6303","messageId":"20050722063607.GS20369@mythryan2.michonline.com","threadId":"1282","inReplyTo":"20050722055556.GR20369@mythryan2.michonline.com","subject":"[PATCH] Deb packaging needs two more configuration files","fromName":"Ryan Anderson","fromEmail":"ryan@michonline.com","sentAt":"2005-07-22T06:36:07Z","receivedAt":"2005-07-22T06:36:07Z","isPatch":true,"sender":{"key":"ryan@michonline.com","avatar":null},"body":"\nThe deb package building needs these two new files to work correctly.\n\ndebian/compat sets the rules under which the debhelper scripts (dh_*) operate.\n\ndebian/git-core.install tells dh_install what files to install in each package\nthat is generated.  There is only one package being generated, so all files go\ninto it.\n\n(I missed these in the last patch, mostly because I needed to do this to\nfind stuff I had missed:\n\tfind . -name .git -type d -prune -o -type f -print \\\n\t\t| grep -v -e .tree1 -e .tree2 \\\n\t\t| sed -e \"s/^\\.\\///\" \\\n\t\t| sort >.tree1\n\tgit-ls-files | grep -v -e .tree1 -e .tree2 \\\n\t\t| sort >.tree2\n\tdiff -u .tree1 .tree2\n)\n\nSigned-off-by: Ryan Anderson <ryan@michonline.com>\n---\n\n debian/compat           |    1 +\n debian/git-core.install |    1 +\n 2 files changed, 2 insertions(+), 0 deletions(-)\n create mode 100644 debian/compat\n create mode 100644 debian/git-core.install\n\nd5ccc10c30f1baa968705aa0c3dfc98e0ade5eaf\ndiff --git a/debian/compat b/debian/compat\nnew file mode 100644\n--- /dev/null\n+++ b/debian/compat\n@@ -0,0 +1 @@\n+4\ndiff --git a/debian/git-core.install b/debian/git-core.install\nnew file mode 100644\n--- /dev/null\n+++ b/debian/git-core.install\n@@ -0,0 +1 @@\n+*\n"}]}