r208 - in unstable/libdvb/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Fri Mar 16 23:51:33 CET 2007 

Author: sho
Date: 2007-03-16 17:03:47 +0000 (Fri, 16 Mar 2007)
New Revision: 208

Added:
   unstable/libdvb/debian/patches/000_config_deb.diff
   unstable/libdvb/debian/patches/030_implicit_declarations.diff
Modified:
   unstable/libdvb/debian/changelog
   unstable/libdvb/debian/compat
   unstable/libdvb/debian/control
   unstable/libdvb/debian/patches/010_no_dvb_mpegtools.diff
   unstable/libdvb/debian/patches/series
   unstable/libdvb/debian/rules
Log:
libdvb (0.5.5.1-3) unstable; urgency=low

  * debian/control:
    + Set pkg-multimedia-maintainers as main maintainer.
    + Added Vcs fields.
    + Set policy to 3.7.2.
  * debian/compat:
    + Set compat to 5.

  * debian/patches/030_implicit_declarations.diff:
    + New patch. Fix implicit declarations of memcpy().

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 16 Mar 2007 17:30:24 +0100


Modified: unstable/libdvb/debian/changelog
===================================================================
--- unstable/libdvb/debian/changelog	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/changelog	2007-03-16 17:03:47 UTC (rev 208)
@@ -1,3 +1,17 @@
+libdvb (0.5.5.1-3) unstable; urgency=low
+
+  * debian/control:
+    + Set pkg-multimedia-maintainers as main maintainer.
+    + Added Vcs fields.
+    + Set policy to 3.7.2.
+  * debian/compat:
+    + Set compat to 5.
+
+  * debian/patches/030_implicit_declarations.diff:
+    + New patch. Fix implicit declarations of memcpy().
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 16 Mar 2007 17:30:24 +0100
+
 libdvb (0.5.5.1-2) unstable; urgency=low
 
   * Switched patch system to quilt.

Modified: unstable/libdvb/debian/compat
===================================================================
--- unstable/libdvb/debian/compat	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/compat	2007-03-16 17:03:47 UTC (rev 208)
@@ -1 +1 @@
-4
+5

Modified: unstable/libdvb/debian/control
===================================================================
--- unstable/libdvb/debian/control	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/control	2007-03-16 17:03:47 UTC (rev 208)
@@ -1,9 +1,12 @@
 Source: libdvb
 Section: devel
 Priority: optional
-Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 4.0), quilt, linux-kernel-headers (>= 2.5.999-test7-bk-6)
-Standards-Version: 3.6.2
+Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Build-Depends: debhelper (>= 5.0), quilt, linux-kernel-headers (>= 2.5.999-test7-bk-6)
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libdvb
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libdvb/
 
 Package: libdvb-dev
 Section: libdevel

Added: unstable/libdvb/debian/patches/000_config_deb.diff
===================================================================
--- unstable/libdvb/debian/patches/000_config_deb.diff	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/patches/000_config_deb.diff	2007-03-16 17:03:47 UTC (rev 208)
@@ -0,0 +1,80 @@
+Index: libdvb-0.5.5.1/Makefile
+===================================================================
+--- libdvb-0.5.5.1.orig/Makefile	2005-03-22 14:23:25.000000000 +0100
++++ libdvb-0.5.5.1/Makefile	2007-03-16 17:44:28.000000000 +0100
+@@ -8,6 +8,7 @@
+ 
+ RESOURCES=README
+ include config.mk
++include config.deb
+ 
+ 
+ 
+Index: libdvb-0.5.5.1/config.mk
+===================================================================
+--- libdvb-0.5.5.1.orig/config.mk	2007-03-16 17:44:57.000000000 +0100
++++ libdvb-0.5.5.1/config.mk	2007-03-16 17:45:14.000000000 +0100
+@@ -3,7 +3,7 @@
+ 
+ PREFIX = /usr/local
+ VERSION = 0.5.5.1
+-CFLAGS=-O2 -Wall -g
++#CFLAGS=-O2 -Wall -g
+ INCLUDES=-I. -I../include 
+ TEST_PROGS= merge_dvb conv satscan cam_set cam_test quickscan cam_menu dump_TS
+ #CXX = g++-3.2
+Index: libdvb-0.5.5.1/dvb-mpegtools/Makefile
+===================================================================
+--- libdvb-0.5.5.1.orig/dvb-mpegtools/Makefile	2007-03-16 17:44:12.000000000 +0100
++++ libdvb-0.5.5.1/dvb-mpegtools/Makefile	2007-03-16 17:44:39.000000000 +0100
+@@ -1,5 +1,6 @@
+ 
+ include ../config.mk
++include ../config.deb
+ 
+ DCFLAGS =  $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ LIBS   = -L../ -ldvbmpegtools
+Index: libdvb-0.5.5.1/libdvb/Makefile
+===================================================================
+--- libdvb-0.5.5.1.orig/libdvb/Makefile	2007-03-16 17:44:12.000000000 +0100
++++ libdvb-0.5.5.1/libdvb/Makefile	2007-03-16 17:44:42.000000000 +0100
+@@ -1,5 +1,6 @@
+ 
+ include ../config.mk
++include ../config.deb
+ 
+ OBJS=devices.o DVB.o OSD.o 
+ LIBS=-L./ -lpthread
+Index: libdvb-0.5.5.1/libdvbci/Makefile
+===================================================================
+--- libdvb-0.5.5.1.orig/libdvbci/Makefile	2007-03-16 17:44:12.000000000 +0100
++++ libdvb-0.5.5.1/libdvbci/Makefile	2007-03-16 17:44:41.000000000 +0100
+@@ -1,5 +1,6 @@
+ 
+ include ../config.mk
++include ../config.deb
+ 
+ CI_OBJS=ci.o ci2.o
+ LIBS=-L./ -lpthread
+Index: libdvb-0.5.5.1/libdvbmpeg/Makefile
+===================================================================
+--- libdvb-0.5.5.1.orig/libdvbmpeg/Makefile	2007-03-16 17:44:12.000000000 +0100
++++ libdvb-0.5.5.1/libdvbmpeg/Makefile	2007-03-16 17:44:44.000000000 +0100
+@@ -1,5 +1,6 @@
+ 
+ include ../config.mk
++include ../config.deb
+ 
+ DCFLAGS =  $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ MFLAG  = -M
+Index: libdvb-0.5.5.1/sample_progs/Makefile
+===================================================================
+--- libdvb-0.5.5.1.orig/sample_progs/Makefile	2007-03-16 17:44:13.000000000 +0100
++++ libdvb-0.5.5.1/sample_progs/Makefile	2007-03-16 17:44:46.000000000 +0100
+@@ -1,5 +1,6 @@
+ 
+ include ../config.mk
++include ../config.deb
+ 
+ LIBS=-L../ 
+ DVB_LIBS=libdvb.a libdvbci.a

Modified: unstable/libdvb/debian/patches/010_no_dvb_mpegtools.diff
===================================================================
--- unstable/libdvb/debian/patches/010_no_dvb_mpegtools.diff	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/patches/010_no_dvb_mpegtools.diff	2007-03-16 17:03:47 UTC (rev 208)
@@ -1,5 +1,7 @@
---- libdvb-0.5.5.1.orig/Makefile
-+++ libdvb-0.5.5.1/Makefile
+Index: libdvb-0.5.5.1/Makefile
+===================================================================
+--- libdvb-0.5.5.1.orig/Makefile	2005-03-22 14:23:25.000000000 +0100
++++ libdvb-0.5.5.1/Makefile	2007-03-16 17:44:28.000000000 +0100
 @@ -1,5 +1,5 @@
  
 -SOURCEDIRS=include libdvb libdvbci libdvbmpeg sample_progs dvb-mpegtools samplerc 
@@ -7,7 +9,7 @@
  DVB-MPEGTOOLS= dvb-mpegtools_main dvb-mplex audiofilter dvbaudio
  DVB_LIBS=libdvb.a libdvbci.a libdvbmpegtools.a
  HEADERS=include/DVB.hh include/ci.hh include/devices.hh include/channel.h include/ctools.h \
-@@ -11,19 +11,19 @@
+@@ -8,19 +8,19 @@
  
  
  
@@ -32,7 +34,7 @@
  
  libdvb.a: libdvb/libdvb.a
  	cp libdvb/libdvb.a .
-@@ -69,8 +69,8 @@
+@@ -69,8 +70,8 @@
  	make -C libdvbci clean
  	make -C libdvbmpeg clean
  	make -C sample_progs clean

Added: unstable/libdvb/debian/patches/030_implicit_declarations.diff
===================================================================
--- unstable/libdvb/debian/patches/030_implicit_declarations.diff	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/patches/030_implicit_declarations.diff	2007-03-16 17:03:47 UTC (rev 208)
@@ -0,0 +1,12 @@
+Index: libdvb-0.5.5.1/libdvbmpeg/ringbuffy.c
+===================================================================
+--- libdvb-0.5.5.1.orig/libdvbmpeg/ringbuffy.c	2007-03-16 17:53:31.000000000 +0100
++++ libdvb-0.5.5.1/libdvbmpeg/ringbuffy.c	2007-03-16 17:54:10.000000000 +0100
+@@ -19,6 +19,7 @@
+ */
+ 
+ #include "ringbuffy.h"
++#include <string.h>
+ 
+ int ring_init (ringbuffy *rbuf, int size)
+ {

Modified: unstable/libdvb/debian/patches/series
===================================================================
--- unstable/libdvb/debian/patches/series	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/patches/series	2007-03-16 17:03:47 UTC (rev 208)
@@ -1,2 +1,4 @@
+000_config_deb.diff
 010_no_dvb_mpegtools.diff -p1
 020_invalid_casts.diff -p1
+030_implicit_declarations.diff

Modified: unstable/libdvb/debian/rules
===================================================================
--- unstable/libdvb/debian/rules	2007-03-16 16:30:18 UTC (rev 207)
+++ unstable/libdvb/debian/rules	2007-03-16 17:03:47 UTC (rev 208)
@@ -2,23 +2,21 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
+CFLAGS = -O2 -Wall -g
+
 build: build-stamp
 build-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	# Build the PIC library
-	rm -f config.bak
-	sed -e 's/CFLAGS.*/CFLAGS=-O2 -Wall -g -fPIC/' < config.mk > config.bak
-	mv config.bak config.mk
+	echo 'CFLAGS=$(CFLAGS) -fPIC' > config.deb
 	$(MAKE) $(DEB_BUILD_OPTIONS)
 	mv libdvb/libdvb.a libdvb_pic.a
 	mv libdvbci/libdvbci.a libdvbci_pic.a
 	mv libdvbmpeg/libdvbmpegtools.a libdvbmpegtools_pic.a
 	$(MAKE) $(DEB_BUILD_OPTIONS) clean
 	# Build the normal static library
-	rm -f config.bak
-	sed -e 's/CFLAGS.*/CFLAGS=-O2 -Wall -g/' < config.mk > config.bak
-	mv config.bak config.mk
+	echo 'CFLAGS=$(CFLAGS)' > config.deb
 	$(MAKE) $(DEB_BUILD_OPTIONS)
 	touch build-stamp
 
@@ -26,12 +24,10 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	rm -f config.bak
-	sed -e 's/CFLAGS.*/CFLAGS=-O2 -Wall -g/' < config.mk > config.bak
-	mv config.bak config.mk
+	rm -f config.deb
+	rm -f libdvb_pic.a libdvbci_pic.a libdvbmpegtools_pic.a
 	-$(MAKE) $(DEB_BUILD_OPTIONS) clean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -f libdvb_pic.a libdvbci_pic.a libdvbmpegtools_pic.a
 	dh_clean
 
 install: build
@@ -39,14 +35,11 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
-	# Install the package into debian/libdvb-dev
 	$(MAKE) $(DEB_BUILD_OPTIONS) PREFIX=$(CURDIR)/debian/libdvb-dev/usr install
 	cp libdvb_pic.a debian/libdvb-dev/usr/lib/
 	cp libdvbci_pic.a debian/libdvb-dev/usr/lib/
 	cp libdvbmpegtools_pic.a debian/libdvb-dev/usr/lib/
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -55,28 +48,14 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-
-#	dh_installdebconf	
 	dh_installdocs README
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs
 	dh_link
-#	dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums

More information about the Pkg-multimedia-commits mailing list