r13529 - in /trunk/libvideo-capture-v4l-perl: ./ RTjpeg/ RTjpeg/codec/modules/ V4l/ VBI/ debian/ debian/patches/
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Fri Jan 25 15:29:11 UTC 2008
Author: dmn
Date: Fri Jan 25 15:29:10 2008
New Revision: 13529
URL: http://svn.debian.org/wsvn/?sc=1&rev=13529
Log:
* put changes to upstream source in quilt patches
Added:
trunk/libvideo-capture-v4l-perl/debian/patches/
trunk/libvideo-capture-v4l-perl/debian/patches/bashism.patch
trunk/libvideo-capture-v4l-perl/debian/patches/compile-failure.patch
trunk/libvideo-capture-v4l-perl/debian/patches/compile_with_-fPIC.patch
trunk/libvideo-capture-v4l-perl/debian/patches/series
Modified:
trunk/libvideo-capture-v4l-perl/Makefile.PL
trunk/libvideo-capture-v4l-perl/RTjpeg/Makefile.PL
trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s.c
trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s_raw.c
trunk/libvideo-capture-v4l-perl/V4l/Makefile.PL
trunk/libvideo-capture-v4l-perl/VBI/Makefile.PL
trunk/libvideo-capture-v4l-perl/VBI/VBI.xs
trunk/libvideo-capture-v4l-perl/debian/changelog
trunk/libvideo-capture-v4l-perl/debian/control
trunk/libvideo-capture-v4l-perl/debian/rules
Modified: trunk/libvideo-capture-v4l-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/Makefile.PL?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/Makefile.PL (original)
+++ trunk/libvideo-capture-v4l-perl/Makefile.PL Fri Jan 25 15:29:10 2008
@@ -9,7 +9,6 @@
'NAME' => 'Video::Frequencies',
DISTNAME => 'Video-Capture-V4l',
'VERSION_FROM' => 'V4l/V4l.pm',
- CCFLAGS => '-fPIC',
linkext => {LINKTYPE => ''},
DIR => ['V4l','VBI','RTjpeg'],
);
Modified: trunk/libvideo-capture-v4l-perl/RTjpeg/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/RTjpeg/Makefile.PL?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/RTjpeg/Makefile.PL (original)
+++ trunk/libvideo-capture-v4l-perl/RTjpeg/Makefile.PL Fri Jan 25 15:29:10 2008
@@ -3,15 +3,14 @@
WriteMakefile(
NAME => 'Video::RTjpeg',
VERSION_FROM => 'RTjpeg.pm',
- CCFLAGS => '-fPIC',
OBJECT => '$(BASEEXT)$(OBJ_EXT) codec/RTjpeg.o',
);
sub MY::postamble { <<EOF
codec/RTjpeg.c: codec/compose.sh
- cd codec && . ./compose.sh
+ cd codec && . compose.sh
codec/RTjpeg.o: codec/RTjpeg.c codec/RTjpeg.h
- \$(CCCMD) \$(CCCDLFLAGS) -fPIC -o \$@ \$<
+ \$(CCCMD) \$(CCCDLFLAGS) -o \$@ \$<
EOF
}
Modified: trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s.c
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s.c?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s.c (original)
+++ trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s.c Fri Jan 25 15:29:10 2008
@@ -2,7 +2,7 @@
{
int ci=1, co=1, tmp;
- strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+ (u8)strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
for(ci=1; ci<=bt8; ci++)
if(data[RTjpeg_ZZ[ci]]>0)
Modified: trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s_raw.c
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s_raw.c?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s_raw.c (original)
+++ trunk/libvideo-capture-v4l-perl/RTjpeg/codec/modules/RTb2s_raw.c Fri Jan 25 15:29:10 2008
@@ -2,7 +2,7 @@
{
int ci=1, co=1, tmp;
- strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+ (u8)strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
for(ci=1; ci<=63; ci++)
if(data[RTjpeg_ZZ[ci]]>0)
Modified: trunk/libvideo-capture-v4l-perl/V4l/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/V4l/Makefile.PL?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/V4l/Makefile.PL (original)
+++ trunk/libvideo-capture-v4l-perl/V4l/Makefile.PL Fri Jan 25 15:29:10 2008
@@ -8,6 +8,5 @@
WriteMakefile(
'NAME' => 'Video::Capture::V4l',
'VERSION_FROM' => 'V4l.pm',
- CCFLAGS => '-fPIC',
LIBS => '-lpthread',
);
Modified: trunk/libvideo-capture-v4l-perl/VBI/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/VBI/Makefile.PL?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/VBI/Makefile.PL (original)
+++ trunk/libvideo-capture-v4l-perl/VBI/Makefile.PL Fri Jan 25 15:29:10 2008
@@ -3,5 +3,4 @@
WriteMakefile(
'NAME' => 'Video::Capture::VBI',
'VERSION_FROM' => 'VBI.pm',
- CCFLAGS => '-fPIC',
);
Modified: trunk/libvideo-capture-v4l-perl/VBI/VBI.xs
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/VBI/VBI.xs?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/VBI/VBI.xs (original)
+++ trunk/libvideo-capture-v4l-perl/VBI/VBI.xs Fri Jan 25 15:29:10 2008
@@ -482,7 +482,7 @@
case 0x55:
break;
default:
- break; /* no teletext page */
+ ; /* no teletext page */
}
if (data[1] == 0x55)
Modified: trunk/libvideo-capture-v4l-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/debian/changelog?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/changelog (original)
+++ trunk/libvideo-capture-v4l-perl/debian/changelog Fri Jan 25 15:29:10 2008
@@ -11,6 +11,7 @@
[ Damyan Ivanov ]
* debian/watch: use dist-based URL.
+ * put changes to upstream source in quilt patches
-- gregor herrmann <gregor+debian at comodo.priv.at> Mon, 21 Jan 2008 20:22:32 +0100
Modified: trunk/libvideo-capture-v4l-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/debian/control?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/control (original)
+++ trunk/libvideo-capture-v4l-perl/debian/control Fri Jan 25 15:29:10 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Zak B. Elep <zakame at spunge.org>, Carlo Segre <segre at debian.org>, Joey Hess <joeyh at debian.org>
-Build-Depends: debhelper (>= 5.0.0), perl (>= 5.8.0-7)
+Build-Depends: debhelper (>= 5.0.0), perl (>= 5.8.0-7), quilt
Standards-Version: 3.7.2
Homepage: http://search.cpan.org/dist/Video-Capture-V4l/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libvideo-capture-v4l-perl/
Added: trunk/libvideo-capture-v4l-perl/debian/patches/bashism.patch
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/debian/patches/bashism.patch?rev=13529&op=file
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/patches/bashism.patch (added)
+++ trunk/libvideo-capture-v4l-perl/debian/patches/bashism.patch Fri Jan 25 15:29:10 2008
@@ -1,0 +1,13 @@
+Index: libvideo-capture-v4l-perl/RTjpeg/Makefile.PL
+===================================================================
+--- libvideo-capture-v4l-perl.orig/RTjpeg/Makefile.PL 2008-01-25 16:35:41.000000000 +0200
++++ libvideo-capture-v4l-perl/RTjpeg/Makefile.PL 2008-01-25 16:35:53.000000000 +0200
+@@ -8,7 +8,7 @@
+
+ sub MY::postamble { <<EOF
+ codec/RTjpeg.c: codec/compose.sh
+- cd codec && . compose.sh
++ cd codec && . ./compose.sh
+
+ codec/RTjpeg.o: codec/RTjpeg.c codec/RTjpeg.h
+ \$(CCCMD) \$(CCCDLFLAGS) -o \$@ \$<
Added: trunk/libvideo-capture-v4l-perl/debian/patches/compile-failure.patch
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/debian/patches/compile-failure.patch?rev=13529&op=file
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/patches/compile-failure.patch (added)
+++ trunk/libvideo-capture-v4l-perl/debian/patches/compile-failure.patch Fri Jan 25 15:29:10 2008
@@ -1,0 +1,33 @@
+--- libvideo-capture-v4l-perl-0.901.orig/RTjpeg/codec/modules/RTb2s_raw.c
++++ libvideo-capture-v4l-perl-0.901/RTjpeg/codec/modules/RTb2s_raw.c
+@@ -2,7 +2,7 @@
+ {
+ int ci=1, co=1, tmp;
+
+- (u8)strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
++ strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+
+ for(ci=1; ci<=63; ci++)
+ if(data[RTjpeg_ZZ[ci]]>0)
+--- libvideo-capture-v4l-perl-0.901.orig/RTjpeg/codec/modules/RTb2s.c
++++ libvideo-capture-v4l-perl-0.901/RTjpeg/codec/modules/RTb2s.c
+@@ -2,7 +2,7 @@
+ {
+ int ci=1, co=1, tmp;
+
+- (u8)strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
++ strm[0]=(u8)(data[RTjpeg_ZZ[0]]>254) ? 254:((data[RTjpeg_ZZ[0]]<0)?0:data[RTjpeg_ZZ[0]]);
+
+ for(ci=1; ci<=bt8; ci++)
+ if(data[RTjpeg_ZZ[ci]]>0)
+--- libvideo-capture-v4l-perl-0.901.orig/VBI/VBI.xs
++++ libvideo-capture-v4l-perl-0.901/VBI/VBI.xs
+@@ -482,7 +482,7 @@
+ case 0x55:
+ break;
+ default:
+- ; /* no teletext page */
++ break; /* no teletext page */
+ }
+
+ if (data[1] == 0x55)
Added: trunk/libvideo-capture-v4l-perl/debian/patches/compile_with_-fPIC.patch
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/debian/patches/compile_with_-fPIC.patch?rev=13529&op=file
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/patches/compile_with_-fPIC.patch (added)
+++ trunk/libvideo-capture-v4l-perl/debian/patches/compile_with_-fPIC.patch Fri Jan 25 15:29:10 2008
@@ -1,0 +1,32 @@
+Index: libvideo-capture-v4l-perl/RTjpeg/Makefile.PL
+===================================================================
+--- libvideo-capture-v4l-perl.orig/RTjpeg/Makefile.PL 2008-01-25 16:37:24.000000000 +0200
++++ libvideo-capture-v4l-perl/RTjpeg/Makefile.PL 2008-01-25 16:37:35.000000000 +0200
+@@ -3,6 +3,7 @@
+ WriteMakefile(
+ NAME => 'Video::RTjpeg',
+ VERSION_FROM => 'RTjpeg.pm',
++ CCFLAGS => '-fPIC',
+ OBJECT => '$(BASEEXT)$(OBJ_EXT) codec/RTjpeg.o',
+ );
+
+@@ -11,6 +12,6 @@
+ cd codec && . ./compose.sh
+
+ codec/RTjpeg.o: codec/RTjpeg.c codec/RTjpeg.h
+- \$(CCCMD) \$(CCCDLFLAGS) -o \$@ \$<
++ \$(CCCMD) \$(CCCDLFLAGS) -fPIC -o \$@ \$<
+ EOF
+ }
+Index: libvideo-capture-v4l-perl/Makefile.PL
+===================================================================
+--- libvideo-capture-v4l-perl.orig/Makefile.PL 2008-01-25 16:37:25.000000000 +0200
++++ libvideo-capture-v4l-perl/Makefile.PL 2008-01-25 16:37:35.000000000 +0200
+@@ -9,6 +9,7 @@
+ 'NAME' => 'Video::Frequencies',
+ DISTNAME => 'Video-Capture-V4l',
+ 'VERSION_FROM' => 'V4l/V4l.pm',
++ CCFLAGS => '-fPIC',
+ linkext => {LINKTYPE => ''},
+ DIR => ['V4l','VBI','RTjpeg'],
+ );
Added: trunk/libvideo-capture-v4l-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/debian/patches/series?rev=13529&op=file
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/patches/series (added)
+++ trunk/libvideo-capture-v4l-perl/debian/patches/series Fri Jan 25 15:29:10 2008
@@ -1,0 +1,3 @@
+bashism.patch
+compile-failure.patch
+compile_with_-fPIC.patch
Modified: trunk/libvideo-capture-v4l-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libvideo-capture-v4l-perl/debian/rules?rev=13529&op=diff
==============================================================================
--- trunk/libvideo-capture-v4l-perl/debian/rules (original)
+++ trunk/libvideo-capture-v4l-perl/debian/rules Fri Jan 25 15:29:10 2008
@@ -6,6 +6,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
# If set to a true value then MakeMaker's prompt function will
# always return the default without waiting for user input.
@@ -29,7 +31,7 @@
endif
build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add commands to compile the package here
@@ -38,7 +40,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
More information about the Pkg-perl-cvs-commits
mailing list