move to dh, etc

diff --git a/debian/changelog b/debian/changelog
index 634041dc67a24829cc4525bfb2d11021a5ee0b41..bdfd3f5c3684d7bfdeaf599562882fba054a4cf6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 efibootmgr (0.5.4-3) UNRELEASED; urgency=low
 
   * add Vcs entries to the control file
+  * update standards version
+  * move to dh
 
- -- Bdale Garbee <bdale@gag.com>  Thu, 11 Nov 2010 18:04:04 -0700
+ -- Bdale Garbee <bdale@gag.com>  Fri, 29 Jun 2012 08:18:06 -0600
 
 efibootmgr (0.5.4-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 8c26154f47e693a9c666e914bc403a0a25840987..4a9aaa4ee30fbb8d0261564fa83a7ba65a258dfe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: efibootmgr
 Section: admin
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
-Build-Depends: debhelper (>> 5), docbook-to-man, libpci-dev, zlib1g-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 9), docbook-to-man, libpci-dev, zlib1g-dev
+Standards-Version: 3.9.3
 Vcs-Git: git://git.gag.com/debian/efibootmgr
 Vcs-Browser: http://git.gag.com/?p=debian/efibootmgr
 
 Package: efibootmgr
 Architecture: amd64 i386 ia64
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Interact with the EFI Boot Manager 
  This is a Linux user-space application to modify the Intel Extensible 
  Firmware Interface (EFI) Boot Manager configuration.  This application can 

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index ba077a4..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-bin

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 44fc486..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-doc/TODO

diff --git a/debian/efibootmgr.dirs b/debian/efibootmgr.dirs
new file mode 100644 (file)
index 0000000..ba077a4
--- /dev/null
+++ b/debian/efibootmgr.dirs
@@ -0,0 +1 @@
+bin

diff --git a/debian/efibootmgr.docs b/debian/efibootmgr.docs
new file mode 100644 (file)
index 0000000..44fc486
--- /dev/null
+++ b/debian/efibootmgr.docs
@@ -0,0 +1,2 @@
+README
+doc/TODO

diff --git a/debian/efibootmgr.install b/debian/efibootmgr.install
new file mode 100644 (file)
index 0000000..1b1106c
--- /dev/null
+++ b/debian/efibootmgr.install
@@ -0,0 +1 @@
+src/efibootmgr/efibootmgr bin

diff --git a/debian/efibootmgr.manpages b/debian/efibootmgr.manpages
new file mode 100644 (file)
index 0000000..44fcdbc
--- /dev/null
+++ b/debian/efibootmgr.manpages
@@ -0,0 +1 @@
+efibootmgr.8

diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644 (file)
index 6d5ee0a..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# Configuration file for git-buildpackage and friends
-
-[DEFAULT]
-# the default build command:
-#builder = debuild -i\.git/ -I.git
-# the default clean command:
-#cleaner = debuild clean
-# the default branch for upstream sources:
-upstream-branch = upstream
-# the default branch for the debian patch:
-debian-branch = master
-# the default tag formats used:
-#upstream-tag = upstream/%(version)s
-#debian-tag = debian/%(version)s
-# use pristine-tar:
-pristine-tar = True
-
-# Options only affecting git-buildpackage
-[git-buildpackage]
-#upstream-branch = dfsgclean
-# uncomment this to automatically GPG sign tags
-#sign-tags = True
-# keyid to GPG sign tags with
-#keyid = 0xdeadbeef
-# push to a remote repository after a successful tag: 
-#posttag = git-push git.example.com
-# use this for more svn-buildpackage like behaviour:
-export-dir = ../build-area/efibootmgr/
-#tarball-dir = ../tarballs/
-
-# Options only affecting git-import-orig
-[git-import-orig]
-#upstream-branch = newupstream
-#debian-branch = dfsgclean
-#filter = .svn
-
-# Options only affecting git-import-dsc
-[git-import-dsc]
-#upstream-branch = svn-upstream
-#filter = [ 'CVS', '.cvsignore' ]
-
-# Options only affecting git-dch
-[git-dch]
-#git-log = --no-merges
-#snapshot-number = snapshot + 1
-

diff --git a/debian/rules b/debian/rules
index cd1592155076c240bd1a3a764e09a56459ef2ae4..1e214a22fd0153e1329ea6c8e8809366c2e579d4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,57 +1,8 @@
 #!/usr/bin/make -f
+# rules file for the efibootmgr package, requires debhelper / dh
+# copyright 2012 by Bdale Garbee, GPLv2 or later
 
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
+export DH_VERBOSE=1
 
-       touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
-       dh_testdir
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       $(MAKE) clean
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       cp src/efibootmgr/efibootmgr debian/efibootmgr/bin/efibootmgr
-       chown root:root debian/efibootmgr/bin/efibootmgr
-       chmod 0755 debian/efibootmgr/bin/efibootmgr
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installexamples
-       dh_installmenu
-       dh_installcron
-       dh_installman src/man/man8/efibootmgr.8
-       dh_installinfo
-       dh_installchangelogs doc/ChangeLog
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+       dh $@