[med-svn] r21066 - trunk/packages/fastlink/trunk/debian

[Andreas Tille]

Author: tille
Date: 2016-01-09 18:16:33 +0000 (Sat, 09 Jan 2016)
New Revision: 21066

Modified:
   trunk/packages/fastlink/trunk/debian/changelog
   trunk/packages/fastlink/trunk/debian/rules
Log:
d/rules: short dh


Modified: trunk/packages/fastlink/trunk/debian/changelog
===================================================================
--- trunk/packages/fastlink/trunk/debian/changelog	2016-01-09 18:16:01 UTC (rev 21065)
+++ trunk/packages/fastlink/trunk/debian/changelog	2016-01-09 18:16:33 UTC (rev 21066)
@@ -3,6 +3,7 @@
   * debian/upstream/metadata
   * debhelper 9
   * cme fix dpkg-control
+  * d/rules: short dh
 
  -- Andreas Tille <tille at debian.org>  Fri, 27 Apr 2012 09:40:11 +0200
 

Modified: trunk/packages/fastlink/trunk/debian/rules
===================================================================
--- trunk/packages/fastlink/trunk/debian/rules	2016-01-09 18:16:01 UTC (rev 21065)
+++ trunk/packages/fastlink/trunk/debian/rules	2016-01-09 18:16:33 UTC (rev 21066)
@@ -1,16 +1,15 @@
 #!/usr/bin/make -f
-# debian/rules for fastlink using cdbs
-# Andreas Tille <tille at debian.org>, GPL
 
-# include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+	dh $@
 
-clean::
+override_dh_clean:
 	cd 4.1P/src; make allclean
 
-# Use makefile in subdir
-DEB_MAKE_INVOKE = cd 4.1P/src; $(DEB_MAKE_ENVVARS) make $(if $(DEB_MAKE_MAKEFILE), -f $(DEB_MAKE_MAKEFILE),) -C $(DEB_BUILDDIR) CFLAGS=$(if $(CFLAGS_$(cdbs_curpkg)),"$(CFLAGS_$(cdbs_curpkg))","$(CFLAGS)") CXXFLAGS=$(if $(CXXFLAGS_$(cdbs_curpkg)),"$(CXXFLAGS_$(cdbs_curpkg))","$(CXXFLAGS)")
+override_dh_auto_build:
+	cd 4.1P/src
+	$(DEB_MAKE_ENVVARS) make $(if $(DEB_MAKE_MAKEFILE), -f $(DEB_MAKE_MAKEFILE),) -C $(DEB_BUILDDIR) \
+		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 get-orig-source:
 	sh debian/get-orig-source