[libtheora] 01/02: Tag existing patches properly and use git-buildpackage patch queue for all our patches.

Martin Steghöfer martin.steghoefer-guest at moszumanska.debian.org
Tue Sep 22 08:36:04 UTC 2015 

This is an automated email from the git hooks/post-receive script.

martin.steghoefer-guest pushed a commit to branch master
in repository libtheora.

commit 8c48f707fb742c3734dcc3cc6ce53398e5a90a2f
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Tue Sep 22 09:25:25 2015 +0200

    Tag existing patches properly and use git-buildpackage patch queue for all our patches.
---
 ...0001-Disable-maintainer-mode-in-autotools.patch | 23 ++++++++++++++++++++
 .../0002-Remove-non-DFSG-commpliant-RFCs.patch     | 24 +++++++++++++++++++++
 .../0003-Build-on-hurd-i386-and-kfreebsd.patch     | 25 ++++++++++++++++++++++
 debian/patches/autotools                           | 11 ----------
 debian/patches/build_on_gnu                        | 13 -----------
 debian/patches/dfsg                                | 14 ------------
 debian/patches/series                              |  6 +++---
 7 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/debian/patches/0001-Disable-maintainer-mode-in-autotools.patch b/debian/patches/0001-Disable-maintainer-mode-in-autotools.patch
new file mode 100644
index 0000000..8b91eaa
--- /dev/null
+++ b/debian/patches/0001-Disable-maintainer-mode-in-autotools.patch
@@ -0,0 +1,23 @@
+From: Risko Gergely <risko at debian.org>
+Date: Mon, 21 Mar 2005 19:22:55 +0100
+Subject: Disable maintainer mode in autotools
+
+Bug-Debian: https://bugs.debian.org/300422
+
+Disable enable-maintainer-mode for debian packages. As one of the side effects,
+there is no need to pass the --prefix option to avoid installing things into
+/usr/local .
+---
+ autogen.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index bbca69d..c275c27 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -126,4 +126,4 @@ echo "  autoconf"
+ autoconf || exit 1
+ 
+ cd $olddir
+-$srcdir/configure --enable-maintainer-mode "$@" && echo
++#$srcdir/configure --enable-maintainer-mode "$@" && echo
diff --git a/debian/patches/0002-Remove-non-DFSG-commpliant-RFCs.patch b/debian/patches/0002-Remove-non-DFSG-commpliant-RFCs.patch
new file mode 100644
index 0000000..228780b
--- /dev/null
+++ b/debian/patches/0002-Remove-non-DFSG-commpliant-RFCs.patch
@@ -0,0 +1,24 @@
+From: John Ferlito <johnf at inodes.org>
+Date: Sat, 12 Dec 2009 11:17:56 +1100
+Subject: Remove non-DFSG commpliant RFCs
+
+Bug-Debian: https://bugs.debian.org/554457
+---
+ doc/Makefile.am | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 30eaad8..00233e5 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -4,9 +4,7 @@ SUBDIRS = spec
+ 
+ docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ 
+-static_docs = vp3-format.txt color.html \
+-	draft-ietf-avt-rtp-theora-00.xml \
+-	draft-ietf-avt-rtp-theora-00.txt
++static_docs = vp3-format.txt color.html
+ 
+ doc_DATA = $(static_docs) doxygen-build.stamp
+ 
diff --git a/debian/patches/0003-Build-on-hurd-i386-and-kfreebsd.patch b/debian/patches/0003-Build-on-hurd-i386-and-kfreebsd.patch
new file mode 100644
index 0000000..ff59f5e
--- /dev/null
+++ b/debian/patches/0003-Build-on-hurd-i386-and-kfreebsd.patch
@@ -0,0 +1,25 @@
+From: Samuel Thibault <sthibault at debian.org>
+Date: Wed, 11 Nov 2009 00:07:29 +0100
+Subject: Build on hurd-i386 and kfreebsd-*
+
+Bug-Debian: https://bugs.debian.org/555670
+Forwarded: https://trac.xiph.org/ticket/1626#comment:1
+
+Use the same symbol versioning for hurd-i386 and kfreebsd-*
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8260bdf..e75fc3d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -222,7 +222,7 @@ if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
+     THC_VERSION_ARG="-export-symbols \$(top_srcdir)/win32/libtheora.def"
+     AC_MSG_RESULT([-export-symbols])
+     ;;
+-  linux* | solaris* )
++  linux* | solaris* | gnu* | k*bsd*-gnu)
+     THDEC_VERSION_ARG='-Wl,--version-script=$(srcdir)/Version_script-dec'
+     THENC_VERSION_ARG='-Wl,--version-script=$(srcdir)/Version_script-enc'
+     TH_VERSION_ARG='-Wl,--version-script=$(srcdir)/Version_script'
diff --git a/debian/patches/autotools b/debian/patches/autotools
deleted file mode 100644
index 828b47c..0000000
--- a/debian/patches/autotools
+++ /dev/null
@@ -1,11 +0,0 @@
-# Disable enable-maintainer-mode for debian packages. As one of the side effects,
-# there is no need to pass the --prefix option to avoid installing things into
-# /usr/local .
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -126,4 +126,4 @@
- autoconf || exit 1
- 
- cd $olddir
--$srcdir/configure --enable-maintainer-mode "$@" && echo
-+#$srcdir/configure --enable-maintainer-mode "$@" && echo
diff --git a/debian/patches/build_on_gnu b/debian/patches/build_on_gnu
deleted file mode 100644
index 8c05d50..0000000
--- a/debian/patches/build_on_gnu
+++ /dev/null
@@ -1,13 +0,0 @@
-# Use the same symbol verioning for hurd-i386 and kfreebsd-*
-# Pushed upstream
---- libtheora-1.1.1/configure.ac.origin 2009-11-10 22:32:28.000000000 +0000
-+++ libtheora-1.1.1/configure.ac    2009-11-10 22:38:03.000000000 +0000
-@@ -222,7 +222,7 @@
-     THC_VERSION_ARG="-export-symbols \$(top_srcdir)/win32/libtheora.def"
-     AC_MSG_RESULT([-export-symbols])
-     ;;
--  linux* | solaris* )
-+  linux* | solaris* | gnu* | k*bsd*-gnu)
-     THDEC_VERSION_ARG='-Wl,--version-script=$(srcdir)/Version_script-dec'
-     THENC_VERSION_ARG='-Wl,--version-script=$(srcdir)/Version_script-enc'
-     TH_VERSION_ARG='-Wl,--version-script=$(srcdir)/Version_script'
diff --git a/debian/patches/dfsg b/debian/patches/dfsg
deleted file mode 100644
index abbb380..0000000
--- a/debian/patches/dfsg
+++ /dev/null
@@ -1,14 +0,0 @@
-# Remove non-DFSG commpliant RFCs
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -4,9 +4,7 @@
- 
- docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
- 
--static_docs = vp3-format.txt color.html \
--	draft-ietf-avt-rtp-theora-00.xml \
--	draft-ietf-avt-rtp-theora-00.txt
-+static_docs = vp3-format.txt color.html
- 
- doc_DATA = $(static_docs) doxygen-build.stamp
- 
diff --git a/debian/patches/series b/debian/patches/series
index 49c0989..7c693d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-autotools
-dfsg
-build_on_gnu
+0001-Disable-maintainer-mode-in-autotools.patch
+0002-Remove-non-DFSG-commpliant-RFCs.patch
+0003-Build-on-hurd-i386-and-kfreebsd.patch
 0004-player-example-needs-lm-for-rint.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/libtheora.git

More information about the pkg-xiph-commits mailing list