r6019 - in /vdr/vdr-plugin-mp3/trunk/debian: changelog control rules

Sat Dec 29 17:44:57 UTC 2007

Author: tschmidt
Date: Sat Dec 29 17:44:57 2007
New Revision: 6019

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6019
Log:
 * Switched Build-System to cdbs, Build-Depend on cdbs
 * Added Homepage field to debian/control
 * Renamed XS-Vcs-* fields to Vcs-* in debian/control
 * Bumped Standards-Version to 3.7.3

Modified:
    vdr/vdr-plugin-mp3/trunk/debian/changelog
    vdr/vdr-plugin-mp3/trunk/debian/control
    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=6019&op=diff
==============================================================================

--- vdr/vdr-plugin-mp3/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/changelog Sat Dec 29 17:44:57 2007
@@ -1,3 +1,12 @@
+vdr-plugin-mp3 (0.10.1-6) unstable; urgency=low
+
+   * Switched Build-System to cdbs, Build-Depend on cdbs
+   * Added Homepage field to debian/control
+   * Renamed XS-Vcs-* fields to Vcs-* in debian/control
+   * Bumped Standards-Version to 3.7.3
+
+ -- Thomas Schmidt <tschmidt at debian.org>  Sat, 29 Dec 2007 18:18:32 +0100
+
 vdr-plugin-mp3 (0.10.1-5) unstable; urgency=low
 
   * Added 04_mplayer.sh-cache-min.dpatch too allow configuration

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=6019&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/control (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/control Sat Dec 29 17:44:57 2007
@@ -3,10 +3,11 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas GÃ¼nther <tom at toms-cafe.de>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>= 1.4.5-1), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-mp3/trunk/
+Build-Depends: debhelper (>> 4.1.16), cdbs, dpatch, vdr-dev (>= 1.4.5-1), libsndfile1-dev, libid3tag0-dev, libmad0-dev, libvorbis-dev, gettext
+Standards-Version: 3.7.3
+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/
 
 Package: vdr-plugin-mp3
 Architecture: any

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=6019&op=diff
==============================================================================
--- vdr/vdr-plugin-mp3/trunk/debian/rules (original)
+++ vdr/vdr-plugin-mp3/trunk/debian/rules Sat Dec 29 17:44:57 2007
@@ -1,59 +1,26 @@
 #! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
-
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
 MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale \
                WITH_OSS_OUTPUT=1
 
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	touch configure-stamp
+common-build-arch::
+	$(MAKE) all $(MAKE_OPTIONS)
 
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) all $(MAKE_OPTIONS)
-	touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+clean::
+	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
 	rm -f libvdr-*.so.*
 	rm -rf locale
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install
+common-binary-predeb-arch::
+	sh /usr/share/vdr-dev/patchlevel.sh subst
+	sh /usr/share/vdr-dev/dependencies.sh
 
+install/vdr-plugin-mp3::
 	install -m 755 $(CURDIR)/debian/mount.sh \
 	  $(CURDIR)/debian/vdr-plugin-mp3/usr/share/vdr-plugin-mp3/mount
 
@@ -66,6 +33,7 @@
 	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
 
@@ -75,42 +43,3 @@
 	tar -c -f - locale/*/*/vdr-mplayer.mo | \
 	  tar -x -f - -C debian/vdr-plugin-mplayer/usr/share
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs HISTORY
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	sh /usr/share/vdr-dev/patchlevel.sh subst
-	sh /usr/share/vdr-dev/dependencies.sh
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
-        clean-patched patch unpatch


