[hamradio-commits] [gsmc] 07/07: Switch to streamlined dh

Tue Aug 11 14:14:56 UTC 2015

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

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

commit 6921705b8bb68f71d2ab5ff600ae0e530734f7e1
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Tue Aug 11 13:26:35 2015 +0100

    Switch to streamlined dh
---
 debian/changelog                         | 11 +++++-
 debian/control                           | 15 ++++++---
 debian/gsmc.docs                         |  2 ++
 debian/gsmc.install                      |  2 ++
 debian/patches/add-lm-to-ldflags.patch   | 12 +++++++
 debian/patches/allow-pkg_lib-macro.patch | 57 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  3 +-
 debian/rules                             | 47 ++------------------------
 8 files changed, 97 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 969bf43..705cae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ gsmc (1.1-2) UNRELEASED; urgency=medium
   * Bump compat level to 9
   * debian/control:
     - Bump standards version to 3.9.6
-    - Change debhelper to version 9
+    - Change debhelper to version >= 9
     - Removed inactive uploaders:
       * Jaime Robles (never uploaded)
       * Patrick Ouellette (never uploaded)
@@ -12,7 +12,16 @@ gsmc (1.1-2) UNRELEASED; urgency=medium
     - Added myself to uploaders
     - Added Vcs-* fields for pkg-hamradio git
     - Added ${misc:Depends} to Build-Depends
+    - Added dh-autoreconf to Build-Depends
   * Source format changed to 3.0 (quilt)
+  * debian/rules:
+    - Switched to streamlined dh format
+  * debian/gsmc.{docs,install}:
+    - Created to install files installed before d/rules changes
+  * debian/patches/allow-pkg_lib-macro.patch:
+    - Created to allow the use of dh-autoreconf
+  * debian/patches/add-lm-to-ldflags.patch:
+    - Add -lm to LDFLAGS, now in Makefile.am not Makefile.in
 
  -- Iain R. Learmonth <irl at fsfe.org>  Tue, 11 Aug 2015 12:52:07 +0100
 
diff --git a/debian/control b/debian/control
index 1ea0e65..28dd6a2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,22 @@
 Source: gsmc
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org> 
+Uploaders: Iain R. Learmonth <irl at fsfe.org>
 Section: hamradio
 Priority: optional
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               libgtk2.0-dev,
+               libglib2.0-dev,
+               automake
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), libgtk2.0-dev, libglib2.0-dev, automake1.11
-Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org> 
-Homepage: http://www.qsl.net/ik5nax/index.html
-Uploaders: Iain R. Learmonth <irl at fsfe.org>
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/gsmc.git
 Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/gsmc.git
+Homepage: http://www.qsl.net/ik5nax/index.html
 
 Package: gsmc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: Smith Chart calculator for impedance matching
  gsmc allows you to perform Smith Chart calculations for
  RF (radio frequency) circuit design.
diff --git a/debian/gsmc.docs b/debian/gsmc.docs
new file mode 100644
index 0000000..3cc350b
--- /dev/null
+++ b/debian/gsmc.docs
@@ -0,0 +1,2 @@
+AUTHORS
+NEWS
diff --git a/debian/gsmc.install b/debian/gsmc.install
new file mode 100644
index 0000000..aafb32b
--- /dev/null
+++ b/debian/gsmc.install
@@ -0,0 +1,2 @@
+debian/mini-gsmc.xpm usr/share/pixmaps
+debian/gsmc.desktop usr/share/applications
diff --git a/debian/patches/add-lm-to-ldflags.patch b/debian/patches/add-lm-to-ldflags.patch
new file mode 100644
index 0000000..8d86896
--- /dev/null
+++ b/debian/patches/add-lm-to-ldflags.patch
@@ -0,0 +1,12 @@
+--- gsmc.orig/Makefile.am
++++ gsmc/Makefile.am
+@@ -4,6 +4,7 @@
+ gsmc_SOURCES= autotune.c calc.c dataconv.c draw.c main.c print.c widget.c autotune.h calc.h dataconv.h draw.h main.h print.h widget.h
+ INCLUDES=@PACKAGE_CFLAGS@
+ LIBS=@PACKAGE_LIBS@
++LDFLAGS=@LDFLAGS@ -lm
+ 
+ EXTRA_DIST=gsmc.1.in gtkrc TODO
+-man_MANS=gsmc.1
+\ No newline at end of file
++man_MANS=gsmc.1
diff --git a/debian/patches/allow-pkg_lib-macro.patch b/debian/patches/allow-pkg_lib-macro.patch
new file mode 100644
index 0000000..746c451
--- /dev/null
+++ b/debian/patches/allow-pkg_lib-macro.patch
@@ -0,0 +1,57 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ gsmc (1.1-2) UNRELEASED; urgency=medium
+ .
+   * Acknowledge NMUs
+   * Bump compat level to 9
+   * debian/control:
+     - Bump standards version to 3.9.6
+     - Change debhelper to version 9
+     - Removed inactive uploaders:
+       * Jaime Robles (never uploaded)
+       * Patrick Ouellette (never uploaded)
+       * Hamish Moffatt (by request)
+     - Added myself to uploaders
+     - Added Vcs-* fields for pkg-hamradio git
+     - Added ${misc:Depends} to Build-Depends
+   * Source format changed to 3.0 (quilt)
+Author: Iain R. Learmonth <irl at fsfe.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- gsmc.orig/configure.ac
++++ gsmc/configure.ac
+@@ -1,6 +1,8 @@
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
++m4_pattern_allow([PKG_LIB])
++
+ AC_PREREQ(2.57)
+ AC_INIT(gsmc, 1.0, ik5nax at amsat.org)
+ AC_CONFIG_SRCDIR([calc.c])
+@@ -16,7 +18,7 @@
+ # Checks for libraries.
+ LIBS=" "
+ PKG_LIB2=`pkg-config --libs gtk+-2.0`
+-PKG_LIB=""
++PKG_LIB=" "
+ for i in $PKG_LIB2 ; do
+         case $i in 
+                 -l*) PKG_LIB="$i $PKG_LIB" ;;
diff --git a/debian/patches/series b/debian/patches/series
index 76806ad..12a244d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-pre-quilt-patches.patch
+allow-pkg_lib-macro.patch
+add-lm-to-ldflags.patch
diff --git a/debian/rules b/debian/rules
index a312c2a..a79759d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,48 +1,5 @@
 #!/usr/bin/make -f
 
-AUTOMAKE_FILES = install-sh missing mkinstalldirs
+%:
+	dh $@ --with autoreconf
 
-build:
-	dh_testdir
-	for f in $(AUTOMAKE_FILES); do cp /usr/share/automake-1.11/$$f .; done
-	./configure --prefix=/usr --mandir=/usr/share/man
-	$(MAKE)
-	touch build
-
-clean:
-	dh_testdir
-	-rm -f build
-	[ ! -f Makefile ] || $(MAKE) distclean
-	for f in $(AUTOMAKE_FILES); do rm -f $$f; done
-	rm -f config.log
-	dh_clean
-
-binary-indep:	build
-# nothing else to do
-
-binary-arch:	build
-	dh_testroot
-	dh_clean
-	dh_installdirs
-	dh_installman
-	dh_installdocs README TODO AUTHORS
-	$(MAKE) install DESTDIR=`pwd`/debian/gsmc
-
-	dh_install debian/mini-gsmc.xpm usr/share/pixmaps
-	dh_install debian/gsmc.desktop usr/share/applications
-	dh_installmenu
-	dh_installchangelogs NEWS
-	dh_desktop
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_makeshlibs
-	dh_md5sums
-	dh_builddeb
-
-binary:		binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean

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

