move to use of dh(1) in rules, move git-buildpackage config to .git/

diff --git a/debian/changelog b/debian/changelog
index cbf2168dca3fdd779cebe69395711c6b0b68ace9..40f8ee0a33735a315817cce1a092b7ad07aac908 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ yforth (0.2.0-1) unstable; urgency=low
 
   * new upstream version under GPLv3, closes: #687348
   * update homepage field in control, closes: #688616
+  * move to use of dh in rules
 
  -- Bdale Garbee <bdale@gag.com>  Wed, 10 Oct 2012 08:47:55 -0600
 

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8

diff --git a/debian/control b/debian/control
index f6daafb93e092c52834154527e84d9b75d534514..9fee99e618787e78872752ffcae41df4fab749d2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: yforth
 Section: interpreters
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 8)
 Standards-Version: 3.9.3
 Homepage: http://www.di.unito.it/~padovani/software.html
 Vcs-Git: git://git.gag.com/debian/yforth

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

diff --git a/debian/examples b/debian/examples
deleted file mode 100644 (file)
index 01fc080..0000000
--- a/debian/examples
+++ /dev/null
@@ -1 +0,0 @@
-hello.yf

diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644 (file)
index 5e919fc..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/yforth/
-#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 6f116eaeccfc80b934638eac1b957a5f16f80f21..1c0b1dffae8630681f6366b20ac404dadea1a294 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,48 +5,5 @@
 
 export DH_VERBOSE=1
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-       dh_testdir
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-       [ ! -f Makefile ] || $(MAKE) clean
-       dh_clean
-
-binary-indep: build
-
-binary-arch: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       install -g root -m 755 -o root yforth debian/yforth/usr/bin/yforth
-
-       dh_installdocs
-       dh_installexamples
-       dh_installmenu
-       dh_installcron
-       dh_installman *.1
-       dh_installchangelogs
-       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 build-arch build-indep
+%:
+       dh $@

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

diff --git a/debian/yforth.examples b/debian/yforth.examples
new file mode 100644 (file)
index 0000000..01fc080
--- /dev/null
+++ b/debian/yforth.examples
@@ -0,0 +1 @@
+hello.yf

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

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