[med-svn] r14856 - trunk/packages/gentle/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-10-16 07:19:09 +0000 (Wed, 16 Oct 2013)
New Revision: 14856

Modified:
   trunk/packages/gentle/trunk/debian/changelog
   trunk/packages/gentle/trunk/debian/control
   trunk/packages/gentle/trunk/debian/rules
Log:
Short dh using --with autoreconf


Modified: trunk/packages/gentle/trunk/debian/changelog
===================================================================
--- trunk/packages/gentle/trunk/debian/changelog	2013-10-16 06:45:13 UTC (rev 14855)
+++ trunk/packages/gentle/trunk/debian/changelog	2013-10-16 07:19:09 UTC (rev 14856)
@@ -3,9 +3,11 @@
   * debian/control:
      - cme fix dpkg-control
      - use anonscm in Vcs fields
+     - remove unneeded Build-Depends
   * debian/rules
-    - run "autoreconf -fi" to fix "required file './compile' not found" error
-      (Thanks to Hideki Yamane <henrich at debian.org> for the patch)
+    - Short dh using --with autoreconf
+      (Thanks to Hideki Yamane <henrich at debian.org> for his initial
+       patch which gave the inspiration for the change above)
       Closes: #724221
   * debian/copyrigh: DEP5
 

Modified: trunk/packages/gentle/trunk/debian/control
===================================================================
--- trunk/packages/gentle/trunk/debian/control	2013-10-16 06:45:13 UTC (rev 14855)
+++ trunk/packages/gentle/trunk/debian/control	2013-10-16 07:19:09 UTC (rev 14856)
@@ -8,11 +8,10 @@
                autotools-dev,
                libwxgtk2.8-dev,
                libtinyxml-dev,
-               automake,
-               autoconf,
                libmysqlclient-dev,
                libsqlite3-dev,
-               libsqlite0-dev
+               libsqlite0-dev,
+               dh-autoreconf
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gentle/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gentle/trunk/

Modified: trunk/packages/gentle/trunk/debian/rules
===================================================================
--- trunk/packages/gentle/trunk/debian/rules	2013-10-16 06:45:13 UTC (rev 14855)
+++ trunk/packages/gentle/trunk/debian/rules	2013-10-16 07:19:09 UTC (rev 14856)
@@ -1,78 +1,30 @@
 #!/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
 
 CXXFLAGS="-D__DEBIAN__ -O2 -g -Wno-write-strings -DUSE_EXTERNAL_CLUSTALW"
+DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	echo "configuring with own configure!"
-	autoreconf -fi
-	CXXFLAGS=$(CXXFLAGS) ./configure --prefix=/usr 
-	for i in help/*.html help/*.css *.db help/*.htm */*.png */*.x[bp]m */*.bmp *.txt */*.txt *.csv; do chmod -x "$$i"; done
-	touch $@
+%:
+	dh $@ --with autoreconf
 
-build build-arch:	build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	echo "building with own build!"
+override_dh_auto_configure:
+	CXXFLAGS=$(CXXFLAGS) dh_auto_configure
+
+override_dh_auto_build:
 	$(MAKE) CXXFLAGS=$(CXXFLAGS) 
-	touch $@
 
-build-indep:
-	echo "Nothing to do for build-indep"
-
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	#dh_strip --dbg-package=gentle-dbg
-	dh_strip
-	dh_compress -X.pdf
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-install install-arch: build-stamp
+override_dh_install:
 	dh_install
+	cd debian/$(DEBPKGNAME)/usr/share/$(DEBPKGNAME); for i in help/*.html help/*.css *.db help/*.htm */*.png */*.x[bp]m */*.bmp *.txt */*.txt *.csv; do chmod -x "$$i"; done
 	find debian -name "license.txt" | xargs -r rm
 
-install-indep:
-	echo Nothing to do for install-indep
-
-binary-indep: 
-	#$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-	echo Nothing to do for binary-indep
-
-binary-arch: install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary: binary-arch binary-indep
-
-clean:: 
-	dh_testdir
-	dh_testroot
+override_dh_auto_clean:
+	dh_auto_clean
 	find . -name "*.o"  | xargs -r rm
 	rm -f GENtle
-	dh_clean build-arch-stamp build-indep-stamp configure-stamp build-stamp
 
-
 COMPRESSION=xz
 VERSION=1.9+cvs$(shell date +"%Y%m%d"|tr -d ' \t\n')~dfsg
 get-orig-source: