[SCM] mp4v2/master: debian/patches/: patchset refreshed

[mfv at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7f8de899e060f6e02bb3c38fd6119d43adb47456
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Thu Nov 5 20:53:49 2015 +0100

    debian/patches/: patchset refreshed
    
    - 0001-Fix_mp4tags_corruption.patch updated
    - m4error.patch renamed to 0002-Fix_m4_error.patch
    
    Closes: #804127

diff --git a/debian/patches/0001-Fix_mp4tags_corruption.patch b/debian/patches/0001-Fix_mp4tags_corruption.patch
index ddc6fc5..182d41b 100644
--- a/debian/patches/0001-Fix_mp4tags_corruption.patch
+++ b/debian/patches/0001-Fix_mp4tags_corruption.patch
@@ -1,5 +1,5 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Tue, 4 Jun 2013 18:02:58 +0200
+From: "Matteo F. Vescovi" <mfv at debian.org>
+Date: Thu, 5 Nov 2015 15:26:00 +0100
 Subject: Fix_mp4tags_corruption
 
 ---
@@ -7,14 +7,14 @@ Subject: Fix_mp4tags_corruption
  1 file changed, 1 insertion(+)
 
 diff --git a/util/mp4tags.cpp b/util/mp4tags.cpp
-index 1b9e866..57e91e6 100644
+index 1b9e866..80e89d4 100644
 --- a/util/mp4tags.cpp
 +++ b/util/mp4tags.cpp
-@@ -538,6 +538,7 @@ extern "C" int
-                         }
+@@ -539,6 +539,7 @@ extern "C" int
                          else {
                              fprintf( stderr, "Art file %s not found\n", tags[i] );
-+                            break;
                          }
++                        break;
                      }
                      case OPT_ALBUM_ARTIST:
+                         MP4TagsSetAlbumArtist( mdata, tags[i] );
diff --git a/debian/patches/0002-Fix_m4_error.patch b/debian/patches/0002-Fix_m4_error.patch
new file mode 100644
index 0000000..c17998c
--- /dev/null
+++ b/debian/patches/0002-Fix_m4_error.patch
@@ -0,0 +1,27 @@
+From: Sebastian Ramacher <sramacher at debian.org>
+Date: Thu, 5 Nov 2015 20:53:13 +0100
+Subject: Fix_m4_error
+
+Fix m4 error while running autoreconf
+
+Origin: upstream, https://code.google.com/p/mp4v2/source/detail?r=496
+Last-Update: 2014-08-30
+
+Signed-off-by: Matteo F. Vescovi <mfv at debian.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7c514eb..83e9dce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,7 @@ m4_define([PRJ_version_hex],m4_format([0x%04x%02x%02x],PRJ_version_major,PRJ_ver
+ 
+ m4_define([PRJ_version],ifelse(
+     PRJ_repo_type,[stable],m4_format([%s],PRJ_repo_branch),
+-    m4_format([%s-r%d],PRJ_repo_branch,PRJ_repo_rev)))
++    m4_format([%s-r%s],PRJ_repo_branch,PRJ_repo_rev)))
+ 
+ ###############################################################################
+ # initialization
diff --git a/debian/patches/m4error.patch b/debian/patches/m4error.patch
deleted file mode 100644
index 3faa1c6..0000000
--- a/debian/patches/m4error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix m4 error while running autoreconf
-Origin: upstream, https://code.google.com/p/mp4v2/source/detail?r=496
-Last-Update: 2014-08-30
-
---- mp4v2-2.0.0~dfsg0.orig/configure.ac
-+++ mp4v2-2.0.0~dfsg0/configure.ac
-@@ -20,7 +20,7 @@ m4_define([PRJ_version_hex],m4_format([0
- 
- m4_define([PRJ_version],ifelse(
-     PRJ_repo_type,[stable],m4_format([%s],PRJ_repo_branch),
--    m4_format([%s-r%d],PRJ_repo_branch,PRJ_repo_rev)))
-+    m4_format([%s-r%s],PRJ_repo_branch,PRJ_repo_rev)))
- 
- ###############################################################################
- # initialization
diff --git a/debian/patches/series b/debian/patches/series
index 26bf930..cd1a4cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 0001-Fix_mp4tags_corruption.patch
-m4error.patch
+0002-Fix_m4_error.patch

-- 
mp4v2 packaging