[med-svn] r10624 - trunk/packages/maqview/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-04-27 13:01:52 +0000 (Fri, 27 Apr 2012)
New Revision: 10624

Modified:
   trunk/packages/maqview/trunk/debian/changelog
   trunk/packages/maqview/trunk/debian/control
   trunk/packages/maqview/trunk/debian/rules
Log:
Use autoreconf which is more simple and transparent than the manual way to build twice in a row


Modified: trunk/packages/maqview/trunk/debian/changelog
===================================================================
--- trunk/packages/maqview/trunk/debian/changelog	2012-04-27 12:51:20 UTC (rev 10623)
+++ trunk/packages/maqview/trunk/debian/changelog	2012-04-27 13:01:52 UTC (rev 10624)
@@ -5,6 +5,9 @@
   * debian/control:
      - Standards-Version: 3.9.3 (no changes needed)
      - Fixed Vcs fields
+     - Removed quilt from Build-Depends because it is not needed
+  * debian/rules: Use autoreconf which is more simple and transparent
+    than the manual way to build twice in a row
 
  -- Andreas Tille <tille at debian.org>  Fri, 27 Apr 2012 14:44:13 +0200
 

Modified: trunk/packages/maqview/trunk/debian/control
===================================================================
--- trunk/packages/maqview/trunk/debian/control	2012-04-27 12:51:20 UTC (rev 10623)
+++ trunk/packages/maqview/trunk/debian/control	2012-04-27 13:01:52 UTC (rev 10624)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>,
  Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev, automake, freeglut3-dev, quilt
+Build-Depends: debhelper (>= 8), autotools-dev, automake, freeglut3-dev, dh-autoreconf
 Standards-Version: 3.9.3
 Homepage: http://maq.sourceforge.net/maqview.shtml
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/maqview/trunk/

Modified: trunk/packages/maqview/trunk/debian/rules
===================================================================
--- trunk/packages/maqview/trunk/debian/rules	2012-04-27 12:51:20 UTC (rev 10623)
+++ trunk/packages/maqview/trunk/debian/rules	2012-04-27 13:01:52 UTC (rev 10624)
@@ -4,11 +4,10 @@
 # GPL
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
-override_dh_auto_configure:
-	./autogen.sh
-	./configure
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 	make -f Makefile.generic maqview.1
 	### The *.class files in the source package can be reproduced by simply running
 	# javac MaqDataClient.java
@@ -17,12 +16,7 @@
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_auto_clean
-	rm -f aclocal.m4  config.guess  config.h.in  config.sub  configure  depcomp  install-sh  Makefile.in  missing
 	rm -f *.1
 
-override_dh_install:
-	mv $(CURDIR)/debian/`dh_listpackages`/usr/local/bin $(CURDIR)/debian/`dh_listpackages`/usr
-	rm -rf $(CURDIR)/debian/`dh_listpackages`/usr/local
-
 get-orig-source:
 	. debian/get-orig-source