[SCM] libquicktime/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Apr 28 18:59:10 UTC 2011


The following commit has been merged in the master branch:
commit 8414a2315a281fd9b45a826d7f44e7f5750831b9
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 28 20:59:17 2011 +0200

    Refresh patches.

diff --git a/debian/patches/02-install-in-libquicktime1.patch b/debian/patches/02-install-in-libquicktime1.patch
index 12904b2..42e6ada 100644
--- a/debian/patches/02-install-in-libquicktime1.patch
+++ b/debian/patches/02-install-in-libquicktime1.patch
@@ -1,18 +1,23 @@
 Init the package with libquicktime1 instead of libquicktime so that we don't
 conflict with libquicktime0 packages and pass -version-number to libtool.
 
+---
+ configure.ac    |    2 +-
+ src/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- libquicktime.orig/configure.ac
 +++ libquicktime/configure.ac
 @@ -1,5 +1,5 @@
  AC_INIT(src/lqt_quicktime.c)
--AM_INIT_AUTOMAKE(libquicktime, 1.1.5)
-+AM_INIT_AUTOMAKE(libquicktime1, 1.1.5)
+-AM_INIT_AUTOMAKE(libquicktime, 1.2.2)
++AM_INIT_AUTOMAKE(libquicktime1, 1.2.2)
  
  LQT_VERSION=$VERSION
  
 --- libquicktime.orig/src/Makefile.am
 +++ libquicktime/src/Makefile.am
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ AM_CFLAGS = -DLOCALE_DIR=\"$(localedir)\
  #
  libquicktime_la_LIBADD = @ICONV_LIBS@ @LTLIBINTL@
  
diff --git a/debian/patches/11-gtk+-2.24.patch b/debian/patches/11-gtk+-2.24.patch
index 122c6fa..1aa3edf 100644
--- a/debian/patches/11-gtk+-2.24.patch
+++ b/debian/patches/11-gtk+-2.24.patch
@@ -5,9 +5,13 @@ Origin: http://bugs.gentoo.org/show_bug.cgi?id=351854
 Author: Ingo Krabbe
 Reviewed-by: Stian Jenssen
 
+---
+ utils/gtk/lqt_gtk.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- libquicktime.orig/utils/gtk/lqt_gtk.c
 +++ libquicktime/utils/gtk/lqt_gtk.c
-@@ -320,10 +320,10 @@ lqtgtk_create_parameter_widget(lqt_param
+@@ -332,10 +332,10 @@ lqtgtk_create_parameter_widget(lqt_param
        ret->label = gtk_label_new(TR_DOM(info->real_name));
        gtk_misc_set_alignment(GTK_MISC(ret->label), 0.0, 0.5);
  
diff --git a/debian/patches/21-export-quicktime_set_window.patch b/debian/patches/21-export-quicktime_set_window.patch
index 3b524cc..2932794 100644
--- a/debian/patches/21-export-quicktime_set_window.patch
+++ b/debian/patches/21-export-quicktime_set_window.patch
@@ -1,8 +1,12 @@
 Export the quicktime_set_window function.
 
+---
+ include/quicktime/quicktime.h |    3 +++
+ 1 file changed, 3 insertions(+)
+
 --- libquicktime.orig/include/quicktime/quicktime.h
 +++ libquicktime/include/quicktime/quicktime.h
-@@ -1044,6 +1044,9 @@
+@@ -1047,6 +1047,9 @@ int quicktime_set_audio_position(quickti
  
  int quicktime_set_video_position(quicktime_t *file, int64_t frame, int track);
  

-- 
libquicktime packaging



More information about the pkg-multimedia-commits mailing list