r77 - in vdr/vdr-plugin-dvd/trunk: . debian debian/patches

Thomas Schmidt pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 12:58:25 +0100


Author: tschmidt
Date: 2005-02-23 12:58:24 +0100 (Wed, 23 Feb 2005)
New Revision: 77

Added:
   vdr/vdr-plugin-dvd/trunk/debian/
   vdr/vdr-plugin-dvd/trunk/debian/changelog
   vdr/vdr-plugin-dvd/trunk/debian/control
   vdr/vdr-plugin-dvd/trunk/debian/copyright
   vdr/vdr-plugin-dvd/trunk/debian/docs
   vdr/vdr-plugin-dvd/trunk/debian/install
   vdr/vdr-plugin-dvd/trunk/debian/patches/
   vdr/vdr-plugin-dvd/trunk/debian/patches/00list
   vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr-plugin-dvd/trunk/debian/rules
   vdr/vdr-plugin-dvd/trunk/debian/watch
Log:
Load newtrunk into vdr/vdr-plugin-dvd/trunk.


Added: vdr/vdr-plugin-dvd/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/changelog	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/changelog	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1,254 @@
+vdr-plugin-dvd (0.3.4-rc10-1) unstable; urgency=low
+
+  * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+    - Renamed upstream-version to 0.3.4-rc10, because upstream will
+      not release 0.3.4 anymore, it is at 0.3.5b06 allready (which 
+      can not be packaged for vdr 1.2.6)
+    - Build-depend on dpatch (>= 2.0.9)
+    - Converted existing dpatch-file to the new short format
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sat, 04 Dec 2004 12:53:16 +0100
+
+vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-5) unstable; urgency=low
+
+  * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+    - Use dpatch, so build-dep on dpatch 
+    - Add 01_Makefile-fPIC-fix.dpatch, to fix FTBFS (closes: #262641)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Fri, 30 Jul 2004 20:53:13 +0200
+
+vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-4) unstable; urgency=low
+
+  * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+    - Now really changed architecture to any
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 11 Jul 2004 13:36:21 +0200
+
+vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-3) unstable; urgency=low
+
+  * Thomas Schmidt:
+    - Changed architecture to any
+    - Changed maintainer to Debian VDR and DVB Packaging Team 
+      <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+    - Cleanup debian/rules
+    - First upload to official Debian-archive (closes: Bug#229221)
+    - Added watch-file
+    - Added patchlevel-mechanism, to be compatible with c't-vdr
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri,  2 Jul 2004 18:57:33 +0200
+
+vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc10-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 16 Nov 2003 13:52:48 +0100
+
+vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 12 Oct 2003 12:54:25 +0200
+
+vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc2-2) unstable; urgency=low
+
+  * Integrated patch to change bitstreamout-detection
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 10 Oct 2003 17:28:52 +0200
+
+vdr-plugin-dvd (0.3.3-jau-p8+0.3.4-rc2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Thu,  9 Oct 2003 18:59:49 +0200
+
+vdr-plugin-dvd (0.3.3-jau-p8-1) unstable; urgency=low
+
+  * New upstream release
+    (Sven Goethel is now the official new maintainer of the dvd-plugin)
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Wed,  8 Oct 2003 20:06:07 +0200
+
+vdr-plugin-dvd (0.3.3-jau-p7-1) unstable; urgency=low
+
+  * New upstream release - consider source from Sven Goethel
+    <sgoethel@jausoft.com> as new upstream, changed debian/copyright
+    accordingly
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon,  6 Oct 2003 19:09:25 +0200
+
+vdr-plugin-dvd (0.3.3-5.jau.p3) unstable; urgency=low
+
+  * applied patch from Sven Goethel <sgoethel@jausoft.com>
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sat,  4 Oct 2003 23:14:38 +0200
+
+vdr-plugin-dvd (0.3.3-4) unstable; urgency=low
+
+  * Rebuild for vdr 1.2.5
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Wed, 17 Sep 2003 20:13:16 +0200
+
+vdr-plugin-dvd (0.3.3-3) unstable; urgency=low
+
+  * changed the plugin-dir to /usr/lib/vdr/plugins, to be FHS compliant
+    Thanks to Henning Glawe <glaweh@physik.fu-berlin.de> for pointing me 
+    to this one
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 14 Sep 2003 16:22:24 +0200
+
+vdr-plugin-dvd (0.3.3-2) unstable; urgency=low
+
+  * Changed debian/rules and debian/control (added debian/control.template),
+    so that the correct dependancy to vdr is filled out automatically on the
+    version of vdr-dev, you have installed
+  * Bump Standards-Version to 3.6.1
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Wed, 10 Sep 2003 14:20:44 +0200
+
+vdr-plugin-dvd (0.3.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Tue, 26 Aug 2003 15:51:04 +0200
+
+vdr-plugin-dvd (0.3.2a-4) unstable; urgency=low
+
+  * Rebuild for vdr 1.2.2
+  * Bump Standards-Version to 3.6.0
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Wed, 13 Aug 2003 10:37:14 +0200
+
+vdr-plugin-dvd (0.3.2a-3) unstable; urgency=low
+
+  * Rebuild for vdr-1.2.1
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon,  9 Jun 2003 19:02:13 +0200
+
+vdr-plugin-dvd (0.3.2a-2) unstable; urgency=low
+
+  * Rebuild for vdr-1.2.0
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun,  1 Jun 2003 21:36:18 +0200
+
+vdr-plugin-dvd (0.3.2a-1) unstable; urgency=low
+
+  * New upstream release
+  * Rebuild for vdr-1.1.29
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Wed, 30 Apr 2003 18:11:10 +0200
+
+vdr-plugin-dvd (0.3.1-3) unstable; urgency=low
+
+  * Rebuild for vdr-1.1.28
+  * Bump Standards-Version to 3.5.9
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Tue, 22 Apr 2003 12:41:52 +0200
+
+vdr-plugin-dvd (0.3.1-2) unstable; urgency=low
+
+  * rebuild for vdr-1.1.27
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 13 Apr 2003 15:11:07 +0200
+
+vdr-plugin-dvd (0.3.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Wed,  5 Mar 2003 20:29:42 +0100
+
+vdr-plugin-dvd (0.2.0-16) unstable; urgency=low
+
+  * add Suggests: libdvdcss2 to debian/control
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon, 17 Feb 2003 17:53:55 +0100
+
+vdr-plugin-dvd (0.2.0-15) unstable; urgency=low
+
+  * include Andres Schultz modified libdvdnav and link it statically into the
+	 plugin, to make it distributable by debian
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 22 Dec 2002 02:40:46 +0100
+
+vdr-plugin-dvd (0.2.0-14) unstable; urgency=low
+
+  * rebuild for vdr-1.1.20 
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 15 Dec 2002 18:46:46 +0100
+
+vdr-plugin-dvd (0.2.0-13) unstable; urgency=low
+
+  * rebuild for vdr-1.1.19 
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon,  9 Dec 2002 23:43:27 +0100
+
+vdr-plugin-dvd (0.2.0-12) unstable; urgency=low
+
+  * rebuild for vdr-1.1.18 
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon,  2 Dec 2002 12:45:45 +0100
+
+vdr-plugin-dvd (0.2.0-11) unstable; urgency=low
+
+  * corrected a few lintian errors
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 24 Nov 2002 19:44:47 +0100
+
+vdr-plugin-dvd (0.2.0-10) unstable; urgency=low
+
+  * rebuild for vdr-1.1.15 
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon, 11 Nov 2002 11:34:14 +0100
+
+vdr-plugin-dvd (0.2.0-9) unstable; urgency=low
+
+  * rebuild for vdr-1.1.15 
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Mon,  4 Nov 2002 00:55:58 +0100
+
+vdr-plugin-dvd (0.2.0-8) unstable; urgency=low
+
+  * revert last change
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Tue, 29 Oct 2002 12:12:33 +0100
+
+vdr-plugin-dvd (0.2.0-7) unstable; urgency=low
+
+  * changed Depends/Build-Depends from libdvdnav to libdvdnav-as 
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Tue, 29 Oct 2002 11:56:01 +0100
+
+vdr-plugin-dvd (0.2.0-6) unstable; urgency=low
+
+  * recompiled for vdr 1.1.14 
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Tue, 29 Oct 2002 10:55:27 +0100
+
+vdr-plugin-dvd (0.2.0-5) unstable; urgency=low
+
+  * do not create /usr/share/vdr/plugins/lib, only /usr/share/vdr/plugins
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sun, 20 Oct 2002 17:25:02 +0200
+
+vdr-plugin-dvd (0.2.0-4) unstable; urgency=low
+
+  * changed libdvdread depend to version >=0.9.3
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 18 Oct 2002 14:29:24 +0200
+
+vdr-plugin-dvd (0.2.0-3) unstable; urgency=low
+
+  * chanded depends a little bit
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 18 Oct 2002 14:06:27 +0200
+
+vdr-plugin-dvd (0.2.0-2) unstable; urgency=low
+
+  * changed DVB-Dir in Makefile to /usr/src/modules/dvb-driver
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 18 Oct 2002 13:57:16 +0200
+
+vdr-plugin-dvd (0.2.0-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Fri, 18 Oct 2002 13:53:51 +0200

Added: vdr/vdr-plugin-dvd/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/control	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/control	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1,17 @@
+Source: vdr-plugin-dvd
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+Build-Depends: debhelper (>> 4.1.16), liba52-0.7.4-dev, vdr-dev (>=1.2.6), libdvdnav-dev (>=0.1.9), dpatch (>= 2.0.9)
+Standards-Version: 3.6.1
+
+Package: vdr-plugin-dvd
+Architecture: any
+Depends: ${shlibs:Depends}, vdr (>=1.2.6)
+Conflicts: vdr (>=1.2.7)
+Suggests: libdvdcss2
+Description: Plugin to vdr for playing DVD's
+ This plugin(s) for vdr allows you to play your DVD's from
+ vdr's OSD.
+XB-VDR-Patchlevel: ${patchlevel}

Added: vdr/vdr-plugin-dvd/trunk/debian/copyright
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/copyright	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/copyright	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1,26 @@
+This package was debianized by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> on
+Fri, 18 Oct 2002 13:45:37 +0200.
+
+It was downloaded from http://www.jausoft.com/Files/vdr/vdr-dvd/
+
+Upstream Authors: Andreas Schultz <aschultz@warp10.net>
+                  Sven Goethel <sgoethel@jausoft.com>
+
+Copyright:
+
+  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.
+
+  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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+  see /usr/share/common-licenses/GPL
+

Added: vdr/vdr-plugin-dvd/trunk/debian/docs
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/docs	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/docs	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1,2 @@
+README
+HISTORY

Added: vdr/vdr-plugin-dvd/trunk/debian/install
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/install	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/install	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1 @@
+libvdr-dvd.so.* usr/lib/vdr/plugins

Added: vdr/vdr-plugin-dvd/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/00list	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/00list	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1 @@
+01_Makefile-fPIC-fix

Added: vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adds -fPIC to Makefile, to fix FTBFS
+
+@DPATCH@
+diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-dvd/vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile
+--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-dvd/vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile	2004-04-22 13:13:19.000000000 +0200
++++ vdr-plugin-dvd-0.3.3-jau-p8+0.3.4-rc10/Makefile	2004-07-30 20:49:52.000000000 +0200
+@@ -16,7 +16,7 @@
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
+ 
+ ### The directory environment:
+ 

Added: vdr/vdr-plugin-dvd/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/rules	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/rules	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1,99 @@
+#!/usr/bin/make -f
+# 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
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+# include dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+VDR=vdr
+PACKAGE=$(VDR)-plugin-dvd
+VDRDIR=/usr/include/$(VDR)
+DVBDIR=/usr/include
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	touch configure-stamp
+
+
+build: patch-stamp build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+	
+	$(MAKE) all NEWSTRUCT=1 VDRDIR=$(VDRDIR) VDRINC=$(VDRDIR) \
+	LIBDIR=. NAVDIR=/usr/include/dvdnav
+
+	touch build-stamp
+
+clean: clean-patched unpatch
+
+clean-patched:
+	dh_testdir
+	dh_testroot
+
+	rm -f build-stamp configure-stamp
+	rm -f libvdr-*.so*
+	make clean
+
+	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_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installcron
+	dh_installman
+	dh_installinfo
+	dh_installchangelogs 
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+
+	# VDR can be customized with quite a lot of different patches, which can make
+	# the plugins binary incompatible.
+	# Although Debian will not provide different binary packages for VDR, we
+	# will include a patchlevel info, which is created at compile time and can
+	# be checked before a plugin is loaded.
+   
+	[ -r $(VDRDIR)/patchlevel ] || echo 'patchlevel=' >> debian/$(PACKAGE).substvars
+	[ ! -r $(VDRDIR)/patchlevel ] || cat $(VDRDIR)/patchlevel >> debian/$(PACKAGE).substvars
+
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch configure


Property changes on: vdr/vdr-plugin-dvd/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: vdr/vdr-plugin-dvd/trunk/debian/watch
===================================================================
--- vdr/vdr-plugin-dvd/trunk/debian/watch	2005-02-23 11:58:00 UTC (rev 76)
+++ vdr/vdr-plugin-dvd/trunk/debian/watch	2005-02-23 11:58:24 UTC (rev 77)
@@ -0,0 +1,2 @@
+version=2
+http://jausoft.com/Files/vdr/vdr-dvd/vdr-dvd-(0\..*)\.tar\.bz2