r7503 - in /vdr/vdr-plugin-bitstreamout/trunk/debian: changelog patches/02_fix-nostrip.dpatch patches/04_no-soname.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sun Nov 30 20:50:58 2008
New Revision: 7503

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7503
Log:
release

Modified:
    vdr/vdr-plugin-bitstreamout/trunk/debian/changelog
    vdr/vdr-plugin-bitstreamout/trunk/debian/patches/02_fix-nostrip.dpatch
    vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch

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=7503&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/changelog Sun Nov 30 20:50:58 2008
@@ -1,13 +1,14 @@
 vdr-plugin-bitstreamout (0.89c-2) unstable; urgency=low
 
-  * Merged changes from 0.89b-5 into trunk
+  * Merged changes from lenny branch (0.89b-6 - 0.89b-8) 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
+  * Install upstream ChangeLog
+
+ -- Tobias Grimm <etobi at debian.org>  Sun, 30 Nov 2008 21:48:58 +0100
 
 vdr-plugin-bitstreamout (0.89c-1) unstable; urgency=low
 

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=7503&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 Sun Nov 30 20:50:58 2008
@@ -5,14 +5,14 @@
 ## DP: Fixes DEB_BUILD_OPTIONS=nostrip.
 
 @DPATCH@
-diff -urNad vdr-plugin-bitstreamout-0.89c~/Makefile vdr-plugin-bitstreamout-0.89c/Makefile
---- vdr-plugin-bitstreamout-0.89c~/Makefile	2008-07-25 19:58:23.000000000 +0200
-+++ vdr-plugin-bitstreamout-0.89c/Makefile	2008-07-25 19:58:45.000000000 +0200
-@@ -116,7 +116,6 @@
+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,$@.$(APIVERSION) -o $@ -lasound -lrt -lmad
- 	@cp -p --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
--	@-strip --strip-unneeded       $(LIBDIR)/$@.$(APIVERSION)
+ 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -Wl,-soname -Wl,$@.$(VDRVERSION) -o $@ -lasound -lrt -lmad
+ 	@cp $@ $(PLUGINLIBDIR)/$@.$(VDRVERSION)
+-	@-strip --strip-unneeded $(PLUGINLIBDIR)/$@.$(VDRVERSION)
  
- install:  $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
+ install:  $(PLUGINLIBDIR)/libvdr-$(PLUGIN).so.$(VDRVERSION)
  	install -d -m 0755 $(DESTDIR)$(VIDEOLIB)/PLUGINS/lib

Modified: 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=7503&op=diff
==============================================================================
--- vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch (original)
+++ vdr/vdr-plugin-bitstreamout/trunk/debian/patches/04_no-soname.dpatch Sun Nov 30 20:50:58 2008
@@ -8,14 +8,15 @@
 ## DP: we just remove the soname.
 
 @DPATCH@
---- vdr-plugin-bitstreamout-0.89c.orig/Makefile
-+++ vdr-plugin-bitstreamout-0.89c/Makefile
-@@ -114,7 +114,7 @@
+diff -urNad vdr-plugin-bitstreamout-0.89c~/Makefile vdr-plugin-bitstreamout-0.89c/Makefile
+--- vdr-plugin-bitstreamout-0.89c~/Makefile	2008-11-30 21:40:25.000000000 +0100
++++ vdr-plugin-bitstreamout-0.89c/Makefile	2008-11-30 21:40:56.000000000 +0100
+@@ -101,7 +100,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) -Wl,-soname -Wl,$@.$(VDRVERSION) -o $@ -lasound -lrt -lmad
 +	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -lasound -lrt -lmad
- 	@cp -p --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
- 	@-strip --strip-unneeded       $(LIBDIR)/$@.$(APIVERSION)
+ 	@cp $@ $(PLUGINLIBDIR)/$@.$(VDRVERSION)
  
+ install:  $(PLUGINLIBDIR)/libvdr-$(PLUGIN).so.$(VDRVERSION)