r6791 - in /vdr/vdr-plugin-bitstreamout/trunk/debian: ./ patches/
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Thu May 1 21:19:50 UTC 2008
Author: tiber-guest
Date: Thu May 1 21:19:48 2008
New Revision: 6791
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6791
Log:
* New upstream release
* COMPAT=5
* Updated debian/copyright
* Removed 01_bitops-FTBFS-fix.dpatch
* Updated 02_fix-nostrip.dpatch
' Removed 90_APIVERSION.dpatch
* Removed 91_bitstreamout-0.85-1.5.0.dpatch
* Added 01_vdr-include-fix.dpatch
Added:
vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch (with props)
Removed:
vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_bitops-FTBFS-fix.dpatch
vdr/vdr-plugin-bitstreamout/trunk/debian/patches/90_APIVERSION.dpatch
vdr/vdr-plugin-bitstreamout/trunk/debian/patches/91_bitstreamout-0.85-1.5.0.dpatch
Modified:
vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
vdr/vdr-plugin-bitstreamout/trunk/debian/compat
vdr/vdr-plugin-bitstreamout/trunk/debian/control
vdr/vdr-plugin-bitstreamout/trunk/debian/copyright
vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
vdr/vdr-plugin-bitstreamout/trunk/debian/patches/02_fix-nostrip.dpatch
vdr/vdr-plugin-bitstreamout/trunk/debian/rules
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/changelog?rev=6791&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog Thu May 1 21:19:48 2008
@@ -1,3 +1,16 @@
+vdr-plugin-bitstreamout (0.89b-1) experimental; urgency=low
+
+ * New upstream release
+ * COMPAT=5
+ * Updated debian/copyright
+ * Removed 01_bitops-FTBFS-fix.dpatch
+ * Updated 02_fix-nostrip.dpatch
+ ' Removed 90_APIVERSION.dpatch
+ * Removed 91_bitstreamout-0.85-1.5.0.dpatch
+ * Added 01_vdr-include-fix.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net> Thu, 01 May 2008 23:17:11 +0200
+
vdr-plugin-bitstreamout (0.85-27) experimental; urgency=low
[ Thomas Schmidt ]
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/compat?rev=6791&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/compat (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/compat Thu May 1 21:19:48 2008
@@ -1,1 +1,1 @@
-4
+5
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/control?rev=6791&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/control (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/control Thu May 1 21:19:48 2008
@@ -3,7 +3,7 @@
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), cdbs, dpatch, po-debconf, vdr-dev (>= 1.6.0-1), libasound2-dev, libmad0-dev
+Build-Depends: debhelper (>> 5), cdbs, dpatch, po-debconf, vdr-dev (>= 1.6.0), libasound2-dev, libmad0-dev
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/copyright?rev=6791&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/copyright Thu May 1 21:19:48 2008
@@ -14,10 +14,10 @@
(C) 1999 Aaron Holtzman (ac3.c)
(C) 2001 Klaus Schmidinger
(C) 2003 Sven Goethel
- (C) 2002 - 2006 Werner Fink
-
+ (C) 2002 - 2008 Werner Fink
+
Copyright (Debian packaging):
- (C) 2003 - 2007 Tobias Grimm, Thomas Günther, Thomas Schmidt
+ (C) 2003 - 2008 Tobias Grimm, Thomas Günther, Thomas Schmidt
License:
This program is free software; you can redistribute it and/or modify
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list?rev=6791&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list Thu May 1 21:19:48 2008
@@ -1,4 +1,2 @@
-01_bitops-FTBFS-fix
+01_vdr-include-fix
02_fix-nostrip
-90_APIVERSION
-91_bitstreamout-0.85-1.5.0
Added: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch?rev=6791&op=file
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch (added)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch Thu May 1 21:19:48 2008
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_vdr-include-fix.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-bitstreamout-0.89b~/Makefile vdr-plugin-bitstreamout-0.89b/Makefile
+--- vdr-plugin-bitstreamout-0.89b~/Makefile 2008-05-01 22:57:15.000000000 +0200
++++ vdr-plugin-bitstreamout-0.89b/Makefile 2008-05-01 22:57:55.000000000 +0200
+@@ -49,8 +49,8 @@
+ cc-library = $(shell echo 'int main () { return 0; }' |$(CC) -l$(1:lib%=%) -o /dev/null -xc - > /dev/null 2>&1 && echo yes)
+
+ INCLUDES += $(EXTRA_INCLUDES)
+-ifneq ($(wildcard $(VDRDIR)/include/),)
+- INCLUDES += -I$(VDRDIR)/include
++ifneq ($(wildcard $(VDRDIR)),)
++ INCLUDES += -I$(VDRDIR)
+ else
+ $(error No VDR in include path or no `make include-dir' executed!)
+ endif
+@@ -142,6 +142,6 @@
+ testt: CXXFLAGS += -DSPDIF_TEST=1 -g3
+ testt: $(OBJS) testt.c shm_memory_tool.o spdif.o
+ g++ $(CXXFLAGS) $(DEFINES) -o testt testt.c shm_memory_tool.o spdif.o iec60958.o $(vdrobj) \
+- -I$(VDRDIR)/include \
++ -I$(VDRDIR) \
+ -lasound -ljpeg \
+ $(vdrlib) -lrt
Propchange: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/02_fix-nostrip.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/patches/02_fix-nostrip.dpatch?rev=6791&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/02_fix-nostrip.dpatch (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/02_fix-nostrip.dpatch Thu May 1 21:19:48 2008
@@ -5,13 +5,14 @@
## DP: Fixes DEB_BUILD_OPTIONS=nostrip.
@DPATCH@
---- bitstreamout-0.85/Makefile
-+++ bitstreamout-0.85/Makefile
-@@ -88,7 +88,6 @@ echo:
+diff -urNad vdr-plugin-bitstreamout-0.89b~/Makefile vdr-plugin-bitstreamout-0.89b/Makefile
+--- vdr-plugin-bitstreamout-0.89b~/Makefile 2008-04-17 17:09:42.000000000 +0200
++++ vdr-plugin-bitstreamout-0.89b/Makefile 2008-05-01 23:11:06.000000000 +0200
+@@ -114,7 +114,6 @@
libvdr-$(PLUGIN).so: $(OBJS)
$(CXX) $(CXXFLAGS) -shared $(OBJS) -Wl,-soname -Wl,$@.$(VDRVERSION) -o $@ -lasound -lrt -lmad
- @cp $@ $(LIBDIR)/$@.$(VDRVERSION)
-- @-strip --strip-unneeded $(LIBDIR)/$@.$(VDRVERSION)
+ @cp $@ $(PLUGINLIBDIR)/$@.$(VDRVERSION)
+- @-strip --strip-unneeded $(PLUGINLIBDIR)/$@.$(VDRVERSION)
- install: $(LIBDIR)/libvdr-$(PLUGIN).so.$(VDRVERSION)
+ install: $(PLUGINLIBDIR)/libvdr-$(PLUGIN).so.$(VDRVERSION)
install -d -m 0755 $(DESTDIR)$(VIDEOLIB)/PLUGINS/lib
Modified: vdr/vdr-plugin-bitstreamout/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/rules?rev=6791&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/rules (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/rules Thu May 1 21:19:48 2008
@@ -9,8 +9,10 @@
$(MAKE) all $(MAKE_OPTIONS)
clean::
- $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ ln -s /usr/include/vdr debian/include
+ $(MAKE) -o .dependencies clean $(MAKE_OPTIONS) VDRDIR=debian
rm -f libvdr-*.so.*
+ rm -f debian/include
common-binary-predeb-arch::
sh /usr/share/vdr-dev/patchlevel.sh subst
More information about the pkg-vdr-dvb-changes
mailing list