[med-svn] r21198 - trunk/packages/njplot/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-01-15 10:12:52 +0000 (Fri, 15 Jan 2016)
New Revision: 21198

Modified:
   trunk/packages/njplot/trunk/debian/changelog
   trunk/packages/njplot/trunk/debian/control
   trunk/packages/njplot/trunk/debian/rules
Log:
Build using dh instead of cdbs


Modified: trunk/packages/njplot/trunk/debian/changelog
===================================================================
--- trunk/packages/njplot/trunk/debian/changelog	2016-01-15 09:59:35 UTC (rev 21197)
+++ trunk/packages/njplot/trunk/debian/changelog	2016-01-15 10:12:52 UTC (rev 21198)
@@ -7,6 +7,7 @@
   * Moved debian/upstream to debian/upstream/metadata
   * cme fix dpkg-control
   * debhelper 9
+  * Build using dh instead of cdbs
 
  -- Andreas Tille <tille at debian.org>  Fri, 15 Jan 2016 10:56:56 +0100
 

Modified: trunk/packages/njplot/trunk/debian/control
===================================================================
--- trunk/packages/njplot/trunk/debian/control	2016-01-15 09:59:35 UTC (rev 21197)
+++ trunk/packages/njplot/trunk/debian/control	2016-01-15 10:12:52 UTC (rev 21198)
@@ -5,8 +5,7 @@
 Section: science
 XS-Autobuild: no
 Priority: optional
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                libvibrant6-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/njplot/trunk/

Modified: trunk/packages/njplot/trunk/debian/rules
===================================================================
--- trunk/packages/njplot/trunk/debian/rules	2016-01-15 09:59:35 UTC (rev 21197)
+++ trunk/packages/njplot/trunk/debian/rules	2016-01-15 10:12:52 UTC (rev 21198)
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
-# debian/rules for njplot using cdbs
-# Andreas Tille <tille at debian.org>, GPL
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+CFLAGS += -c -I/usr/include/ncbi -DNO_PDF -DWIN_MOTIF \
+          -DHELPFILENAME=\\\"/usr/share/njplot/njplot.help\\\"
 
-# despite the fact that cdbs should use distclean as default, the clean target is called
-# so force distclean
-DEB_MAKE_CLEAN_TARGET = distclean
-DEB_MAKE_INVOKE += CC='gcc $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)'
+%:
+	dh $@
 
-CFLAGS = -c -I/usr/include/ncbi -DNO_PDF -DWIN_MOTIF \
-         -DHELPFILENAME=\\\"/usr/share/njplot/njplot.help\\\"
+override_dh_auto_clean:
+	dh_auto_clean
+	make distclean
 
+override_dh_auto_build:
+	CC='gcc $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)' $(MAKE)
+