Debianization updates

git-tk should be architecture independent.
git-core forgot to depend on perl.

Signed-Off-By: Matthias Urlichs <smurf@debian.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/debian/control b/debian/control
index c16f81a37136cb436dce9867647c7846b198a786..5df89dde323b1d5e580ad04ff83a488e236fbfe2 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}, ${misc:Depends}, patch, rcs
+Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, patch, rcs

 Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl
 Conflicts: git
 Description: The git content addressable filesystem
 Recommends: rsync, curl, ssh, libmail-sendmail-perl, libemail-valid-perl
 Conflicts: git
 Description: The git content addressable filesystem

diff --git a/debian/rules b/debian/rules
index f58ca7543213d41ec67b9a8d1bc9564f8562004c..c46b4d9466afc9e40522e1f0e842add623dd4d21 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -66,33 +66,36 @@ install: build
        dh_movefiles -p git-core
        find debian/tmp -type d -o -print | sed -e 's/^/? /'
 
        dh_movefiles -p git-core
        find debian/tmp -type d -o -print | sed -e 's/^/? /'
 

-binary: build install
+binary-arch: build install

        dh_testdir
        dh_testroot
        dh_testdir
        dh_testroot

-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate     
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress 
-       dh_fixperms
-#      dh_perl
-#      dh_python
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_installchangelogs -a
+       dh_installdocs -a
+       dh_strip -a
+       dh_compress  -a
+       dh_fixperms -a
+       dh_perl -a
+       dh_makeshlibs -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
+
+binary-indep: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs -i
+       dh_installdocs -i
+       dh_compress  -i
+       dh_fixperms -i
+       dh_makeshlibs -i
+       dh_installdeb -i
+       dh_shlibdeps -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
+
+binary: binary-arch binary-indep

 
 .PHONY: build clean binary install clean debian-clean
 
 .PHONY: build clean binary install clean debian-clean