Use simple rules with dh 7 in debian/rules

diff --git a/debian/changelog b/debian/changelog
index 2568677706e0d6ba43827c8f9e082f6bb360743e..60b84a2bfaf6fcaa5c2e367aa7b5b7eb4459cfcb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,8 +38,10 @@ lilo (1:23.1-1) unstable; urgency=low
   * debian/patches:
     - Add new patches for Debian.
     - Add patches for simple rules using dh 7.
+  * debian/rules:
+    - Use simple rules with dh 7 capabilities.
 
- -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 18 Nov 2010 20:32:02 +0100
+ -- Joachim Wiedorn <ad_debian@joonet.de>  Thu, 18 Nov 2010 23:30:42 +0100
 
 lilo (1:22.8-8.3) unstable; urgency=high
 

diff --git a/debian/lilo.manpages b/debian/lilo.manpages
index ef08f28932a38e15b7a675ad0ec36740138591d0..00e630123263d85726fef4fd03f80dc1254d4245 100644 (file)
--- a/debian/lilo.manpages
+++ b/debian/lilo.manpages
@@ -1,5 +1,4 @@
 debian/manpages/liloconfig.8
-debian/manpages/lilo.real.8
 debian/manpages/lilo-uuid-diskid.8
 debian/manpages/update-lilo.8
 man/keytab-lilo.8

diff --git a/debian/rules b/debian/rules
index 8ddb7668adf5afe91dc7bf7504edf9b5b5703d20..3eaf127a8c00a35fdd15c388d081593493bb72f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,85 +1,11 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
-
-BUILD_DIR=`pwd`/debian
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
- 
-build: $(QUILT_STAMPFN)
-       dh_testdir
-       @if [ -r $$ROOT/etc/lilo.defines ]; then \
-               echo "******************************************"; \
-               echo "WARNING: lilo.defines overwriting defaults"; \
-       fi
-       #make LDFLAGS="-s"
-       make all
-       make docs
-       #make -C doc user.ps tech.ps
-       touch build
-
-clean: unpatch
-       dh_testdir
-       make spotless
-       -rm -f build debian/files debian/lilo.substvars debian/substvars debian/*~ *~
-       -rm -f doc/*.dvi doc/*.ps doc/*.aux doc/*.toc doc/*.log
-       -rm -rf debian/lilo debian/lilo-doc debian/*.debhelper debian/patched
-
-       # Make sure that we provide up-to-date POT and PO files
-       debconf-updatepo
-
-binary-indep: build
-       dh_testdir
 
-binary-arch: build
-       dh_testdir
-       rm -rf debian/$(BUILD_DIR)/lilo
-       dh_installdirs -plilo -P$(BUILD_DIR)/lilo
-       install -g root -m 755 -o root lilo debian/lilo/sbin/lilo.real
-       install -g root -m 755 -o root mkrescue debian/lilo/usr/sbin/
-       install -g root -m 755 -o root debian/lilo.sh debian/lilo/sbin/lilo
-       install -g root -m 755 -o root activate debian/lilo/sbin/
-       install -g root -m 755 -o root keytab-lilo.pl debian/lilo/usr/sbin/keytab-lilo
-       install -g root -m 755 -o root debian/liloconfig debian/lilo/usr/sbin/
-       install -g root -m 755 -o root debian/lilo_find_mbr debian/lilo/usr/sbin/
-       install -g root -m 755 -o root debian/lilo.initramfs-post-update \
-               debian/lilo/etc/initramfs/post-update.d/lilo
-       install -g root -m 755 -o root debian/lilo.kernel-postinst \
-               debian/lilo/etc/kernel/postinst.d/zz-lilo
-       install -g root -m 755 -o root debian/lilo.kernel-postrm \
-               debian/lilo/etc/kernel/postrm.d/zz-lilo
-       dh_installdocs  
-       cp debian/contrib/debianlilobmp.conf debian/lilo/usr/share/lilo/
-       cp debian/contrib/sidbmp.conf debian/lilo/usr/share/lilo/
-       cp debian/contrib/sargebmp.conf debian/lilo/usr/share/lilo/
-       cp debian/contrib/coffeebmp.conf debian/lilo/usr/share/lilo/
-       uudecode debian/contrib/sid-menu
-       uudecode debian/contrib/sarge-menu
-       uudecode debian/contrib/debianlilo-menu
-       uudecode debian/contrib/coffee-menu
-       cp debian/contrib/lilo-term.xpm debian/lilo/usr/share/pixmaps
-       cp debian/Makefile.floppy bootsect.b debian/lilo/usr/lib/lilo
-       cp README debian/lilo/usr/share/doc/lilo/Manual.txt
-       dh_installman 
-       dh_installdebconf 
-       dh_installchangelogs -plilo CHANGES upstream
-       dh_installchangelogs 
-       dh_installexamples
-       dh_installmenu 
-       dh_link
-       dh_strip  
-       dh_compress 
-       dh_fixperms 
-       dh_shlibdeps  
-       dh_gencontrol 
-       dh_installdeb  
-       dh_md5sums  
-       dh_builddeb  
 
-binary: binary-indep binary-arch
+%:
+       dh $@
 
-testdir:
-       dh_testroot
-       
-.PHONY: build clean binary-indep binary-arch binary patch unpatch