r6195 - in /vdr/vdr-plugin-loadepg/trunk/debian: changelog control copyright patches/00list patches/02_vdr-1.5.14-with-api-wrapper.dpatch rules watch

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Fri Feb 15 23:52:12 UTC 2008 

Author: tiber-guest
Date: Fri Feb 15 23:52:11 2008
New Revision: 6195

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6195
Log:
* New upstream release
* Fixed debian/watch
* Renamed XS-Vcs-* fields to Vcs-* in debian/control
* Added Homepage field to debian/control
* Switched Build-System to cdbs, Build-Depend on cdbs
* Bumped Standards-Version to 3.7.3
* Added 02_vdr-1.5.14-with-api-wrapper.dpatch
* Improved debian/copyright (license is GPL 2 only)

Added:
    vdr/vdr-plugin-loadepg/trunk/debian/patches/02_vdr-1.5.14-with-api-wrapper.dpatch
Modified:
    vdr/vdr-plugin-loadepg/trunk/debian/changelog
    vdr/vdr-plugin-loadepg/trunk/debian/control
    vdr/vdr-plugin-loadepg/trunk/debian/copyright
    vdr/vdr-plugin-loadepg/trunk/debian/patches/00list
    vdr/vdr-plugin-loadepg/trunk/debian/rules
    vdr/vdr-plugin-loadepg/trunk/debian/watch

Modified: vdr/vdr-plugin-loadepg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/debian/changelog?rev=6195&op=diff
==============================================================================
--- vdr/vdr-plugin-loadepg/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-loadepg/trunk/debian/changelog Fri Feb 15 23:52:11 2008
@@ -1,3 +1,16 @@
+vdr-plugin-loadepg (0.1.12-1) experimental; urgency=low
+
+  * New upstream release
+  * Fixed debian/watch
+  * Renamed XS-Vcs-* fields to Vcs-* in debian/control
+  * Added Homepage field to debian/control
+  * Switched Build-System to cdbs, Build-Depend on cdbs
+  * Bumped Standards-Version to 3.7.3
+  * Added 02_vdr-1.5.14-with-api-wrapper.dpatch
+  * Improved debian/copyright (license is GPL 2 only)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 16 Feb 2008 00:51:09 +0100
+
 vdr-plugin-loadepg (0.1.11-8) unstable; urgency=low
 
   * Release for vdrdevel 1.5.13

Modified: vdr/vdr-plugin-loadepg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/debian/control?rev=6195&op=diff
==============================================================================
--- vdr/vdr-plugin-loadepg/trunk/debian/control (original)
+++ vdr/vdr-plugin-loadepg/trunk/debian/control Fri Feb 15 23:52:11 2008
@@ -3,10 +3,11 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>= 5), dpatch, vdr-dev (>= 1.4.5-1)
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.4.5-1), gettext
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/
+Homepage: http://www.kikko77.altervista.org
 
 Package: vdr-plugin-loadepg
 Architecture: any

Modified: vdr/vdr-plugin-loadepg/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/debian/copyright?rev=6195&op=diff
==============================================================================
--- vdr/vdr-plugin-loadepg/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-loadepg/trunk/debian/copyright Fri Feb 15 23:52:11 2008
@@ -1,33 +1,36 @@
-This package was debianized by Tobias Grimm <tg at e-tobi.net> on
-Mon, 25 Jun 2007 22:18:14 +0200.
-
-It was downloaded from:
+Upstream Homepage:
     http://kikko77.altervista.org
 
 Upstream Author:
     Luca De Pieri <dpluca at libero.it>
 
+Debian Maintainers:
+    Tobias Grimm <tg at e-tobi.net>
+    Thomas Günther <tom at toms-cafe.de>
+
 Copyright:
-    (C) 2005 - 2007 Luca De Pieri
+    (C) 2005 - 2008 Luca De Pieri
+
+Copyright (Debian packaging):
+    (C) 2007 - 2008 Tobias Grimm, Thomas Günther
 
 License:
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 2 of the License.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 
-    02110-1301, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     The complete text of the GNU General Public License can be found
-    in /usr/share/common-licenses/GPL on most Debian systems.
+    in /usr/share/common-licenses/GPL-2 on most Debian systems.
 
-The Debian packaging is (C) 2007, Tobias Grimm <tg at e-tobi.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+License (Debian packaging):
+    The Debian packaging is licensed under the GPL, version 2 or any
+    later version, see /usr/share/common-licenses/GPL-2.

Modified: vdr/vdr-plugin-loadepg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/debian/patches/00list?rev=6195&op=diff
==============================================================================
--- vdr/vdr-plugin-loadepg/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-loadepg/trunk/debian/patches/00list Fri Feb 15 23:52:11 2008
@@ -1,1 +1,2 @@
 01_Makefile-fPIC-fix
+02_vdr-1.5.14-with-api-wrapper

Added: vdr/vdr-plugin-loadepg/trunk/debian/patches/02_vdr-1.5.14-with-api-wrapper.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/debian/patches/02_vdr-1.5.14-with-api-wrapper.dpatch?rev=6195&op=file
==============================================================================
--- vdr/vdr-plugin-loadepg/trunk/debian/patches/02_vdr-1.5.14-with-api-wrapper.dpatch (added)
+++ vdr/vdr-plugin-loadepg/trunk/debian/patches/02_vdr-1.5.14-with-api-wrapper.dpatch Fri Feb 15 23:52:11 2008
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_vdr-1.5.14-with-api-wrapper.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-loadepg-0.1.12~/loadepg.c vdr-plugin-loadepg-0.1.12/loadepg.c
+--- vdr-plugin-loadepg-0.1.12~/loadepg.c	2008-02-15 23:26:37.000000000 +0100
++++ vdr-plugin-loadepg-0.1.12/loadepg.c	2008-02-15 23:30:13.000000000 +0100
+@@ -7,6 +7,9 @@
+  */
+ 
+ #include "loadepg.h"
++#ifdef DVB_MULTIPROTO_WRAPPER
++#include <vdr/dvb_api_wrapper.h>
++#endif
+ 
+ static const char *VERSION        = "0.1.12";
+ #if APIVERSNUM >= 10507

Modified: vdr/vdr-plugin-loadepg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/debian/rules?rev=6195&op=diff
==============================================================================
--- vdr/vdr-plugin-loadepg/trunk/debian/rules (original)
+++ vdr/vdr-plugin-loadepg/trunk/debian/rules Fri Feb 15 23:52:11 2008
@@ -1,93 +1,20 @@
 #! /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=. \
+               LOCALEDIR=debian/tmp/usr/share/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=.
+cleanbuilddir::
+	$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+	rm -f libvdr-*.so.*
 
-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
-	-$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
-	rm -f libvdr-*.so.*
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install
-
-# 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

Modified: vdr/vdr-plugin-loadepg/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-loadepg/trunk/debian/watch?rev=6195&op=diff
==============================================================================
--- vdr/vdr-plugin-loadepg/trunk/debian/watch (original)
+++ vdr/vdr-plugin-loadepg/trunk/debian/watch Fri Feb 15 23:52:11 2008
@@ -1,4 +1,4 @@
 version=3
-opts=filenamemangle=s/.*(.*\.tgz).*/$1/ \
+opts=filenamemangle=s/.*\/(.*\.tgz).*/$1/ \
   http://kikko77.altervista.org/index.php?mod=Download \
   index.php\?mod=Download.*/vdr-loadepg-(.*)\.tgz.*

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