[hamradio-commits] [xnec2c] 05/05: Updated package to dh-autoreconf, patched new packages to make them build, added doc base registration and manpages, new url in watchfile.

Mon May 4 19:51:53 UTC 2015

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

hibby-guest pushed a commit to branch master
in repository xnec2c.

commit cd1b4825692860f4a8f3ac25fed0149f8b5469ee
Author: Dave Hibberd <d at vehibberd.com>
Date:   Mon May 4 20:45:20 2015 +0100

    Updated package to dh-autoreconf, patched new packages to make them build, added doc base registration and manpages, new url in watchfile.
---
 debian/changelog                     |  12 +++++
 debian/compat                        |   2 +-
 debian/control                       |   6 +--
 debian/patches/add-to-POTFILES.patch |  17 ++++++
 debian/patches/fix-misc.c.patch      |  16 ++++++
 debian/patches/series                |   2 +
 debian/rules                         | 101 +----------------------------------
 debian/watch                         |   5 +-
 debian/xnec2c.doc-base               |   9 ++++
 debian/xnec2c.manpages               |   1 +
 10 files changed, 64 insertions(+), 107 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d818064..0b8750c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xnec2c (1:3.3-1) unstable; urgency=medium
+
+  * New upstream release. 
+  * Bumped to debhelper 9
+  * Bumped standards version to 3.9.6
+  * Updated watchfile to working links
+  * Updated from automake to dh-autoreconf
+  * Added doc-base registration for HTML docs
+  * Added xnec2c.manpages file
+
+ -- Dave Hibberd <d at vehibberd.com>  Mon, 04 May 2015 18:44:07 +0100
+
 xnec2c (1:3.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 508607f..1c493a3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: xnec2c
 Section: hamradio
 Priority: extra
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
-Uploaders: Steve Conklin <steve at conklinhouse.com>, Kamal Mostafa <kamal at whence.com>, Colin Tuckley <colint at debian.org>
-Build-Depends: debhelper (>= 7), libgtk2.0-dev, automake (>= 1.9), intltool (>= 0.50.0)
-Standards-Version: 3.9.5
+Uploaders: Steve Conklin <steve at conklinhouse.com>, Kamal Mostafa <kamal at whence.com>, Colin Tuckley <colint at debian.org>, Dave Hibberd <d at vehibberd.com>
+Build-Depends: debhelper (>= 9), libgtk2.0-dev,intltool (>= 0.50.0), dh-autoreconf
+Standards-Version: 3.9.6
 Homepage: http://www.5b4az.org/
 
 Package: xnec2c
diff --git a/debian/patches/add-to-POTFILES.patch b/debian/patches/add-to-POTFILES.patch
new file mode 100644
index 0000000..b1e55fa
--- /dev/null
+++ b/debian/patches/add-to-POTFILES.patch
@@ -0,0 +1,17 @@
+Description: Adds new files with translatable strings to POTFILES.in, as advised by the installer
+Author: Dave Hibberd <d at vehibberd.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -18,3 +18,9 @@
+ src/support.c
+ src/xnec2c.c
+ xnec2c.glade
++#List of source files to be added according to installer
++src/gnuplot.c
++src/input.c
++src/network.c
++src/somnec.c
++
diff --git a/debian/patches/fix-misc.c.patch b/debian/patches/fix-misc.c.patch
new file mode 100644
index 0000000..adcca20
--- /dev/null
+++ b/debian/patches/fix-misc.c.patch
@@ -0,0 +1,16 @@
+Description: renaming misc.c to utils.c to match upstream code changes
+Author: Dave Hibberd <d at vehibberd.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -11,7 +11,7 @@
+ src/geometry.c
+ src/ground.c
+ src/matrix.c
+-src/misc.c
++src/utils.c
+ src/nec2_model.c
+ src/plot_freqdata.c
+ src/radiation.c
diff --git a/debian/patches/series b/debian/patches/series
index fd615d9..25d0fb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+add-to-POTFILES.patch
+fix-misc.c.patch
 spellings.patch
diff --git a/debian/rules b/debian/rules
index ada3f56..dd9063b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,101 +1,4 @@
 #!/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.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-# enable hardening flags (for debian/compat<9):
-configure_flags += $(shell f=`dpkg-buildflags --export=configure` && echo $$f)
-
-config.status: configure
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info $(configure_flags)
-
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-#	cp -f /usr/share/misc/config.sub config.sub
-#endif
-#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-#	cp -f /usr/share/misc/config.guess config.guess
-#endif
-	dh_clean
-	[ ! -f mkinstalldirs ] || chmod +x mkinstalldirs
-	chmod +x configure depcomp missing
- 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/xnec2c.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/xnec2c 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_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman doc/xnec2c.1.gz
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@ --with autoreconf
diff --git a/debian/watch b/debian/watch
index 3bfb993..9f7d2b5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,2 @@
 version=3
-
-opts=uversionmangle=s/-(beta\d*)$/~$1/ \
-http://www.5b4az.org/pages/nec2.html \
-(?:.*/|)xnec2c(?:-|_|_v|\.|V|)(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz)
+http://www.5b4az.org/pkg/nec2/xnec2c/ xnec2c-(.+)\.tar\.bz2
diff --git a/debian/xnec2c.doc-base b/debian/xnec2c.doc-base
new file mode 100644
index 0000000..f224640
--- /dev/null
+++ b/debian/xnec2c.doc-base
@@ -0,0 +1,9 @@
+Document: xnec2c
+Title: Xnec2c User Manual
+Author: Neoklis Kyriazis
+Abstract: This manual describes what xnec2c is and how to use it.
+Section: Amateur Radio
+
+Format: HTML
+Index: /usr/share/doc/xnec2c/xnec2c.html
+Files: /usr/share/doc/xnec2c/xnec2c.html
diff --git a/debian/xnec2c.manpages b/debian/xnec2c.manpages
new file mode 100644
index 0000000..4282f51
--- /dev/null
+++ b/debian/xnec2c.manpages
@@ -0,0 +1 @@
+doc/xnec2c.1.gz

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

