From 80e071b84838c922aa8acdf41ff5fd72c0c319ea Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Sat, 22 Oct 2011 15:13:47 -0600
Subject: [PATCH] move to dh, update standards version, mv git-buildpackage
 config to .git/

---
 debian/changelog |  6 +++++
 debian/control   |  4 +--
 debian/gbp.conf  | 46 ----------------------------------
 debian/rules     | 65 ++++++------------------------------------------
 4 files changed, 16 insertions(+), 105 deletions(-)
 delete mode 100644 debian/gbp.conf

diff --git a/debian/changelog b/debian/changelog
index 0a00ed4..af1d501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pax (1:20090728-3) UNRELEASED; urgency=low
+
+  * switch to use of dh
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 22 Oct 2011 15:08:57 -0600
+
 pax (1:20090728-2) unstable; urgency=low
 
   * update CFLAGS to prevent pax displaying file sizes 4*2^30 too large,
diff --git a/debian/control b/debian/control
index b1cb201..8fa58ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: pax
 Section: utils
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.2
 Vcs-Git: git://git.gag.com/debian/pax
 Vcs-Browser: http://git.gag.com/?p=debian/pax
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 99a0847..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 --mirror
-# use this for more svn-buildpackage like behaviour:
-export-dir = ../build-area/pax/
-#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 7b91107..416dbc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,61 +1,12 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# comment this to turn off verbose mode.
 export DH_VERBOSE=1
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp install-stamp
-
-	[ ! -f Makefile ] || $(MAKE) realclean
-
-	dh_clean
-
-install: install-stamp
-install-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) prefix=`pwd`/debian/pax/usr install
-
-	touch install-stamp
-
-# 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_installmanpages cpio.1 tar.1
-	dh_installchangelogs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh $@ 
-- 
2.30.2