[SCM] mjpegtools/master: Move to quilt, refresh 01_debian-directory.patch
lucidfox-guest at users.alioth.debian.org
lucidfox-guest at users.alioth.debian.org
Sat Apr 30 17:57:26 UTC 2011
The following commit has been merged in the master branch:
commit 2f1410823a5c22c0f16220087961527f4aeb1e38
Author: Maia Kozheva <sikon at ubuntu.com>
Date: Sun May 1 00:54:38 2011 +0700
Move to quilt, refresh 01_debian-directory.patch
diff --git a/debian/patches/01_debian-directory.patch b/debian/patches/01_debian-directory.patch
index 8bcc42b..6630097 100644
--- a/debian/patches/01_debian-directory.patch
+++ b/debian/patches/01_debian-directory.patch
@@ -1,27 +1,7 @@
-diff -Nur mjpegtools-1.9.0rc3/configure mjpegtools-1.9.0rc3.new/configure
---- mjpegtools-1.9.0rc3/configure
-+++ mjpegtools-1.9.0rc3.new/configure
-@@ -27022,7 +27022,7 @@
- ;;
- esac
-
-- ac_config_files="$ac_config_files Makefile debian/Makefile debian/control docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
-+ ac_config_files="$ac_config_files Makefile docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -27679,8 +27679,6 @@
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
-- "debian/control" ) CONFIG_FILES="$CONFIG_FILES debian/control" ;;
- "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
- "lavtools/Makefile" ) CONFIG_FILES="$CONFIG_FILES lavtools/Makefile" ;;
- "yuvcorrect/Makefile" ) CONFIG_FILES="$CONFIG_FILES yuvcorrect/Makefile" ;;
-diff -Nur mjpegtools-1.9.0rc3/Makefile.am mjpegtools-1.9.0rc3.new/Makefile.am
---- mjpegtools-1.9.0rc3/Makefile.am
-+++ mjpegtools-1.9.0rc3.new/Makefile.am
+Index: mjpegtools/Makefile.am
+===================================================================
+--- mjpegtools.orig/Makefile.am 2011-05-01 00:52:34.341597541 +0700
++++ mjpegtools/Makefile.am 2011-05-01 00:53:11.591597540 +0700
@@ -23,8 +23,7 @@
yuvdeinterlace \
y4mdenoise \
@@ -32,10 +12,11 @@ diff -Nur mjpegtools-1.9.0rc3/Makefile.am mjpegtools-1.9.0rc3.new/Makefile.am
#
# Add any non autoconf'd files here, extra readmes and other misc
-diff -Nur mjpegtools-1.9.0rc3/Makefile.in mjpegtools-1.9.0rc3.new/Makefile.in
---- mjpegtools-1.9.0rc3/Makefile.in
-+++ mjpegtools-1.9.0rc3.new/Makefile.in
-@@ -270,8 +270,7 @@
+Index: mjpegtools/Makefile.in
+===================================================================
+--- mjpegtools.orig/Makefile.in 2011-05-01 00:52:34.311597541 +0700
++++ mjpegtools/Makefile.in 2011-05-01 00:53:11.591597540 +0700
+@@ -308,8 +308,7 @@
yuvdeinterlace \
y4mdenoise \
y4munsharp \
@@ -45,12 +26,38 @@ diff -Nur mjpegtools-1.9.0rc3/Makefile.in mjpegtools-1.9.0rc3.new/Makefile.in
#
-@@ -546,7 +545,7 @@
- distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/. $(distdir)/debian
-+ $(mkdir_p) $(distdir)/.
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
+Index: mjpegtools/configure.ac
+===================================================================
+--- mjpegtools.orig/configure.ac 2011-05-01 00:52:34.361597541 +0700
++++ mjpegtools/configure.ac 2011-05-01 00:53:11.591597540 +0700
+@@ -543,8 +543,6 @@
+ dnl **********************************************************************
+ AC_CONFIG_FILES([
+ Makefile
+- debian/Makefile
+- debian/control
+ docs/Makefile
+ lavtools/Makefile
+ yuvcorrect/Makefile
+Index: mjpegtools/configure
+===================================================================
+--- mjpegtools.orig/configure 2011-05-01 00:53:16.111597540 +0700
++++ mjpegtools/configure 2011-05-01 00:53:27.941597539 +0700
+@@ -18654,7 +18654,7 @@
+ ;;
+ esac
+
+-ac_config_files="$ac_config_files Makefile debian/Makefile debian/control docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
++ac_config_files="$ac_config_files Makefile docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -19782,8 +19782,6 @@
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+- "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+- "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
+ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+ "lavtools/Makefile") CONFIG_FILES="$CONFIG_FILES lavtools/Makefile" ;;
+ "yuvcorrect/Makefile") CONFIG_FILES="$CONFIG_FILES yuvcorrect/Makefile" ;;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..db060e4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01_debian-directory.patch
+02_as-needed.patch
+03_disable_optimization.patch
+04_manpage-syntax.patch
+05_shell-script-syntax.patch
diff --git a/debian/rules b/debian/rules
index 668824b..b5d52e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ binary-predeb/mjpegtools-gtk:: binary-predeb/libmjpegtools-1.9-0
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
--
mjpegtools packaging
More information about the pkg-multimedia-commits
mailing list