From: Axel Beckert Date: Sun, 16 Sep 2012 16:30:40 +0000 (+0200) Subject: Use dh_auto_install, installs to debian/mmv instead of debian/tmp X-Git-Tag: debian/1.01b-16~16 X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=76391b84bc80fa1291748ca994a00a23fe365dbb;p=pkg%2Fmmv.git Use dh_auto_install, installs to debian/mmv instead of debian/tmp Fix man page installation, no more need to use dh_installman and dh_install --- diff --git a/debian/dirs b/debian/dirs index e772481..98d1583 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1 +1,2 @@ usr/bin +usr/share/man/man1 diff --git a/debian/install b/debian/install deleted file mode 100644 index 17f805d..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/mmv diff --git a/debian/manpages b/debian/manpages deleted file mode 100644 index 6cd66f2..0000000 --- a/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -mmv.1 diff --git a/debian/patches/patches-as-of-mmv-1.01b-15.diff b/debian/patches/patches-as-of-mmv-1.01b-15.diff index b99d45b..e2f7242 100644 --- a/debian/patches/patches-as-of-mmv-1.01b-15.diff +++ b/debian/patches/patches-as-of-mmv-1.01b-15.diff @@ -696,9 +696,11 @@ Last-Update: 2012-09-16 .PP .I Mmvpatch also determines the best way to uniquely identify directories. ---- mmv-1.01b.orig/Makefile -+++ mmv-1.01b/Makefile -@@ -1,10 +1,10 @@ +Index: mmv/Makefile +=================================================================== +--- mmv.orig/Makefile 2012-09-16 18:24:31.375886230 +0200 ++++ mmv/Makefile 2012-09-16 18:24:46.260122528 +0200 +@@ -1,16 +1,16 @@ # Possible defines in CONF: # IS_MSDOS IS_SYSV IS_V7 IS_BSD HAS_DIRENT HAS_RENAME MV_DIR @@ -711,3 +713,10 @@ Last-Update: 2012-09-16 LDFLAGS =-s -N #IBIN =$(LOCAL)$(ARCH)/bin + #IMAN =$(LOCAL)$(ANY)/man + IBIN=$(DESTDIR)/usr/bin/ +-IMAN=$(DESTDIR)/usr/man/ ++IMAN=$(DESTDIR)/usr/share/man/ + + mmv: mmv.o + diff --git a/debian/rules b/debian/rules index 6736aa8..7bfcfaf 100755 --- a/debian/rules +++ b/debian/rules @@ -51,21 +51,19 @@ binary-arch: build dh_testdir test -f build || $(MAKE) -f debian/rules build # Makes a binary package. - /bin/rm -rf debian/tmp test -f stamp-build || $(MAKE) -f debian/rules build dh_installdirs - dh_install + dh_auto_install dh_strip - dh_installman - (cd debian/tmp/usr/bin;\ + (cd debian/mmv/usr/bin;\ ln -s mmv mcp; \ ln -s mmv mad; \ ln -s mmv mln;) - (cd debian/tmp/usr/share/man/man1;\ + (cd debian/mmv/usr/share/man/man1;\ ln -s mmv.1.gz mcp.1.gz; \ ln -s mmv.1.gz mad.1.gz; \ ln -s mmv.1.gz mln.1.gz;) - install -d -g root -m 755 -o root debian/tmp/usr/share/doc/$(p) + install -d -g root -m 755 -o root debian/mmv/usr/share/doc/$(p) dh_installdocs dh_installchangelogs dh_compress