[med-svn] r6258 - trunk/packages/dialign/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-03-13 20:47:29 +0000 (Sun, 13 Mar 2011)
New Revision: 6258

Modified:
   trunk/packages/dialign/trunk/debian/changelog
   trunk/packages/dialign/trunk/debian/compat
   trunk/packages/dialign/trunk/debian/control
   trunk/packages/dialign/trunk/debian/rules
Log:
Fix FTBFS


Modified: trunk/packages/dialign/trunk/debian/changelog
===================================================================
--- trunk/packages/dialign/trunk/debian/changelog	2011-03-13 03:13:38 UTC (rev 6257)
+++ trunk/packages/dialign/trunk/debian/changelog	2011-03-13 20:47:29 UTC (rev 6258)
@@ -1,3 +1,12 @@
+dialign (2.2.1-5) UNRELEASED; urgency=low
+
+  * Fix FTBFS which is caused by cdbs which is abandoning DEB_OPT_FLAG
+    Just switch to dh
+    Closes: #618057
+  * Debhelper 8
+
+ -- Andreas Tille <tille at debian.org>  Sun, 13 Mar 2011 18:36:43 +0100
+
 dialign (2.2.1-4) unstable; urgency=low
 
   [ David Paleino ]

Modified: trunk/packages/dialign/trunk/debian/compat
===================================================================
--- trunk/packages/dialign/trunk/debian/compat	2011-03-13 03:13:38 UTC (rev 6257)
+++ trunk/packages/dialign/trunk/debian/compat	2011-03-13 20:47:29 UTC (rev 6258)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/dialign/trunk/debian/control
===================================================================
--- trunk/packages/dialign/trunk/debian/control	2011-03-13 03:13:38 UTC (rev 6257)
+++ trunk/packages/dialign/trunk/debian/control	2011-03-13 20:47:29 UTC (rev 6258)
@@ -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), cdbs, quilt
+Build-Depends: debhelper (>= 8), quilt (>= 0.47)
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/dialign/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/dialign/trunk/

Modified: trunk/packages/dialign/trunk/debian/rules
===================================================================
--- trunk/packages/dialign/trunk/debian/rules	2011-03-13 03:13:38 UTC (rev 6257)
+++ trunk/packages/dialign/trunk/debian/rules	2011-03-13 20:47:29 UTC (rev 6258)
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+	dh $@ --with quilt
 
-DEB_MAKE_BUILD_TARGET	= -C src
-DEB_OPT_FLAG		+= -c -I$ -DCONS
-
-clean::
+override_dh_clean:
 	find src/ -name '*.o' -delete
 	dh_clean src/dialign2-2
+
+override_dh_auto_build:
+	## CFLAGS = -c -I$ -DCONS -O2
+	$(MAKE) -C src