r14613 - packages/trunk/ode/debian

[Jackson Doak]

Author: noskcaj-guest
Date: 2013-09-22 06:31:05 +0000 (Sun, 22 Sep 2013)
New Revision: 14613

Modified:
   packages/trunk/ode/debian/changelog
   packages/trunk/ode/debian/rules
Log:
switch to dh

Modified: packages/trunk/ode/debian/changelog
===================================================================
--- packages/trunk/ode/debian/changelog	2013-09-22 05:43:19 UTC (rev 14612)
+++ packages/trunk/ode/debian/changelog	2013-09-22 06:31:05 UTC (rev 14613)
@@ -18,7 +18,7 @@
     - Build-depend on dh-autoreconf
   * debian/compat: Set as 9
   * debian/rules: 
-    - Replace dh_clean -k with dh_prep
+    - Switch to dh
     - Remove manpage lines
     - Enable Hardening
     - Use dh_autoreconf

Modified: packages/trunk/ode/debian/rules
===================================================================
--- packages/trunk/ode/debian/rules	2013-09-22 05:43:19 UTC (rev 14612)
+++ packages/trunk/ode/debian/rules	2013-09-22 06:31:05 UTC (rev 14613)
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-include /usr/share/dpkg/buildflags.mk
-DPKG_EXPORT_BUILDFLAGS = 1
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CXXFLAGS += -O0 -g3
@@ -10,96 +11,47 @@
 	export CXXFLAGS CFLAGS
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
 	mkdir -p debian/build/dp debian/build/sp
-	dh_autoreconf
 	# SP: single precision build
 	cd debian/build/sp && ../../../configure --enable-shared --prefix=/usr LIBS="-lX11" $(shell dpkg-buildflags --export=configure)
 	# Adjust the SONAME of the single precision flavor
 	sed -i 's,^soname_spec=.*,soname_spec=libode.so.1sp,' debian/build/sp/libtool
 	cd debian/build/dp && ../../../configure --enable-shared --prefix=/usr --enable-double-precision LIBS="-lX11" $(shell dpkg-buildflags --export=configure)
-	
-	touch configure-stamp
 
 
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
+override_dh_auto_build:
 	cd debian/build/sp && $(MAKE)
 	cd debian/build/dp && $(MAKE)
+	#touch build-stamp
+	# Add here commands to install the package into debian/tmp
+	cd debian/build/sp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-sp
+	rm debian/tmp-sp/usr/lib/libode.so.1
+	mv debian/tmp-sp/usr/lib/libode.so.1.1.1 \
+		debian/tmp-sp/usr/lib/libode.so.1.1.1sp
+	cd debian/build/dp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-dp
+	docbook-to-man debian/ode-config.man.sgml > \
+	debian/ode-config.1
 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
+override_dh_clean:
 	rm -f build-stamp \
 	    configure-stamp
 	rm -rf \
 		debian/build \
 		debian/tmp-sp \
-		debian/tmp-dp
-	
+		debian/tmp-dp	
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_autoreconf_clean
 	dh_clean configure-stamp build-stamp debian/ode-config.1
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGELOG.txt
 
-	# Add here commands to install the package into debian/tmp
-	cd debian/build/sp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-sp
-	rm debian/tmp-sp/usr/lib/libode.so.1
-	mv debian/tmp-sp/usr/lib/libode.so.1.1.1 \
-		debian/tmp-sp/usr/lib/libode.so.1.1.1sp
-	cd debian/build/dp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp-dp
-
-	docbook-to-man debian/ode-config.man.sgml > \
-	debian/ode-config.1
-
-# Build architecture-independent files here.
-binary-indep:
-# no arch indep
-#	dh_testdir -i
-#	dh_testroot -i
-#	dh_installdocs -i
-#	dh_install -i
-#	dh_installchangelogs -i CHANGELOG.txt
-#	dh_compress -i
-#	dh_fixperms -i
-#	dh_installdeb -i
-#	dh_gencontrol -i
-#	dh_md5sums -i
-#	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installman 
+override_dh_install:
 	dh_install --sourcedir=debian/tmp-sp -plibode-sp-dev
 	dh_install --sourcedir=debian/tmp-sp -plibode1sp
 	dh_install --sourcedir=debian/tmp-dp -plibode-dev
-	dh_install --sourcedir=debian/tmp-dp -plibode1
-	dh_installchangelogs -a CHANGELOG.txt
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -a
-	dh_shlibdeps -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+	dh_install --sourcedir=debian/tmp-dp -plibode1
\ No newline at end of file