[med-svn] r10285 - trunk/packages/melting/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-04-03 15:53:54 +0000 (Tue, 03 Apr 2012)
New Revision: 10285

Modified:
   trunk/packages/melting/trunk/debian/changelog
   trunk/packages/melting/trunk/debian/compat
   trunk/packages/melting/trunk/debian/control
   trunk/packages/melting/trunk/debian/rules
Log:
Short dh; debhelper 9


Modified: trunk/packages/melting/trunk/debian/changelog
===================================================================
--- trunk/packages/melting/trunk/debian/changelog	2012-04-03 15:42:33 UTC (rev 10284)
+++ trunk/packages/melting/trunk/debian/changelog	2012-04-03 15:53:54 UTC (rev 10285)
@@ -12,6 +12,8 @@
      cme fix dpkg-copyright
   * debian/references: removed because content is now in
     debian/upstream
+  * debhelper 9 (control+compat)
+  * debian/rules: rewritten to use short dh
 
  -- Andreas Tille <tille at debian.org>  Tue, 03 Apr 2012 17:27:35 +0200
 

Modified: trunk/packages/melting/trunk/debian/compat
===================================================================
--- trunk/packages/melting/trunk/debian/compat	2012-04-03 15:42:33 UTC (rev 10284)
+++ trunk/packages/melting/trunk/debian/compat	2012-04-03 15:53:54 UTC (rev 10285)
@@ -1 +1 @@
-7
+9

Modified: trunk/packages/melting/trunk/debian/control
===================================================================
--- trunk/packages/melting/trunk/debian/control	2012-04-03 15:42:33 UTC (rev 10284)
+++ trunk/packages/melting/trunk/debian/control	2012-04-03 15:53:54 UTC (rev 10285)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), quilt
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/melting/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/melting/trunk/

Modified: trunk/packages/melting/trunk/debian/rules
===================================================================
--- trunk/packages/melting/trunk/debian/rules	2012-04-03 15:42:33 UTC (rev 10284)
+++ trunk/packages/melting/trunk/debian/rules	2012-04-03 15:53:54 UTC (rev 10285)
@@ -5,63 +5,17 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -g
+%:
+	dh $@
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+override_dh_auto_build:
+	$(MAKE) -f makefile.unices NNDIR=/usr/share/melting/NNFILES 
 
-include /usr/share/quilt/quilt.make
+override_dh_clean:
+	dh_clean melting.o decode.o calcul.o melting
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	cp makefile.unices Makefile
-	touch $@
-
-build: patch configure build-stamp
-build-stamp:
-	$(MAKE) NNDIR=/usr/share/melting/NNFILES 
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	$(RM) melting.o decode.o calcul.o melting
-	dh_clean build-arch-stamp build-indep-stamp configure-stamp Makefile
-
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_prep -i 
-	dh_installdirs -i
-	dh_install -i
+override_dh_install:
+	dh_install
 	install -D BIN/tkmelting.pl $(CURDIR)/debian/melting-gui/usr/bin/tkmelting
 	install -m 644 -D BIN/melting.hlp  $(CURDIR)/debian/melting-gui/usr/share/melting/melting.hlp
 	install -m 644 -D melting-gui.desktop	$(CURDIR)/debian/melting-gui/usr/share/applications/melting-gui.desktop
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_prep -s 
-	dh_installdirs -s
-#	install melting $(CURDIR)/debian/melting/usr/bin
-	dh_install -s
-
-binary: binary-arch binary-indep
-binary-indep: build install
-	dh binary-indep
-binary-arch: build install-arch
-	dh binary-arch
-
-# This is useful to download the orig.gz sources before running svn-buildpackage
-tarballs:
-	[ -d ../tarballs ] || mkdir ../tarballs
-	uscan --force-download
-	mv ../melt* ../tarballs
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure