[Pkg-xfce-commits] r7284 - in desktop/trunk/tumbler/debian: . patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Sat Jan 12 06:56:43 UTC 2013 

Author: mrpouit-guest
Date: 2013-01-12 18:56:43 +0000 (Sat, 12 Jan 2013)
New Revision: 7284

Removed:
   desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch
   desktop/trunk/tumbler/debian/patches/series
Modified:
   desktop/trunk/tumbler/debian/changelog
   desktop/trunk/tumbler/debian/control
   desktop/trunk/tumbler/debian/libtumbler-1-0.symbols
   desktop/trunk/tumbler/debian/rules
   desktop/trunk/tumbler/debian/tumbler-common.install
   desktop/trunk/tumbler/debian/tumbler-plugins-extra.install
Log:
* New upstream release (0.1.26).
* New upstream release (0.1.27):
  - reenable all plugins since there's now a priority mechanism to choose
    the preferred ones.
* debian/rules: drop --disable-ffmpeg-thumbnailer from configure.
* debian/control:
  - readd libffmpegthumbnailer-dev to b-deps to build the ffmpeg thumbnailer
    plugin.
  - add libcurl4-gnutls-dev to b-deps to build the cover thumbnailer plugin.
* debian/tumbler-plugins-extra.install: ship the new plugins.
* debian/tumbler-common.install: ship the new rc file.
* debian/libtumbler-1-0.symbols: updated for the new symbols.

Modified: desktop/trunk/tumbler/debian/changelog
===================================================================
--- desktop/trunk/tumbler/debian/changelog	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/changelog	2013-01-12 18:56:43 UTC (rev 7284)
@@ -1,16 +1,24 @@
-tumbler (0.1.26-1) UNRELEASED; urgency=low
+tumbler (0.1.27-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  [ Yves-Alexis Perez ]
+  * New upstream release (0.1.26).
   * debian/control:
     - update gstreamer build-dep to libgstreamer1.0-dev and
       libgstreamer-plugins-base1.0-dev.
-    - add build-dep on xdt-autogen and dependencies.
-  * debian/patches:
-    - 0001-Fix-build-when-using-Wl-z-defs added, link against libgsttags and
-      libm.
-  * debian/rules:
-    - run xdt-autogen before configure.
 
+  [ Lionel Le Folgoc ]
+  * New upstream release (0.1.27):
+    - reenable all plugins since there's now a priority mechanism to choose
+      the preferred ones.
+  * debian/rules: drop --disable-ffmpeg-thumbnailer from configure.
+  * debian/control:
+    - readd libffmpegthumbnailer-dev to b-deps to build the ffmpeg thumbnailer
+      plugin.
+    - add libcurl4-gnutls-dev to b-deps to build the cover thumbnailer plugin.
+  * debian/tumbler-plugins-extra.install: ship the new plugins.
+  * debian/tumbler-common.install: ship the new rc file.
+  * debian/libtumbler-1-0.symbols: updated for the new symbols.
+
  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 10 Dec 2012 23:20:27 +0100
 
 tumbler (0.1.25-1) unstable; urgency=low

Modified: desktop/trunk/tumbler/debian/control
===================================================================
--- desktop/trunk/tumbler/debian/control	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/control	2013-01-12 18:56:43 UTC (rev 7284)
@@ -6,9 +6,9 @@
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 9), intltool (>= 0.31), pkg-config,
  libglib2.0-dev, libgtk2.0-dev, libdbus-glib-1-dev, libpoppler-glib-dev,
- libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, 
- libjpeg-dev, libgsf-1-dev, libopenrawgnome-dev, dpkg-dev (>= 1.16.1),
- xfce4-dev-tools, libtool, gtk-doc-tools, intltool
+ libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libjpeg-dev,
+ libgsf-1-dev, libopenrawgnome-dev, libffmpegthumbnailer-dev,
+ libcurl4-gnutls-dev, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/tumbler

Modified: desktop/trunk/tumbler/debian/libtumbler-1-0.symbols
===================================================================
--- desktop/trunk/tumbler/debian/libtumbler-1-0.symbols	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/libtumbler-1-0.symbols	2013-01-12 18:56:43 UTC (rev 7284)
@@ -59,10 +59,14 @@
  tumbler_thumbnailer_array_free at Base 0.1.0
  tumbler_thumbnailer_create at Base 0.1.0
  tumbler_thumbnailer_get_hash_keys at Base 0.1.0
+ tumbler_thumbnailer_get_max_file_size at Base 0.1.27
  tumbler_thumbnailer_get_mime_types at Base 0.1.0
+ tumbler_thumbnailer_get_priority at Base 0.1.27
  tumbler_thumbnailer_get_type at Base 0.1.0
  tumbler_thumbnailer_get_uri_schemes at Base 0.1.0
  tumbler_thumbnailer_provider_get_thumbnailers at Base 0.1.0
  tumbler_thumbnailer_provider_get_type at Base 0.1.0
  tumbler_thumbnailer_supports_hash_key at Base 0.1.0
+ tumbler_thumbnailer_supports_location at Base 0.1.27
+ tumbler_util_get_settings at Base 0.1.27
  tumbler_util_get_supported_uri_schemes at Base 0.1.0

Deleted: desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch
===================================================================
--- desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/patches/0001-Fix-build-when-using-Wl-z-defs.patch	2013-01-12 18:56:43 UTC (rev 7284)
@@ -1,62 +0,0 @@
-From 0a4f4e0b69599d6eb51f96d17141a8c0331b6943 Mon Sep 17 00:00:00 2001
-From: Yves-Alexis Perez <corsac at debian.org>
-Date: Tue, 11 Dec 2012 21:37:00 +0100
-Subject: [PATCH] Fix build when using -Wl,-z,defs
-
-GStreamer thumbnailers should be linked against libmath and
-libgsttags.
-
-Do the first directly from Makefile.am, and implement the second in the
-AC macros for GSTREAMER support.
-
-Signed-off-by: Yves-Alexis Perez <corsac at debian.org>
----
- acinclude.m4                        |    7 +++++--
- plugins/gst-thumbnailer/Makefile.am |    5 ++++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index e84b8c3..4105e37 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -157,8 +157,11 @@ if test x"$ac_tumbler_gstreamer_thumbnailer" = x"yes"; then
-   dnl Check for gdk-pixbuf
-   PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14],
-   [
--    dnl Check for libgstreamerthumbnailer
--    PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [], [ac_tumbler_gstreamer_thumbnailer=no])
-+    dnl Check for libgstreamer
-+    PKG_CHECK_MODULES([GSTREAMER], [gstreamer-1.0], [
-+      dnl Check for libgstreamertag
-+      PKG_CHECK_MODULES([GSTREAMER_TAG], [gstreamer-tag-1.0], [], [ac_tumbler_gstreamer_thumbnailer=no])
-+    ], [ac_tumbler_gstreamer_thumbnailer=no])
-   ], [ac_tumbler_gstreamer_thumbnailer=no])
- fi
- 
-diff --git a/plugins/gst-thumbnailer/Makefile.am b/plugins/gst-thumbnailer/Makefile.am
-index 87c33c3..5a0cda3 100644
---- a/plugins/gst-thumbnailer/Makefile.am
-+++ b/plugins/gst-thumbnailer/Makefile.am
-@@ -39,6 +39,7 @@ tumbler_gst_thumbnailer_la_CFLAGS =					\
- 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
- 	$(GDK_PIXBUF_CFLAGS)						\
- 	$(GSTREAMER_CFLAGS)						\
-+	$(GSTREAMER_TAG_CFLAGS)						\
- 	$(GIO_CFLAGS)							\
- 	$(GLIB_CFLAGS)							\
- 	$(PLATFORM_CFLAGS)						\
-@@ -54,8 +55,10 @@ tumbler_gst_thumbnailer_la_LIBADD =					\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GSTREAMER_LIBS)						\
-+	$(GSTREAMER_TAG_LIBS)						\
- 	$(GIO_LIBS)							\
--	$(GLIB_LIBS)
-+	$(GLIB_LIBS)							\
-+	-lm
- 
- tumbler_gst_thumbnailer_la_DEPENDENCIES =				\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
--- 
-1.7.10.4
-

Deleted: desktop/trunk/tumbler/debian/patches/series
===================================================================
--- desktop/trunk/tumbler/debian/patches/series	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/patches/series	2013-01-12 18:56:43 UTC (rev 7284)
@@ -1 +0,0 @@
-0001-Fix-build-when-using-Wl-z-defs.patch

Modified: desktop/trunk/tumbler/debian/rules
===================================================================
--- desktop/trunk/tumbler/debian/rules	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/rules	2013-01-12 18:56:43 UTC (rev 7284)
@@ -14,8 +14,3 @@
 
 %:
 	dh $@ --parallel
-
-override_dh_auto_configure:
-	mkdir -p m4
-	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure -- --disable-ffmpeg-thumbnailer

Modified: desktop/trunk/tumbler/debian/tumbler-common.install
===================================================================
--- desktop/trunk/tumbler/debian/tumbler-common.install	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/tumbler-common.install	2013-01-12 18:56:43 UTC (rev 7284)
@@ -1,2 +1,3 @@
+etc/
 usr/share/locale/
 usr/share/gtk-doc/

Modified: desktop/trunk/tumbler/debian/tumbler-plugins-extra.install
===================================================================
--- desktop/trunk/tumbler/debian/tumbler-plugins-extra.install	2013-01-10 22:16:54 UTC (rev 7283)
+++ desktop/trunk/tumbler/debian/tumbler-plugins-extra.install	2013-01-12 18:56:43 UTC (rev 7284)
@@ -1,2 +1,4 @@
+usr/lib/*/tumbler-1/plugins/tumbler-cover-thumbnailer.so
+usr/lib/*/tumbler-1/plugins/tumbler-ffmpeg-thumbnailer.so
 usr/lib/*/tumbler-1/plugins/tumbler-odf-thumbnailer.so
 usr/lib/*/tumbler-1/plugins/tumbler-raw-thumbnailer.so

More information about the Pkg-xfce-commits mailing list