[hamradio-commits] [linpsk] 02/05: Switch to modern dh for d/rules

[Iain Learmonth]

This is an automated email from the git hooks/post-receive script.

irl-guest pushed a commit to branch master
in repository linpsk.

commit 0e672287e5568bced883486494ed0c145589ea4f
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon May 4 17:12:31 2015 +0100

    Switch to modern dh for d/rules
    
     * Debhelper version to 9
     * Streamlines debian/rules
---
 debian/changelog      |  2 ++
 debian/compat         |  2 +-
 debian/control        |  2 +-
 debian/dirs           |  1 +
 debian/linpsk.install |  2 ++
 debian/rules          | 62 +++++----------------------------------------------
 6 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fa78ee..faaaedc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ linpsk (1.2-1) UNRELEASED; urgency=medium
     - Reformatted with cme
     - Bump standards version to 3.9.6
     - Removed version from build dependency on libqt4-dev
+  * debian/rules:
+    - Streamline using modern dh command
   * Refreshed patches:
     - Removed demowave.patch - now included upstream
     - Removed qt4.patch - no longer relevant
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 53c32f0..93686dc 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jaime Robles <jaime at debian.org>,
            Jerry Stueve <k4int at arrl.net>
 Section: hamradio
 Priority: optional
-Build-Depends: debhelper (>> 7),
+Build-Depends: debhelper (>> 9),
                libqt4-dev,
                libasound2-dev,
                libfftw3-dev
diff --git a/debian/dirs b/debian/dirs
index e772481..8fa061d 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
 usr/bin
+usr/share/applications
diff --git a/debian/linpsk.install b/debian/linpsk.install
new file mode 100644
index 0000000..262560b
--- /dev/null
+++ b/debian/linpsk.install
@@ -0,0 +1,2 @@
+debian/linpsk.desktop	usr/share/applications
+images/linpsk.png	usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 77f2159..8ee0708 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,60 +1,10 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
 
-APPNAME := linpsk
-builddir:
-	mkdir -p builddir
+%:
+	dh $@
 
-builddir/Makefile: builddir
-	cd builddir && qmake-qt4 PREFIX=/usr ../$(APPNAME).pro
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/linpsk/usr/local/bin/linpsk debian/linpsk/usr/bin
+	rm -rf debian/linpsk/usr/local
 
-build: build-stamp
-
-build-stamp: builddir/Makefile
-	dh_testdir
-	# Add here commands to compile the package.
-	cd builddir && $(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	# Add here commands to clean up after the build process.
-	rm -rf builddir
-	dh_clean
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/linpsk
-	cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
-
-# 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 --link-doc=linpsk
-	dh_installchangelogs ChangeLog
-	dh_installexamples
-	dh_installman
-	dh_installmenu
-	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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/linpsk.git