r8903 - in /vdr/vdr-plugin-mp3/trunk/debian: ./ patches/ source/

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sat Apr 9 18:03:31 UTC 2011 

Author: tiber-guest
Date: Sat Apr  9 18:03:25 2011
New Revision: 8903

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8903
Log:
* Build-depend on vdr-dev >= 1.7.17
* Updated debian/copyright
* Standards-Version: 3.9.1
* Switched to debhelper 7 and dropped cdbs

Added:
    vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.patch
      - copied unchanged from r8529, vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
    vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.patch
      - copied unchanged from r8529, vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.dpatch
    vdr/vdr-plugin-mp3/trunk/debian/patches/series
      - copied, changed from r8529, vdr/vdr-plugin-mp3/trunk/debian/patches/00list
    vdr/vdr-plugin-mp3/trunk/debian/source/
    vdr/vdr-plugin-mp3/trunk/debian/source/format
Removed:
    vdr/vdr-plugin-mp3/trunk/debian/README.source
    vdr/vdr-plugin-mp3/trunk/debian/patches/00list
    vdr/vdr-plugin-mp3/trunk/debian/patches/10_debian-fhs-defaults.dpatch
    vdr/vdr-plugin-mp3/trunk/debian/patches/20_Makefile-fix.dpatch
Modified:
    vdr/vdr-plugin-mp3/trunk/debian/changelog
    vdr/vdr-plugin-mp3/trunk/debian/compat
    vdr/vdr-plugin-mp3/trunk/debian/control
    vdr/vdr-plugin-mp3/trunk/debian/copyright
    vdr/vdr-plugin-mp3/trunk/debian/rules

Modified: vdr/vdr-plugin-mp3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/changelog?rev=8903&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog Sat Apr  9 18:03:25 2011
@@ -1,3 +1,12 @@
+vdr-plugin-mp3 (0.10.2-4) unstable; urgency=low
+
+  * Build-depend on vdr-dev >= 1.7.17
+  * Updated debian/copyright
+  * Standards-Version: 3.9.1
+  * Switched to debhelper 7 and dropped cdbs
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 09 Apr 2011 19:52:42 +0200
+
 vdr-plugin-mp3 (0.10.2-3) unstable; urgency=low
 
   * Build-depend on vdr-dev >= 1.6.0-16

Modified: vdr/vdr-plugin-mp3/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/compat?rev=8903&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/compat (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/compat Sat Apr  9 18:03:25 2011
@@ -1,1 +1,1 @@
-5
+7

Modified: vdr/vdr-plugin-mp3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/control?rev=8903&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/control Sat Apr  9 18:03:25 2011
@@ -3,8 +3,8 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-16), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.17), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
 Homepage: http://www.muempf.de/

Modified: vdr/vdr-plugin-mp3/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/copyright?rev=8903&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/copyright Sat Apr  9 18:03:25 2011
@@ -10,14 +10,14 @@
     Thomas Schmidt <tschmidt at debian.org>
 
 Copyright:
-    (C) 2001 - 2007 Stefan Hülswitt
+    (C) 2001 - 2009 Stefan Hülswitt
 
 Copyright for the mplayer script (mplayer.sh, vdrmplayer.sh.conf downloaded from
                                   http://batleth.sapienti-sat.org/projects/VDR):
     (C) 2003 - 2007 Juri Haberland <juri-at-koschikode.com>
 
 Copyright (Debian packaging):
-    (C) 2002 - 2010 Tobias Grimm, Thomas Günther, Thomas Schmidt
+    (C) 2002 - 2011 Tobias Grimm, Thomas Günther, Thomas Schmidt
 
 License:
     This program is free software; you can redistribute it and/or modify

Copied: vdr/vdr-plugin-mp3/trunk/debian/patches/series (from r8529, vdr/vdr-plugin-mp3/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/patches/series?rev=8903&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/patches/series Sat Apr  9 18:03:25 2011
@@ -1,2 +1,2 @@
-10_debian-fhs-defaults
-20_Makefile-fix
+10_debian-fhs-defaults.patch
+20_Makefile-fix.patch

Modified: vdr/vdr-plugin-mp3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/rules?rev=8903&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules Sat Apr  9 18:03:25 2011
@@ -1,25 +1,20 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_CHANGELOGS_ALL = HISTORY
+MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale \
-               WITH_OSS_OUTPUT=1
+%:
+	dh $@
 
-common-build-arch::
-	$(MAKE) all $(MAKE_OPTIONS)
+override_dh_auto_build:
+	dh_auto_build -- all $(MAKE_OPTIONS)
 
-clean::
-	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
-	rm -rf locale
-
-common-binary-predeb-arch::
-	sh /usr/share/vdr-dev/dependencies.sh
-
-install/vdr-plugin-mp3::
+override_dh_install:
+	#
+	# vdr-plugin-mp3
+	#
 	install -m 755 $(CURDIR)/debian/mount.sh \
 	  $(CURDIR)/debian/vdr-plugin-mp3/usr/share/vdr-plugin-mp3/mount
 
@@ -32,13 +27,24 @@
 	tar -c -f - locale/*/*/vdr-mp3.mo | \
 	  tar -x -f - -C debian/vdr-plugin-mp3/usr/share
 
-install/vdr-plugin-mplayer::
 	install -m 755 $(CURDIR)/debian/mount.sh \
 	  $(CURDIR)/debian/vdr-plugin-mplayer/usr/share/vdr-plugin-mplayer/mount
 
+	#
+	# vdr-plugin-mplayer
+	#
 	install -m 755 $(CURDIR)/debian/mplayer.sh \
 	  $(CURDIR)/debian/vdr-plugin-mplayer/usr/share/vdr-plugin-mplayer/mplayer
 
 	tar -c -f - locale/*/*/vdr-mplayer.mo | \
 	  tar -x -f - -C debian/vdr-plugin-mplayer/usr/share
+	
+	dh_install
 
+override_dh_auto_clean:
+	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	rm -rf locale libvdr-*.so.*
+
+override_dh_gencontrol:
+	sh /usr/share/vdr-dev/dependencies.sh
+	dh_gencontrol

Added: vdr/vdr-plugin-mp3/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/debian/source/format?rev=8903&op=file
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/source/format (added)
+++ vdr/vdr-plugin-mp3/trunk/debian/source/format Sat Apr  9 18:03:25 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-vdr-dvb-changes mailing list