diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | debian/rules | 83 |
2 files changed, 10 insertions, 74 deletions
diff --git a/debian/changelog b/debian/changelog index fdb8187..3a3f7eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ figlet (2.2.5-1) UNRELEASED; urgency=low - Update S-V to 3.9.3 - Bump Debhelper to v9 - Switch to dpkg-source 3.0 (quilt) format + - Switch to dh-style debian/rules (closes: #672320) -- Jonathan McCrohan <jmccrohan@gmail.com> Tue, 08 May 2012 21:13:27 +0100 diff --git a/debian/rules b/debian/rules index 8ef102a..32af095 100755 --- a/debian/rules +++ b/debian/rules @@ -1,80 +1,15 @@ #!/usr/bin/make -f -# adapted from a sample in the the debhelper -# package -# GNU copyright 1997 to 1999 by Joey Hess. -# GNU copyright 2000 to 2003 by Francesco Tapparo # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 -export DH_COMPAT=4 -export DH_OPTIONS= -p figlet +#export DH_VERBOSE=1 -export installbin = install -g root -o root -m 755 -export installdoc = install -g root -o root -m 644 - -build: build-stamp -build-stamp: - dh_testdir - -mkdir debian/trash - - # Add here commands to compile the package. - $(MAKE) DEFAULTFONTDIR="/usr/share/figlet" DESTDIR="/usr/bin" - - touch stamp-build - -clean: - dh_testdir - rm -f build-stamp - rm -f install-stamp - -rm -rf debian/trash - - # Add here commands to clean up after the build process. - -$(MAKE) clean - find . -name '*~' -exec rm {} \; - -rm -f stamp-build - -rm -f debian/figlet.elc - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - dh_installexamples debian/examples/moolets - - # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=debian/figlet/usr/bin \ - DEFAULTFONTDIR=debian/figlet/usr/share/figlet \ - MANDIR=debian/trash +override_dh_auto_install: + $(MAKE) install BINDIR=debian/figlet/usr/bin \ + DEFAULTFONTDIR=debian/figletusr/share/figlet \ + MANDIR=debian/trash mv debian/figlet/usr/bin/figlet debian/figlet/usr/bin/figlet-figlet - $(installbin) -d debian/figlet/usr/share/emacs/site-lisp - $(installdoc) debian/figlet.el \ - debian/figlet/usr/share/emacs/site-lisp/figlet.el - - $(installbin) -d debian/figlet/usr/share/emacs/site-lisp - $(installdoc) debian/figlet.el debian/figlet/usr/share/emacs/site-lisp - - touch install-stamp - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installman - dh_installchangelogs CHANGES - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_builddeb + dh_installdirs /usr/share/emacs/site-lisp + dh_install debian/figlet.el /usr/share/emacs/site-lisp -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ |