# [PATCH] Deb packages should include the binaries 3 messages from 2005-07-21 to 2005-07-22. Participants: Ryan Anderson. Thread: https://gitlist.dev/t/1282 ## Ryan Anderson, 2005-07-21 06:15 Subject: [PATCH] Deb packages should include the binaries Message-ID: <20050721061545.GM20369@mythryan2.michonline.com> URL: https://gitlist.dev/e/20050721061545.GM20369%40mythryan2.michonline.com ``` The Deb packages were mising a dependency on "build install" from the binary target - this fixes that, and cleans up some inconsistencies elsewhere in the rulesets. Traditionally, Debian packaging uses a file called "build-stamp" (or "install-stamp", etc) in the main source tree. The initial deb package support for Git tried to move this "build-stamp" file into the debian/ directory, but some instances were missed. That problem, however, was incidental - the real fix is the missing dependency mentioned above. diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ +git-core (0.99-1) unstable; urgency=low + + * Update deb package support to build correctly. + + -- Ryan Anderson Thu, 21 Jul 2005 02:03:32 -0400 + git-core (0.99-0) unstable; urgency=low - + * Initial deb package support -- Eric Biederman Tue, 12 Jul 2005 10:57:51 -0600 diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,8 @@ DESTDIR := $(CURDIR)/debian/tmp DOC_DESTDIR := $(DESTDIR)/usr/share/doc/git-core/ MAN_DESTDIR := $(DESTDIR)/$(MANDIR) -build: build-stamp -build-stamp: +build: debian/build-stamp +debian/build-stamp: dh_testdir $(MAKE) all doc touch debian/build-stamp @@ -36,7 +36,7 @@ debian-clean: clean: debian-clean $(MAKE) clean -install: debian/build-stamp +install: build dh_testdir dh_testroot dh_clean -k @@ -49,7 +49,7 @@ install: debian/build-stamp dh_install --list-missing --sourcedir=$(DESTDIR) -binary: +binary: build install dh_testdir dh_testroot dh_installchangelogs -- Ryan Anderson sometimes Pug Majere ``` ## Ryan Anderson, 2005-07-22 05:55 Subject: [PATCH] Deb packages should include the binaries (Try 2 - this time it actually applies) Message-ID: <20050722055556.GR20369@mythryan2.michonline.com> URL: https://gitlist.dev/e/20050722055556.GR20369%40mythryan2.michonline.com In-Reply-To: <20050721061545.GM20369@mythryan2.michonline.com> ``` The Deb packages were mising a dependency on "build install" from the binary target - this fixes that, and cleans up some inconsistencies elsewhere in the rulesets. Traditionally, Debian packaging uses a file called "build-stamp" (or "install-stamp", etc) in the main source tree. The initial deb package support for Git tried to move this "build-stamp" file into the debian/ directory, but some instances were missed. That problem, however, was incidental - the real fix is the missing dependency mentioned above. (version 2 of this patch. I missed an early commit in v1 that made the old patch impossible to apply.) Signed-off-by: Ryan Anderson diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ +git-core (0.99-1) unstable; urgency=low + + * Update deb package support to build correctly. + + -- Ryan Anderson Thu, 21 Jul 2005 02:03:32 -0400 + git-core (0.99-0) unstable; urgency=low - + * Initial deb package support -- Eric Biederman Tue, 12 Jul 2005 10:57:51 -0600 diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1 Package: git-core Architecture: any -Depends: ${shlibs:Depends}, shellutils, diff, rsync, rcs +Depends: ${misc:Depends}, shellutils, diff, rsync, rcs Description: The git content addressable filesystem GIT comes in two layers. The bottom layer is merely an extremely fast and flexible filesystem-based database designed to store directory trees diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -21,8 +21,8 @@ DESTDIR := $(CURDIR)/debian/tmp DOC_DESTDIR := $(DESTDIR)/usr/share/doc/git-core/ MAN_DESTDIR := $(DESTDIR)/$(MANDIR) -build: build-stamp -build-stamp: +build: debian/build-stamp +debian/build-stamp: dh_testdir $(MAKE) all doc touch debian/build-stamp @@ -36,7 +36,7 @@ debian-clean: clean: debian-clean $(MAKE) clean -install: debian/build-stamp +install: build dh_testdir dh_testroot dh_clean -k @@ -47,9 +47,9 @@ install: debian/build-stamp mkdir -p $(DOC_DESTDIR) find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';' - dh_install --sourcedir=$(DESTDIR) + dh_install --list-missing --sourcedir=$(DESTDIR) -binary: +binary: build install dh_testdir dh_testroot dh_installchangelogs -- Ryan Anderson sometimes Pug Majere ``` ## Ryan Anderson, 2005-07-22 06:36 Subject: [PATCH] Deb packaging needs two more configuration files Message-ID: <20050722063607.GS20369@mythryan2.michonline.com> URL: https://gitlist.dev/e/20050722063607.GS20369%40mythryan2.michonline.com In-Reply-To: <20050722055556.GR20369@mythryan2.michonline.com> ``` The deb package building needs these two new files to work correctly. debian/compat sets the rules under which the debhelper scripts (dh_*) operate. debian/git-core.install tells dh_install what files to install in each package that is generated. There is only one package being generated, so all files go into it. (I missed these in the last patch, mostly because I needed to do this to find stuff I had missed: find . -name .git -type d -prune -o -type f -print \ | grep -v -e .tree1 -e .tree2 \ | sed -e "s/^\.\///" \ | sort >.tree1 git-ls-files | grep -v -e .tree1 -e .tree2 \ | sort >.tree2 diff -u .tree1 .tree2 ) Signed-off-by: Ryan Anderson --- debian/compat | 1 + debian/git-core.install | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 debian/compat create mode 100644 debian/git-core.install d5ccc10c30f1baa968705aa0c3dfc98e0ade5eaf diff --git a/debian/compat b/debian/compat new file mode 100644 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/git-core.install b/debian/git-core.install new file mode 100644 --- /dev/null +++ b/debian/git-core.install @@ -0,0 +1 @@ +* ```