[vorbis-tools] 01/02: Format patches for gbp-pq, correct tagging and add missing information to tagging.

Martin Steghöfer martin.steghoefer-guest at moszumanska.debian.org
Mon Oct 27 18:57:36 UTC 2014 

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

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

commit ad6799378fc053bffe8d85e6e916954dd48874b4
Author: Martin Steghöfer <martin at steghoefer.eu>
Date:   Mon Oct 27 19:29:32 2014 +0100

    Format patches for gbp-pq, correct tagging and add missing information to tagging.
---
 ...-directory-does-not-have-Makefile.-am-in.patch} | 43 +++++++++++++---------
 ...tdout.patch => 0002-Don-t-corrupt-stdout.patch} | 10 ++++-
 ... => 0003-Floating-point-comparison-fails.patch} | 30 +++++++++------
 ...rror-blocking-compilation-with-hardening.patch} | 14 +++++--
 debian/patches/0005-Fix-URL-in-manpage.patch       | 24 ++++++++++++
 debian/patches/fix_xiph_url.diff                   | 13 -------
 debian/patches/series                              | 10 ++---
 7 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/debian/patches/no_debian_subdir.diff b/debian/patches/0001-debian-directory-does-not-have-Makefile.-am-in.patch
similarity index 64%
rename from debian/patches/no_debian_subdir.diff
rename to debian/patches/0001-debian-directory-does-not-have-Makefile.-am-in.patch
index d3cb672..4b8b690 100644
--- a/debian/patches/no_debian_subdir.diff
+++ b/debian/patches/0001-debian-directory-does-not-have-Makefile.-am-in.patch
@@ -1,9 +1,18 @@
-My debian/ does not have Makefile.{am,in}.
-Index: vorbis-tools/Makefile.in
-===================================================================
---- vorbis-tools.orig/Makefile.in	2014-10-22 11:32:45.063811036 +0200
-+++ vorbis-tools/Makefile.in	2014-10-22 11:33:13.952011913 +0200
-@@ -266,7 +266,7 @@
+From: =?utf-8?q?Adeodato_Sim=C3=B3?= <dato at net.com.org.es>
+Date: Wed, 7 Dec 2005 06:21:02 +0100
+Subject: debian directory does not have Makefile.{am,in}.
+
+---
+ Makefile.in  | 2 +-
+ configure    | 3 +--
+ configure.ac | 1 -
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 6abea26..fa45509 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -266,7 +266,7 @@ target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = foreign dist-zip
@@ -12,11 +21,11 @@ Index: vorbis-tools/Makefile.in
  DIST_SUBDIRS = po intl include share debian win32 ogg123 oggenc oggdec ogginfo \
  	vcut vorbiscomment m4
  
-Index: vorbis-tools/configure
-===================================================================
---- vorbis-tools.orig/configure	2014-10-22 11:32:45.063811036 +0200
-+++ vorbis-tools/configure	2014-10-22 11:33:13.956011945 +0200
-@@ -24906,7 +24906,7 @@
+diff --git a/configure b/configure
+index 95e48d0..d4c836a 100755
+--- a/configure
++++ b/configure
+@@ -24906,7 +24906,7 @@ fi
  
  
  
@@ -25,7 +34,7 @@ Index: vorbis-tools/configure
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -25806,7 +25806,6 @@
+@@ -25806,7 +25806,6 @@ do
      "vorbiscomment/Makefile") CONFIG_FILES="$CONFIG_FILES vorbiscomment/Makefile" ;;
      "vcut/Makefile") CONFIG_FILES="$CONFIG_FILES vcut/Makefile" ;;
      "ogginfo/Makefile") CONFIG_FILES="$CONFIG_FILES ogginfo/Makefile" ;;
@@ -33,11 +42,11 @@ Index: vorbis-tools/configure
  
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-Index: vorbis-tools/configure.ac
-===================================================================
---- vorbis-tools.orig/configure.ac	2014-10-22 11:32:45.063811036 +0200
-+++ vorbis-tools/configure.ac	2014-10-22 11:33:13.956011945 +0200
-@@ -394,7 +394,6 @@
+diff --git a/configure.ac b/configure.ac
+index 725a495..03fe840 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -394,7 +394,6 @@ ogg123/Makefile
  vorbiscomment/Makefile
  vcut/Makefile
  ogginfo/Makefile
diff --git a/debian/patches/dont-corrupt-stdout.patch b/debian/patches/0002-Don-t-corrupt-stdout.patch
similarity index 61%
rename from debian/patches/dont-corrupt-stdout.patch
rename to debian/patches/0002-Don-t-corrupt-stdout.patch
index 605e955..f4950ce 100644
--- a/debian/patches/dont-corrupt-stdout.patch
+++ b/debian/patches/0002-Don-t-corrupt-stdout.patch
@@ -1,5 +1,11 @@
-Author: Joao Paulo Pinharanda Magalhaes <joaoppmagalhaes at gmail.com>
-Bugs-Debian: https://bugs.debian.org/595104
+From: Joao Paulo Pinharanda Magalhaes <joaoppmagalhaes at gmail.com>
+Date: Wed, 1 Sep 2010 04:58:04 +0100
+Subject: Don't corrupt stdout
+
+Bug-Debian: https://bugs.debian.org/595104
+---
+ oggdec/oggdec.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/oggdec/oggdec.c b/oggdec/oggdec.c
 index 5ffb125..a99f95d 100644
diff --git a/debian/patches/quality-check-first-scale-next.patch b/debian/patches/0003-Floating-point-comparison-fails.patch
similarity index 55%
rename from debian/patches/quality-check-first-scale-next.patch
rename to debian/patches/0003-Floating-point-comparison-fails.patch
index f0519a5..a68874a 100644
--- a/debian/patches/quality-check-first-scale-next.patch
+++ b/debian/patches/0003-Floating-point-comparison-fails.patch
@@ -1,16 +1,22 @@
-Description: Floating point comparison fails.
- In checking the quality setting, the program `oggenc'
- performs a floating point comparison after down scaling
- the given value to a tenth. This causes the inexact
- internal representation to complain unnecessarily.
- *
- It is better to compare first, and normalize later,
- since quality 10 is top notch!
-Last-Update: 2011-07-10
+From: Mats Erik Andersson <debian at gisladisker.se>
+Date: Wed, 20 Jul 2011 17:24:43 +0200
+Subject: Floating point comparison fails.
+
+Last-Update: 2011-07-20
 Forwarded: no
-Author: Mats Erik Andersson <debian at gisladisker.se>
-Bugs-Debian: https://bugs.debian.org/328266
-Bugs-Debian: https://bugs.debian.org/634855
+Bug-Debian: https://bugs.debian.org/328266
+Bug-Debian: https://bugs.debian.org/634855
+
+In checking the quality setting, the program `oggenc'
+performs a floating point comparison after down scaling
+the given value to a tenth. This causes the inexact
+internal representation to complain unnecessarily.
+*
+It is better to compare first, and normalize later,
+since quality 10 is top notch!
+---
+ oggenc/oggenc.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/oggenc/oggenc.c b/oggenc/oggenc.c
 index 9c3e9cd..5c36fea 100644
diff --git a/debian/patches/format-security.patch b/debian/patches/0004-Fix-format-error-blocking-compilation-with-hardening.patch
similarity index 58%
rename from debian/patches/format-security.patch
rename to debian/patches/0004-Fix-format-error-blocking-compilation-with-hardening.patch
index 7f2ff23..111e98a 100644
--- a/debian/patches/format-security.patch
+++ b/debian/patches/0004-Fix-format-error-blocking-compilation-with-hardening.patch
@@ -1,9 +1,15 @@
-Description: Fix format error blocking compilation with hardening
- Enabling hardening refuses to compile code with sprintf() calls
- with no formatting string.  Adjust the code to work with hardening.
+From: Petter Reinholdtsen <pere at hungry.com>
+Date: Wed, 22 Oct 2014 13:25:21 +0200
+Subject: Fix format error blocking compilation with hardening
+
 Last-Update: 2014-10-22
 Forwarded: no
-Author: Petter Reinholdtsen
+
+Enabling hardening refuses to compile code with sprintf() calls
+with no formatting string. Adjust the code to work with hardening.
+---
+ ogg123/status.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ogg123/status.c b/ogg123/status.c
 index 92b8ff1..ccec389 100644
diff --git a/debian/patches/0005-Fix-URL-in-manpage.patch b/debian/patches/0005-Fix-URL-in-manpage.patch
new file mode 100644
index 0000000..25d58a6
--- /dev/null
+++ b/debian/patches/0005-Fix-URL-in-manpage.patch
@@ -0,0 +1,24 @@
+From: Aditya Vaidya <kroq.gar78 at gmail.com>
+Date: Thu, 15 Mar 2012 07:04:10 +0000
+Subject: Fix URL in manpage
+
+Origin: https://bugs.launchpad.net/ubuntu/+source/vorbis-tools/+bug/954529
+Bug-Debian: https://bugs.debian.org/664153
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/vorbis-tools/+bug/954529
+---
+ vorbiscomment/vorbiscomment.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vorbiscomment/vorbiscomment.1 b/vorbiscomment/vorbiscomment.1
+index a47bb12..441fe66 100644
+--- a/vorbiscomment/vorbiscomment.1
++++ b/vorbiscomment/vorbiscomment.1
+@@ -87,7 +87,7 @@ To add a set of comments from the standard input:
+ 
+ .SH TAG FORMAT
+ 
+-See http://xiph.org/ogg/vorbis/doc/v-comment.html for documentation on the Ogg Vorbis tag format, including a suggested list of canonical tag names.
++See http://www.xiph.org/vorbis/doc/v-comment.html for documentation on the Ogg Vorbis tag format, including a suggested list of canonical tag names.
+ 
+ .SH AUTHORS
+ 
diff --git a/debian/patches/fix_xiph_url.diff b/debian/patches/fix_xiph_url.diff
deleted file mode 100644
index 09cafd2..0000000
--- a/debian/patches/fix_xiph_url.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: vorbis-tools/vorbiscomment/vorbiscomment.1
-===================================================================
---- vorbis-tools.orig/vorbiscomment/vorbiscomment.1	2012-03-15 17:46:05.171741000 -0400
-+++ vorbis-tools/vorbiscomment/vorbiscomment.1	2012-03-15 17:46:35.535933000 -0400
-@@ -87,7 +87,7 @@
- 
- .SH TAG FORMAT
- 
--See http://xiph.org/ogg/vorbis/doc/v-comment.html for documentation on the Ogg Vorbis tag format, including a suggested list of canonical tag names.
-+See http://www.xiph.org/vorbis/doc/v-comment.html for documentation on the Ogg Vorbis tag format, including a suggested list of canonical tag names.
- 
- .SH AUTHORS
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9b6fad0..603dc21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-no_debian_subdir.diff
-dont-corrupt-stdout.patch
-quality-check-first-scale-next.patch
-format-security.patch
-fix_xiph_url.diff
+0001-debian-directory-does-not-have-Makefile.-am-in.patch
+0002-Don-t-corrupt-stdout.patch
+0003-Floating-point-comparison-fails.patch
+0004-Fix-format-error-blocking-compilation-with-hardening.patch
+0005-Fix-URL-in-manpage.patch

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

More information about the pkg-xiph-commits mailing list