[vorbis-tools] 02/03: Refresh.

[Petter Reinholdtsen]

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

pere pushed a commit to branch master
in repository vorbis-tools.

commit ab9c9e8c0d131ca81d78c47d3e9e362437ba9301
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Wed Oct 22 11:35:59 2014 +0200

    Refresh.
---
 debian/patches/no_debian_subdir.diff | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/debian/patches/no_debian_subdir.diff b/debian/patches/no_debian_subdir.diff
index 4d3db0c..d3cb672 100644
--- a/debian/patches/no_debian_subdir.diff
+++ b/debian/patches/no_debian_subdir.diff
@@ -1,18 +1,22 @@
 My debian/ does not have Makefile.{am,in}.
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -249,7 +249,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+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 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = foreign dist-zip
 -SUBDIRS = po intl include share debian win32 @OPT_SUBDIRS@
 +SUBDIRS = po intl include share win32 @OPT_SUBDIRS@
  DIST_SUBDIRS = po intl include share debian win32 ogg123 oggenc oggdec ogginfo \
  	vcut vorbiscomment m4
  
---- a/configure
-+++ b/configure
-@@ -31427,7 +31427,7 @@
+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 @@
  
  
  
@@ -21,7 +25,7 @@ My debian/ does not have Makefile.{am,in}.
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -32058,7 +32058,6 @@
+@@ -25806,7 +25806,6 @@
      "vorbiscomment/Makefile") CONFIG_FILES="$CONFIG_FILES vorbiscomment/Makefile" ;;
      "vcut/Makefile") CONFIG_FILES="$CONFIG_FILES vcut/Makefile" ;;
      "ogginfo/Makefile") CONFIG_FILES="$CONFIG_FILES ogginfo/Makefile" ;;
@@ -29,9 +33,11 @@ My debian/ does not have Makefile.{am,in}.
  
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
---- a/configure.ac
-+++ b/configure.ac
-@@ -333,7 +333,6 @@
+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 @@
  vorbiscomment/Makefile
  vcut/Makefile
  ogginfo/Makefile

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