r7499 - in /vdr/vdr-plugin-bitstreamout/trunk/debian: changelog control copyright patches/00list patches/01_vdr-include-fix.dpatch patches/04_no-soname.dpatch rules

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sun Nov 30 18:49:56 UTC 2008


Author: tiber-guest
Date: Sun Nov 30 18:49:56 2008
New Revision: 7499

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7499
Log:
* Merged changes from 0.89b-5 into trunk
* Changed my maintainer email address
* Added missing dpatch description
* Added 04_no-soname.dpatch to not build the plugin with a soname to avoid
  problems with dh_shlibdeps / dh_makeshlibs thinking the  plugin lib is a
  normal shared library

Added:
    vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch
Modified:
    vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
    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/01_vdr-include-fix.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=7499&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog Sun Nov 30 18:49:56 2008
@@ -1,8 +1,13 @@
-vdr-plugin-bitstreamout (0.89c-2) UNRELEASED; urgency=low
-
-  * Merged 0.89b-5 into trunk
-
- -- Tobias Grimm <tg at e-tobi.net>  Sat, 09 Aug 2008 14:47:26 +0200
+vdr-plugin-bitstreamout (0.89c-2) unstable; urgency=low
+
+  * Merged changes from 0.89b-5 into trunk
+  * Changed my maintainer email address
+  * Added missing dpatch description
+  * Added 04_no-soname.dpatch to not build the plugin with a soname to avoid
+    problems with dh_shlibdeps / dh_makeshlibs thinking the  plugin lib is a
+    normal shared library
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 30 Nov 2008 19:47:57 +0100
 
 vdr-plugin-bitstreamout (0.89c-1) unstable; urgency=low
 

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=7499&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/control (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/control Sun Nov 30 18:49:56 2008
@@ -2,7 +2,7 @@
 Section: misc
 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>
+Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
 Build-Depends: debhelper (>> 5), cdbs, dpatch, po-debconf, vdr-dev (>= 1.6.0-5), libasound2-dev, libmad0-dev
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/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=7499&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/copyright (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/copyright Sun Nov 30 18:49:56 2008
@@ -6,7 +6,7 @@
     Sven Goethel <sven at jausoft.com>
 
 Debian Maintainers:
-    Tobias Grimm <tg at e-tobi.net>
+    Tobias Grimm <etobi at debian.org>
     Thomas Günther <tom at toms-cafe.de>
     Thomas Schmidt <tschmidt at debian.org>
 

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=7499&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/00list Sun Nov 30 18:49:56 2008
@@ -1,3 +1,4 @@
 01_vdr-include-fix
 02_fix-nostrip
 03_hppa-workaround
+04_no-soname

Modified: 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=7499&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/01_vdr-include-fix.dpatch Sun Nov 30 18:49:56 2008
@@ -2,7 +2,7 @@
 ## 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.
+## DP: Fixes VDR includes detection in Makefile
 
 @DPATCH@
 diff -urNad vdr-plugin-bitstreamout-0.89b~/Makefile vdr-plugin-bitstreamout-0.89b/Makefile

Added: vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch?rev=7499&op=file
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch (added)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch Sun Nov 30 18:49:56 2008
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_no-soname.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The library doesn't need a soname, because it is not managed
+## DP: by the dynamic library loader. The soname makes dh_shlibdeps
+## DP: and dh_makeshlibs think it is a normal shared libray, so
+## DP: we just remove the soname.
+
+ at DPATCH@
+--- vdr-plugin-bitstreamout-0.89c.orig/Makefile
++++ vdr-plugin-bitstreamout-0.89c/Makefile
+@@ -114,7 +114,7 @@
+ 	@echo $(PLUGIN) Version $(VERSION)
+ 
+ libvdr-$(PLUGIN).so: $(OBJS)
+-	$(CXX) $(CXXFLAGS) -shared $(OBJS) -Wl,-soname -Wl,$@.$(APIVERSION) -o $@ -lasound -lrt -lmad
++	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -lasound -lrt -lmad
+ 	@cp -p --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+ 	@-strip --strip-unneeded       $(LIBDIR)/$@.$(APIVERSION)
+ 

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=7499&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/rules (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/rules Sun Nov 30 18:49:56 2008
@@ -2,6 +2,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
+
+DEB_INSTALL_CHANGELOGS_ALL = ChangeLog
 
 MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=. CXXARCH=
 




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