[SCM] mpeg2dec/master: Convert package to 3.0 (quilt) format.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Feb 14 19:19:54 UTC 2012
The following commit has been merged in the master branch:
commit 3614efcddc87b17ed48e56378cd3d90263e97642
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Feb 14 20:19:41 2012 +0100
Convert package to 3.0 (quilt) format.
diff --git a/debian/patches/60_arm-private-symbols.patch b/debian/patches/60_arm-private-symbols.patch
index 3386cf7..8842f48 100644
--- a/debian/patches/60_arm-private-symbols.patch
+++ b/debian/patches/60_arm-private-symbols.patch
@@ -1,8 +1,12 @@
Set visibility of global symbols used in ARM specific assembly file to
internal; spotted my make check on armel; thanks Riku Voipio for the report.
---- a/libmpeg2/motion_comp_arm_s.S
-+++ b/libmpeg2/motion_comp_arm_s.S
+---
+ libmpeg2/motion_comp_arm_s.S | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+--- mpeg2dec.orig/libmpeg2/motion_comp_arm_s.S
++++ mpeg2dec/libmpeg2/motion_comp_arm_s.S
@@ -23,7 +23,8 @@
@ ----------------------------------------------------------------
@@ -13,7 +17,7 @@ internal; spotted my make check on armel; thanks Riku Voipio for the report.
MC_put_o_16_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
pld [r1]
-@@ -83,7 +84,8 @@
+@@ -83,7 +84,8 @@ MC_put_o_16_arm_align_jt:
@ ----------------------------------------------------------------
.align
@@ -23,7 +27,7 @@ internal; spotted my make check on armel; thanks Riku Voipio for the report.
MC_put_o_8_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
pld [r1]
-@@ -152,7 +154,8 @@
+@@ -152,7 +154,8 @@ MC_put_o_8_arm_align_jt:
.endm
.align
@@ -33,7 +37,7 @@ internal; spotted my make check on armel; thanks Riku Voipio for the report.
MC_put_x_16_arm:
@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
pld [r1]
-@@ -244,7 +247,8 @@
+@@ -244,7 +247,8 @@ MC_put_x_16_arm_align_jt:
@ ----------------------------------------------------------------
.align
diff --git a/debian/patches/61_global-symbol-test.patch b/debian/patches/61_global-symbol-test.patch
index 1eb01f4..8536e01 100644
--- a/debian/patches/61_global-symbol-test.patch
+++ b/debian/patches/61_global-symbol-test.patch
@@ -1,8 +1,12 @@
Rewrite the public symbol check to verify the shared libraries, to check for
more things, and to avoid duplication; fixes make check on ARM
---- a/test/globals
-+++ b/test/globals
+---
+ test/globals | 42 +++++++++++++++++++++++++++---------------
+ 1 file changed, 27 insertions(+), 15 deletions(-)
+
+--- mpeg2dec.orig/test/globals
++++ mpeg2dec/test/globals
@@ -1,4 +1,8 @@
#!/bin/sh
+# TODO
@@ -12,7 +16,7 @@ more things, and to avoid duplication; fixes make check on ARM
if test x"$srcdir" != x""; then
builddir="." # running from make check, but it does not define that
-@@ -14,22 +18,30 @@
+@@ -14,22 +18,30 @@ builddir=`cd $builddir;pwd`
error=0
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..91df592
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+60_arm-private-symbols.patch
+61_global-symbol-test.patch
diff --git a/debian/rules b/debian/rules
index 3d22db5..2b04aef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
mpeg2dec packaging
More information about the pkg-multimedia-commits
mailing list