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

Thu Mar 29 09:06:14 UTC 2012

Author: corsac
Date: 2012-03-29 09:06:13 +0000 (Thu, 29 Mar 2012)
New Revision: 6513

Removed:
   desktop/trunk/tumbler/debian/patches/01_fix-link-lm.patch
   desktop/trunk/tumbler/debian/patches/02_fix-link-gmodule.patch
   desktop/trunk/tumbler/debian/patches/series
Modified:
   desktop/trunk/tumbler/debian/changelog
Log:
* New upstream release.
* debian/patches:
  - 01_fix-link-lm and 02_fix-link-gmodule removed, included upstream.

Modified: desktop/trunk/tumbler/debian/changelog
===================================================================

--- desktop/trunk/tumbler/debian/changelog	2012-03-29 08:52:45 UTC (rev 6512)
+++ desktop/trunk/tumbler/debian/changelog	2012-03-29 09:06:13 UTC (rev 6513)
@@ -1,3 +1,11 @@
+tumbler (0.1.24-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 01_fix-link-lm and 02_fix-link-gmodule removed, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Mar 2012 11:05:08 +0200
+
 tumbler (0.1.23-2) unstable; urgency=low
 
   * debian/patches:

Deleted: desktop/trunk/tumbler/debian/patches/01_fix-link-lm.patch
===================================================================
--- desktop/trunk/tumbler/debian/patches/01_fix-link-lm.patch	2012-03-29 08:52:45 UTC (rev 6512)
+++ desktop/trunk/tumbler/debian/patches/01_fix-link-lm.patch	2012-03-29 09:06:13 UTC (rev 6513)
@@ -1,84 +0,0 @@
-Description: link with -lm
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8236
-Author: Yves-Alexis Perez <corsac at debian.org>
-Author: Lionel Le Folgoc <mrpouit at gmail.com>
-Index: tumbler-0.1.21/plugins/font-thumbnailer/Makefile.am
-===================================================================
---- tumbler-0.1.21.orig/plugins/font-thumbnailer/Makefile.am	2011-02-12 20:46:10.000000000 +0100
-+++ tumbler-0.1.21/plugins/font-thumbnailer/Makefile.am	2011-09-05 21:30:57.016017667 +0200
-@@ -54,7 +54,8 @@
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GIO_LIBS)							\
- 	$(GLIB_LIBS)							\
--	$(FREETYPE_LIBS)
-+	$(FREETYPE_LIBS)						\
-+	-lm
- 
- tumbler_font_thumbnailer_la_DEPENDENCIES =				\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
-Index: tumbler-0.1.21/plugins/pixbuf-thumbnailer/Makefile.am
-===================================================================
---- tumbler-0.1.21.orig/plugins/pixbuf-thumbnailer/Makefile.am	2011-02-12 20:46:10.000000000 +0100
-+++ tumbler-0.1.21/plugins/pixbuf-thumbnailer/Makefile.am	2011-09-05 21:30:57.016017667 +0200
-@@ -52,7 +52,8 @@
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la	\
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GIO_LIBS)							\
--	$(GLIB_LIBS)
-+	$(GLIB_LIBS)							\
-+	-lm
- 
- tumbler_pixbuf_thumbnailer_la_DEPENDENCIES =				\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
-Index: tumbler-0.1.21/plugins/ffmpeg-thumbnailer/Makefile.am
-===================================================================
---- tumbler-0.1.21.orig/plugins/ffmpeg-thumbnailer/Makefile.am	2011-02-12 20:46:10.000000000 +0100
-+++ tumbler-0.1.21/plugins/ffmpeg-thumbnailer/Makefile.am	2011-09-05 21:30:57.016017667 +0200
-@@ -54,7 +54,8 @@
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GIO_LIBS)							\
- 	$(GLIB_LIBS)							\
--	$(FFMPEGTHUMBNAILER_LIBS)
-+	$(FFMPEGTHUMBNAILER_LIBS)					\
-+	-lm
- 
- tumbler_ffmpeg_thumbnailer_la_DEPENDENCIES =				\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
-Index: tumbler-0.1.21/plugins/poppler-thumbnailer/Makefile.am
-===================================================================
---- tumbler-0.1.21.orig/plugins/poppler-thumbnailer/Makefile.am	2011-09-05 21:31:05.528070185 +0200
-+++ tumbler-0.1.21/plugins/poppler-thumbnailer/Makefile.am	2011-09-05 21:31:16.300136780 +0200
-@@ -54,7 +54,8 @@
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GIO_LIBS)							\
- 	$(GLIB_LIBS)							\
--	$(POPPLER_GLIB_LIBS)
-+	$(POPPLER_GLIB_LIBS)						\
-+	-lm
- 
- tumbler_poppler_thumbnailer_la_DEPENDENCIES =				\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
---- tumbler-0.1.23.orig/plugins/odf-thumbnailer/Makefile.am
-+++ tumbler-0.1.23/plugins/odf-thumbnailer/Makefile.am
-@@ -54,7 +54,8 @@ tumbler_odf_thumbnailer_la_LIBADD =
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GIO_LIBS)							\
- 	$(GLIB_LIBS)							\
--	$(GSF_LIBS)
-+	$(GSF_LIBS)							\
-+	-lm
- 
- tumbler_odf_thumbnailer_la_DEPENDENCIES =				\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la
---- tumbler-0.1.23.orig/plugins/raw-thumbnailer/Makefile.am
-+++ tumbler-0.1.23/plugins/raw-thumbnailer/Makefile.am
-@@ -54,7 +54,8 @@ tumbler_raw_thumbnailer_la_LIBADD =
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GIO_LIBS)							\
- 	$(GLIB_LIBS)							\
--	$(LIBOPENRAW_GNOME_LIBS)
-+	$(LIBOPENRAW_GNOME_LIBS)					\
-+	-lm
- 
- tumbler_raw_thumbnailer_la_DEPENDENCIES =				\
- 	$(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la

Deleted: desktop/trunk/tumbler/debian/patches/02_fix-link-gmodule.patch
===================================================================
--- desktop/trunk/tumbler/debian/patches/02_fix-link-gmodule.patch	2012-03-29 08:52:45 UTC (rev 6512)
+++ desktop/trunk/tumbler/debian/patches/02_fix-link-gmodule.patch	2012-03-29 09:06:13 UTC (rev 6513)
@@ -1,38 +0,0 @@
-commit 52802adb3361e9d3202d4a921b8b440660878ee1
-Author: Lionel Le Folgoc <lionel at lefolgoc.net>
-Date:   Fri Feb 24 17:17:00 2012 +0000
-
-    Explicitly link against gmodule (bug #8466).
-
-Index: tumbler-0.1.23/configure.ac
-===================================================================
---- tumbler-0.1.23.orig/configure.ac	2011-12-04 13:21:44.000000000 +0100
-+++ tumbler-0.1.23/configure.ac	2012-03-28 11:02:52.088626087 +0200
-@@ -148,6 +148,7 @@
- dnl ***********************************
- PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.0])
- PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.16.0])
-+PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= 2.10.0])
- PKG_CHECK_MODULES([GTHREAD], [gthread-2.0 >= 2.16.0])
- PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.0.0])
- PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1 >= 0.72])
-Index: tumbler-0.1.23/tumbler/Makefile.am
-===================================================================
---- tumbler-0.1.23.orig/tumbler/Makefile.am	2011-12-04 13:21:45.000000000 +0100
-+++ tumbler-0.1.23/tumbler/Makefile.am	2012-03-28 11:02:52.088626087 +0200
-@@ -82,6 +82,7 @@
- 	$(GDK_PIXBUF_CFLAGS)						\
- 	$(GIO_CFLAGS)							\
- 	$(GLIB_CFLAGS)							\
-+	$(GMODULE_CFLAGS)						\
- 	$(GTHREAD_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
- 
-@@ -95,6 +96,7 @@
- 	$(GDK_PIXBUF_LIBS)						\
- 	$(GIO_LIBS)							\
- 	$(GLIB_LIBS)							\
-+	$(GMODULE_LIBS)							\
- 	$(GTHREAD_LIBS)
- 
- EXTRA_DIST =								\

Deleted: desktop/trunk/tumbler/debian/patches/series
===================================================================
--- desktop/trunk/tumbler/debian/patches/series	2012-03-29 08:52:45 UTC (rev 6512)
+++ desktop/trunk/tumbler/debian/patches/series	2012-03-29 09:06:13 UTC (rev 6513)
@@ -1,2 +0,0 @@
-01_fix-link-lm.patch
-02_fix-link-gmodule.patch


