r6172 - in /vdr/vdr-plugin-iptv/trunk/debian: changelog control copyright install patches/00list patches/01_vdr-locale-support-detection.dpatch rules vlc2iptv

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sun Jan 27 14:58:41 UTC 2008 

Author: tiber-guest
Date: Sun Jan 27 14:58:41 2008
New Revision: 6172

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6172
Log:
* New upstream release
* vlc2iptv became part of the upstream source, so using this now
* Switched Build-System to cdbs, Build-Depend on cdbs
* Added Homepage field to debian/control
* Added Vcs-* fields to debian/control
* Bumped Standards-Version to 3.7.3
* Added 01_vdr-locale-support-detection.dpatch
* Converted debian/copyright to UTF-8

Added:
    vdr/vdr-plugin-iptv/trunk/debian/patches/01_vdr-locale-support-detection.dpatch
Removed:
    vdr/vdr-plugin-iptv/trunk/debian/vlc2iptv
Modified:
    vdr/vdr-plugin-iptv/trunk/debian/changelog
    vdr/vdr-plugin-iptv/trunk/debian/control
    vdr/vdr-plugin-iptv/trunk/debian/copyright
    vdr/vdr-plugin-iptv/trunk/debian/install
    vdr/vdr-plugin-iptv/trunk/debian/patches/00list
    vdr/vdr-plugin-iptv/trunk/debian/rules

Modified: vdr/vdr-plugin-iptv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/changelog?rev=6172&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/changelog Sun Jan 27 14:58:41 2008
@@ -1,3 +1,16 @@
+vdr-plugin-iptv (0.0.6-1) unstable; urgency=low
+
+  * New upstream release
+  * vlc2iptv became part of the upstream source, so using this now
+  * Switched Build-System to cdbs, Build-Depend on cdbs
+  * Added Homepage field to debian/control
+  * Added Vcs-* fields to debian/control
+  * Bumped Standards-Version to 3.7.3
+  * Added 01_vdr-locale-support-detection.dpatch
+  * Converted debian/copyright to UTF-8
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sun, 27 Jan 2008 15:29:04 +0100
+
 vdr-plugin-iptv (0.0.4-1) unstable; urgency=low
 
   * New upstream release

Modified: vdr/vdr-plugin-iptv/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/control?rev=6172&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/control (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/control Sun Jan 27 14:58:41 2008
@@ -2,8 +2,11 @@
 Section: misc
 Priority: extra
 Maintainer: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>= 5), dpatch, vdr-dev (>= 1.4.7-2)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.4.7-2)
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/
+Homepage: http://www.saunalahti.fi/~rahrenbe/vdr/iptv/
 
 Package: vdr-plugin-iptv
 Architecture: any

Modified: vdr/vdr-plugin-iptv/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/copyright?rev=6172&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/copyright Sun Jan 27 14:58:41 2008
@@ -3,13 +3,13 @@
 
 Upstream Authors:
     Rolf Ahrenberg
-    Antti Seppälä
+    Antti Seppälä
 
 Debian Maintainers:
     Tobias Grimm <tg at e-tobi.net>
 
 Copyright:
-    (C) 2007 Rolf Ahrenberg, Antti Seppälä
+    (C) 2007 Rolf Ahrenberg, Antti Seppälä
 
 Copyright (Debian packaging):
     (C) 2007 Tobias Grimm

Modified: vdr/vdr-plugin-iptv/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/install?rev=6172&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/install (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/install Sun Jan 27 14:58:41 2008
@@ -1,4 +1,4 @@
 libvdr-iptv.so.*    usr/lib/vdr/plugins/
 locale/*            usr/share/locale/
 
-debian/vlc2iptv     usr/share/vdr-plugin-iptv/
+iptv/vlc2iptv       usr/share/vdr-plugin-iptv/

Modified: vdr/vdr-plugin-iptv/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/patches/00list?rev=6172&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/patches/00list Sun Jan 27 14:58:41 2008
@@ -1,1 +1,2 @@
+01_vdr-locale-support-detection
 02_libsi-include

Added: vdr/vdr-plugin-iptv/trunk/debian/patches/01_vdr-locale-support-detection.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/patches/01_vdr-locale-support-detection.dpatch?rev=6172&op=file
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/patches/01_vdr-locale-support-detection.dpatch (added)
+++ vdr/vdr-plugin-iptv/trunk/debian/patches/01_vdr-locale-support-detection.dpatch Sun Jan 27 14:58:41 2008
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_vdr-locale-support-detection.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes VDR locale support detection.
+
+ at DPATCH@
+diff -urNad vdr-plugin-iptv-0.0.6~/Makefile vdr-plugin-iptv-0.0.6/Makefile
+--- vdr-plugin-iptv-0.0.6~/Makefile	2008-01-27 15:47:14.000000000 +0100
++++ vdr-plugin-iptv-0.0.6/Makefile	2008-01-27 15:51:20.000000000 +0100
+@@ -41,7 +41,8 @@
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+ 
+ ### Test whether VDR has locale support
+-VDRLOCALE = $(shell grep '^LOCALEDIR' $(VDRDIR)/Makefile)
++VERSNUM = $(shell grep 'define VDRVERSNUM ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
++VERS157 = $(shell if [ $(VERSNUM) -ge 10507 ]; then echo "1"; else echo "0"; fi)
+ 
+ ### The name of the distribution archive:
+ 
+@@ -97,7 +98,7 @@
+ 
+ ### Do gettext based i18n stuff
+ 
+-ifneq ($(strip $(VDRLOCALE)),)
++ifeq ($(VERS157),1)
+ 
+ %.mo: %.po
+ 	msgfmt -c -o $@ $<

Modified: vdr/vdr-plugin-iptv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-iptv/trunk/debian/rules?rev=6172&op=diff
==============================================================================
--- vdr/vdr-plugin-iptv/trunk/debian/rules (original)
+++ vdr/vdr-plugin-iptv/trunk/debian/rules Sun Jan 27 14:58:41 2008
@@ -1,95 +1,21 @@
 #! /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
+DEB_INSTALL_CHANGELOGS_ALL = HISTORY
 
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. \
+               INCLUDES=-I/usr/include/vdr LOCALEDIR=locale
 
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
+common-build-arch::
+	$(MAKE) all $(MAKE_OPTIONS)
 
-MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=. LOCALEDIR=locale VDRLOCALE=true
-
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	touch configure-stamp
-
-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
+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
-	chmod a+x debian/vdr-plugin-iptv/usr/share/vdr-plugin-iptv/vlc2iptv
-
-# 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
+common-binary-predeb-arch::
 	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

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