[hamradio-commits] [xastir] 01/03: Begin work on a second revision for 2.0.6.

[Iain Learmonth]

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

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

commit d86205edb688ad6b9cd3ef47c70ec3948fde4347
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Wed Apr 1 20:02:01 2015 +0100

    Begin work on a second revision for 2.0.6.
    
     * debian/control:
       - Fixed formatting with cme.
       - Add automake as explicit build dependency.
       - Only depend on libax25 for architecture linux-any.
     * debian/rules
       - Stop configure being run twice.
       - Use dh_auto_clean to simplify clean target.
---
 debian/changelog | 12 ++++++++++++
 debian/control   | 31 +++++++++++++++++++++++++------
 debian/rules     |  8 +-------
 3 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de787e0..88a7ed2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xastir (2.0.6-2) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - Fixed formatting with cme.
+    - Add automake as explicit build dependency.
+    - Only depend on libax25 for architecture linux-any.
+  * debian/rules
+    - Stop configure being run twice.
+    - Use dh_auto_clean to simplify clean target.
+
+ -- Iain R. Learmonth <irl at fsfe.org>  Wed, 01 Apr 2015 19:55:56 +0100
+
 xastir (2.0.6-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #761837)
diff --git a/debian/control b/debian/control
index 7c83960..bd24a33 100644
--- a/debian/control
+++ b/debian/control
@@ -1,19 +1,38 @@
 Source: xastir
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: Iain R. Learmonth <irl at fsfe.org>,
+           Jerry Stueve <k4int at arrl.net>,
+           Kamal Mostafa <kamal at whence.com>
 Section: hamradio
 Priority: optional
-Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
-Uploaders: Iain R. Learmonth <irl at fsfe.org>, Jerry Stueve <k4int at arrl.net>, Kamal Mostafa <kamal at whence.com>
+Build-Depends: debhelper (>= 9),
+               libax25-dev,
+               libmotif-dev,
+               libxext-dev,
+               libxt-dev,
+               festival-dev,
+               libgraphicsmagick1-dev | libgraphicsmagick-dev,
+               libshp-dev,
+               libproj-dev,
+               libpcre3-dev,
+               libcurl4-gnutls-dev | libcurl-ssl-dev,
+               libgdal-dev (>= 1.10.0-0~),
+               libdb-dev,
+               libgeotiff-dev,
+               dh-autoreconf,
+               automake
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), libax25-dev, libmotif-dev, libxext-dev, libxt-dev, festival-dev, libgraphicsmagick1-dev | libgraphicsmagick-dev, libshp-dev, libproj-dev, libpcre3-dev, libcurl4-gnutls-dev | libcurl-ssl-dev, libgdal-dev (>= 1.10.0-0~), libdb-dev, libgeotiff-dev, dh-autoreconf
-Homepage: http://www.xastir.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/xastir.git/
 Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/xastir.git
+Homepage: http://www.xastir.org/
 
 Package: xastir
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: python
-Suggests: festival, direwolf | soundmodem
+Suggests: festival,
+          direwolf | soundmodem
 Description: X Amateur Station Tracking and Information Reporting
  Xastir is an APRS client for X. APRS is the Automatic Position Reporting
  System, a system where objects report their position (usually obtained from
diff --git a/debian/rules b/debian/rules
index b86e421..5423a1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
 %:
 	dh $@
 
-override_dh_auto_configure:
-	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
-
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=`pwd`/debian/xastir
 	rm -rf debian/xastir/usr/share/doc/xastir/* # The files we want get put back later
@@ -16,9 +13,6 @@ override_dh_auto_installchangelogs:
 	dh_installchangelogs ChangeLog
 
 clean:
-	dh_testdir
-	dh_autoreconf_clean
-	[ ! -f Makefile ] || $(MAKE) distclean
 	-rm -f src/callpass/Makefile
 	-rm -f config.log config.cache summary.log
-	dh_clean
+	dh_auto_clean

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