[PATCH] Deb packages should include the binaries

The Deb packages were missing 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.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/debian/changelog b/debian/changelog
index 18bd6a77fa4c4307f774e91bbbb5a663ebdc6899..7cbf2f4db7167e2e7ce2069d562f7ce9f4ee3e21 100644 (file)
--- 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 <ryan@michonline.com>  Thu, 21 Jul 2005 02:03:32 -0400
+

 git-core (0.99-0) unstable; urgency=low
 git-core (0.99-0) unstable; urgency=low

-       
+

   * Initial deb package support
 
  -- Eric Biederman <ebiederm@xmission.com>  Tue, 12 Jul 2005 10:57:51 -0600
   * Initial deb package support
 
  -- Eric Biederman <ebiederm@xmission.com>  Tue, 12 Jul 2005 10:57:51 -0600

diff --git a/debian/control b/debian/control
index a9732ea59d452e1bc72aa5c13e37ebcffb2367ef..a774a629baec24fcb61781a64d0758d8b30f1594 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1
 
 Package: git-core
 Architecture: any
 
 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
 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
index 9445101601efdcbe6881b4192c2a8ea6746fa8c4..aff43b836ddf857b35b1123f6c300a32ab43797e 100755 (executable)
--- 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)
 
 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
        dh_testdir
        $(MAKE) all doc
        touch debian/build-stamp


@@ -36,7 +36,7 @@ debian-clean:
 clean: debian-clean
        $(MAKE) clean
 
 clean: debian-clean
        $(MAKE) clean
 

-install: debian/build-stamp
+install: build

        dh_testdir
        dh_testroot
        dh_clean -k 
        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) ';'
 
        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
        dh_testdir
        dh_testroot
        dh_installchangelogs