From 704a66f52edbc0cc88dca3b0993a072ae49d0f39 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 12 Aug 2005 10:37:33 -0700 Subject: Make tools/ directory first-class citizen. Tools directory being separate is just a historical coincidence. Build and install together with the main directory, just like the clean target does. Signed-off-by: Junio C Hamano --- debian/rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 921aeecfb4..e81ed05bb8 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,8 @@ install: build dh_clean -k dh_installdirs - make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-tools install-doc + make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \ + install install-doc mkdir -p $(DOC_DESTDIR) find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';' -- cgit v1.2.3 From 5b6a8b649010d1b9362e703f8fe769c44fc0d7de Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 12 Aug 2005 12:25:34 -0700 Subject: Adjust binary packaging to dest=>DESTDIR change. Signed-off-by: Junio C Hamano --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index e81ed05bb8..f58ca75432 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,7 @@ install: build dh_clean -k dh_installdirs - make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \ + make DESTDIR=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \ install install-doc mkdir -p $(DOC_DESTDIR) -- cgit v1.2.3 From b8c20680c863379a7089091a4f1cd6ece20fd9e6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 12 Aug 2005 13:32:02 -0700 Subject: Fix debianization: mark git-tk architecture neutral. Signed-off-by: Junio C Hamano --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 85d4d0094f..2788cdd909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.4-4) unstable; urgency=low + + * Mark git-tk as architecture neutral. + + -- Junio C Hamano Fri, 12 Aug 2005 13:25:00 -0700 + git-core (0.99.4-3) unstable; urgency=low * Split off gitk. diff --git a/debian/control b/debian/control index 53b87f44a6..c16f81a371 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Description: The git content addressable filesystem similar to other SCM tools. Package: git-tk -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, git-core, tk8.4 Description: The git content addressable filesystem, GUI add-on This package contains 'gitk', the git revision tree visualizer. -- cgit v1.2.3 From af36b70ef939cc44c447a4b9cbaadd7eba9a20b1 Mon Sep 17 00:00:00 2001 From: Matthias Urlichs Date: Sat, 13 Aug 2005 02:38:15 +0200 Subject: Debianization updates git-tk should be architecture independent. git-core forgot to depend on perl. Signed-Off-By: Matthias Urlichs Signed-off-by: Junio C Hamano --- debian/control | 2 +- debian/rules | 55 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 30 insertions(+), 27 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index c16f81a371..5df89dde32 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1 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 diff --git a/debian/rules b/debian/rules index f58ca75432..c46b4d9466 100755 --- 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/^/? /' -binary: build install +binary-arch: build install 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 -- cgit v1.2.3