r8655 - in /vdr/vdr-plugin-markad/trunk/debian: changelog control rules

[tom-guest at users.alioth.debian.org]

Author: tom-guest
Date: Thu May 27 22:22:43 2010
New Revision: 8655

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8655
Log:
Converted debian/rules back to cdbs (lenny's debhelper doesn't support override_dh_auto_* targets)

Modified:
    vdr/vdr-plugin-markad/trunk/debian/changelog
    vdr/vdr-plugin-markad/trunk/debian/control
    vdr/vdr-plugin-markad/trunk/debian/rules

Modified: vdr/vdr-plugin-markad/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/changelog?rev=8655&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-markad/trunk/debian/changelog Thu May 27 22:22:43 2010
@@ -7,8 +7,6 @@
   * Build-depend on vdr-dev >= 1.6.0-16
   * Standards-Version: 3.8.4
   * source/format 3.0
-  * Converted debian/rules to the new debhelper 7 format
-  * Removed cdbs from Build-Depends
   * Updated debian/copyright
   * Added 0001-Fixed-errno-undeclared.patch
   * Added 0002-Fixed-some-compiler-warnings.patch

Modified: vdr/vdr-plugin-markad/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/control?rev=8655&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/control (original)
+++ vdr/vdr-plugin-markad/trunk/debian/control Thu May 27 22:22:43 2010
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: vdr-dev (>= 1.6.0-16), gettext, debhelper (>=7),
+Build-Depends: vdr-dev (>= 1.6.0-16), gettext, debhelper (>=7), cdbs,
  pkg-config, libavcodec-dev, libavformat-dev
 Standards-Version: 3.8.4
 Homepage: http://projects.vdr-developer.org/projects/list_files/plg-markad

Modified: vdr/vdr-plugin-markad/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-markad/trunk/debian/rules?rev=8655&op=diff
==============================================================================
--- vdr/vdr-plugin-markad/trunk/debian/rules (original)
+++ vdr/vdr-plugin-markad/trunk/debian/rules Thu May 27 22:22:43 2010
@@ -1,26 +1,20 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
 MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-%:
-	dh $@
+common-build-arch::
+	$(MAKE) all $(MAKE_OPTIONS)
 
-override_dh_auto_build:
-	dh_auto_build -- all $(MAKE_OPTIONS)
-
-override_dh_auto_clean:
-	dh_auto_clean -- -o .dependencies $(MAKE_OPTIONS)
+cleanbuilddir::
+	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -rf libvdr-*.so.* */locale
 
-override_dh_installchangelogs:
-	dh_installchangelogs HISTORY
-
-override_dh_gencontrol:
+common-binary-predeb-arch::
 	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
 
 get-orig-source:
 	sh debian/get-orig-source.sh