[Pkg-xfce-commits] r6246 - in goodies/tags/thunar-media-tags-plugin: . 0.2.0-1 0.2.0-1/debian 0.2.0-1/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Thu Dec 1 06:21:21 UTC 2011
Author: corsac
Date: 2011-12-01 06:21:20 +0000 (Thu, 01 Dec 2011)
New Revision: 6246
Added:
goodies/tags/thunar-media-tags-plugin/0.2.0-1/
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/changelog
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/compat
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/control
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/rules
Removed:
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/changelog
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/compat
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/control
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/01_port-to-thunarx-2.patch
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/02_port-to-exo-1.patch
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/03_fix-crash-with-ogg-video-files.patch
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/04_fix-implicit-dso-linking.patch
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/series
goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/rules
Log:
[svn-buildpackage] Tagging thunar-media-tags-plugin 0.2.0-1
Property changes on: goodies/tags/thunar-media-tags-plugin/0.2.0-1
___________________________________________________________________
Added: mergeWithUpstream
+ +1
Added: svn:mergeinfo
+ /goodies/branches/experimental/thunar-media-tags-plugin:4730-5243
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/changelog
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/changelog 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/changelog 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,84 +0,0 @@
-thunar-media-tags-plugin (0.1.2-3) unstable; urgency=low
-
- [ Lionel Le Folgoc ]
- * debian/control:
- - add myself to Uploaders.
- - refresh b-deps for Xfce 4.8: replace libexo-0.3-dev with libexo-1-dev,
- and libthunar-vfs-1-dev with libthunarx-2-dev; drop cdbs and
- autotools-dev; add intltool, hardening-includes, xfce4-dev-tools,
- automake, autoconf and libtool (needed for xdt-autogen).
- - bump thunar dep to a realistic version >= 1.1.0.
- * debian/patches:
- - 01_port-to-thunarx-2.patch, 02_port-to-exo-1.patch: added, port to
- Xfce 4.8.
- - 03_fix-crash-with-ogg-video-files.patch: added, prevents a crash with
- weird ogg video files considered as audio ones.
- - 04_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
- - series: added.
- * Switch to 3.0 (quilt).
- * debian/rules:
- - switch to dh.
- - call dpkg-buildflags, and include hardening flags.
- - run xdt-autogen to refresh autotools' files, and remove changed ones
- after the build.
- - add .pc files to POTFILES.skip.
-
- [ Yves-Alexis Perez ]
- * debian/control:
- - remove Emanuele, Simon, Rudy and Martin from uploaders.
- - bump debhelper build-dep for overrides.
- - update standards version to 3.9.2.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com> Wed, 20 Apr 2011 13:16:18 +0200
-
-thunar-media-tags-plugin (0.1.2-2) unstable; urgency=low
-
- [ Simon Huggins ]
- * Add Vcs-* headers to debian/control
-
- [ Evgeni Golov ]
- * Fix Vcs-* fields, they were missing 'trunk' in the path.
-
- [ Yves-Alexis Perez ]
- * debian/watch edited to track Xfce archive reorganisation
- * debian/control:
- - add myself to Uploaders.
- - update standards version to 3.8.3.
- - update debhelper build-dep to 7.
- - switch to xfce section.
- * debian/compat bumped to 7.
- * debian/copyright adjusted.
- * debian/rules:
- - ignore plugin in dh_makeshlibs.
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 11 Nov 2009 15:45:38 +0100
-
-thunar-media-tags-plugin (0.1.2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Fri, 25 May 2007 10:51:22 +0100
-
-thunar-media-tags-plugin (0.1.1-2) unstable; urgency=low
-
- * debian/rules: remove correctly .la file.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Thu, 16 Nov 2006 18:16:32 +0100
-
-thunar-media-tags-plugin (0.1.1-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Sep 2006 15:37:52 +0100
-
-thunar-media-tags-plugin (0.1.0-2) unstable; urgency=low
-
- * Incremented build-deps to match Xfce 4.4 Beta 2
-
- -- Yves-Alexis Perez <corsac at corsac.net> Wed, 12 Jul 2006 13:21:22 +0200
-
-thunar-media-tags-plugin (0.1.0-1) unstable; urgency=low
-
- * Initial release Closes: #367631
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sat, 17 Jun 2006 14:14:02 +0100
Copied: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/changelog (from rev 6245, goodies/trunk/thunar-media-tags-plugin/debian/changelog)
===================================================================
--- goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/changelog (rev 0)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/changelog 2011-12-01 06:21:20 UTC (rev 6246)
@@ -0,0 +1,103 @@
+thunar-media-tags-plugin (0.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ - 01_port-to-thunarx-2 and 02_port-to-exo-1,
+ 03_fix-crash-with-ogg-video-files and 04_fix-implicit-dso-linkin
+ dropped, included upstream.
+ * debian/rules:
+ - drop xdt-autogen rules, not needed anymore.
+ - use dh9 and dpkg-dev 1.16.1 hardening rules.
+ - switch to multiarch paths.
+ * debian/compat bumped to 9 for hardening support.
+ * debian/control:
+ - update debhelper build-dep for hardening support
+ - add dpkg-dev build-dep for hardening support
+ - drop build-deps for autoreconf.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 30 Nov 2011 22:20:30 +0100
+
+thunar-media-tags-plugin (0.1.2-3) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/control:
+ - add myself to Uploaders.
+ - refresh b-deps for Xfce 4.8: replace libexo-0.3-dev with libexo-1-dev,
+ and libthunar-vfs-1-dev with libthunarx-2-dev; drop cdbs and
+ autotools-dev; add intltool, hardening-includes, xfce4-dev-tools,
+ automake, autoconf and libtool (needed for xdt-autogen).
+ - bump thunar dep to a realistic version >= 1.1.0.
+ * debian/patches:
+ - 01_port-to-thunarx-2.patch, 02_port-to-exo-1.patch: added, port to
+ Xfce 4.8.
+ - 03_fix-crash-with-ogg-video-files.patch: added, prevents a crash with
+ weird ogg video files considered as audio ones.
+ - 04_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
+ - series: added.
+ * Switch to 3.0 (quilt).
+ * debian/rules:
+ - switch to dh.
+ - call dpkg-buildflags, and include hardening flags.
+ - run xdt-autogen to refresh autotools' files, and remove changed ones
+ after the build.
+ - add .pc files to POTFILES.skip.
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - remove Emanuele, Simon, Rudy and Martin from uploaders.
+ - bump debhelper build-dep for overrides.
+ - update standards version to 3.9.2.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Wed, 20 Apr 2011 13:16:18 +0200
+
+thunar-media-tags-plugin (0.1.2-2) unstable; urgency=low
+
+ [ Simon Huggins ]
+ * Add Vcs-* headers to debian/control
+
+ [ Evgeni Golov ]
+ * Fix Vcs-* fields, they were missing 'trunk' in the path.
+
+ [ Yves-Alexis Perez ]
+ * debian/watch edited to track Xfce archive reorganisation
+ * debian/control:
+ - add myself to Uploaders.
+ - update standards version to 3.8.3.
+ - update debhelper build-dep to 7.
+ - switch to xfce section.
+ * debian/compat bumped to 7.
+ * debian/copyright adjusted.
+ * debian/rules:
+ - ignore plugin in dh_makeshlibs.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 11 Nov 2009 15:45:38 +0100
+
+thunar-media-tags-plugin (0.1.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Fri, 25 May 2007 10:51:22 +0100
+
+thunar-media-tags-plugin (0.1.1-2) unstable; urgency=low
+
+ * debian/rules: remove correctly .la file.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Thu, 16 Nov 2006 18:16:32 +0100
+
+thunar-media-tags-plugin (0.1.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sat, 23 Sep 2006 15:37:52 +0100
+
+thunar-media-tags-plugin (0.1.0-2) unstable; urgency=low
+
+ * Incremented build-deps to match Xfce 4.4 Beta 2
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Wed, 12 Jul 2006 13:21:22 +0200
+
+thunar-media-tags-plugin (0.1.0-1) unstable; urgency=low
+
+ * Initial release Closes: #367631
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sat, 17 Jun 2006 14:14:02 +0100
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/compat
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/compat 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/compat 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1 +0,0 @@
-7
Copied: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/compat (from rev 6243, goodies/trunk/thunar-media-tags-plugin/debian/compat)
===================================================================
--- goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/compat (rev 0)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/compat 2011-12-01 06:21:20 UTC (rev 6246)
@@ -0,0 +1 @@
+9
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/control
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/control 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/control 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,19 +0,0 @@
-Source: thunar-media-tags-plugin
-Section: xfce
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>,
- Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), pkg-config, libthunarx-2-dev (>= 1.0.1),
- libexo-1-dev (>= 0.5.0), libtagc0-dev, libxml-parser-perl, intltool,
- hardening-includes, xfce4-dev-tools, automake, autoconf, libtool
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-media-tags-plugin/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-media-tags-plugin/
-
-Package: thunar-media-tags-plugin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, thunar (>= 1.1.0)
-Description: Media tags plugin for Thunar file manager
- This plugin allows tags editing from Thunar file manager and tags-based file
- renaming from inside Thunar Bulk Renamer
Copied: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/control (from rev 6243, goodies/trunk/thunar-media-tags-plugin/debian/control)
===================================================================
--- goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/control (rev 0)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/control 2011-12-01 06:21:20 UTC (rev 6246)
@@ -0,0 +1,19 @@
+Source: thunar-media-tags-plugin
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 8.9.4), pkg-config, libthunarx-2-dev (>= 1.0.1),
+ libexo-1-dev (>= 0.5.0), libtagc0-dev, libxml-parser-perl, intltool,
+ dpkg-dev (>= 1.16.1)
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-media-tags-plugin/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-media-tags-plugin/
+
+Package: thunar-media-tags-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, thunar (>= 1.1.0)
+Description: Media tags plugin for Thunar file manager
+ This plugin allows tags editing from Thunar file manager and tags-based file
+ renaming from inside Thunar Bulk Renamer
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/01_port-to-thunarx-2.patch
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/patches/01_port-to-thunarx-2.patch 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/01_port-to-thunarx-2.patch 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,99 +0,0 @@
-Description: Port to thunarx-2
- Upstream patch for commit 'b805797f9bed98229f036e56c98ec16f40b539aa'
- slightly updated to include '270924abcab81275dede68d882936c14b238b3ec'
- (more realistic thunar version, 1.0.1 instead of 0.2.3svn-r20526).
- .
- Also slightly updated to patch configure.in instead of configure.in.in
- (not available in released tarballs).
-Origin: backport, http://git.xfce.org/thunar-plugins/thunar-media-tags-plugin/commit/?h=thunarx-2&id=b805797f9bed98229f036e56c98ec16f40b539aa
----
-diff --git a/configure.in b/configure.in
-index 0ea7f85..8764561 100644
---- a/configure.in
-+++ b/configure.in
-@@ -65,8 +65,7 @@ dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
- XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
--XDT_CHECK_PACKAGE([THUNARX], [thunarx-1], [0.2.3svn-r20526])
--XDT_CHECK_PACKAGE([THUNARVFS], [thunar-vfs-1], [0.2.3svn-r20526])
-+XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
- XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
-
- dnl ***********************************
-diff --git a/thunar-plugin/Makefile.am b/thunar-plugin/Makefile.am
-index a3c2c25..a7bdb58 100644
---- a/thunar-plugin/Makefile.am
-+++ b/thunar-plugin/Makefile.am
-@@ -8,7 +8,7 @@ INCLUDES = \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- $(PLATFORM_CPPFLAGS)
-
--extensionsdir = $(libdir)/thunarx-1
-+extensionsdir = $(libdir)/thunarx-2
- extensions_LTLIBRARIES = \
- thunar-media-tags-plugin.la
-
-@@ -25,7 +25,6 @@ thunar_media_tags_plugin_la_CFLAGS = \
- $(EXO_CFLAGS) \
- $(PLATFORM_CFLAGS) \
- $(THUNARX_CFLAGS) \
-- $(THUNARVFS_CFLAGS) \
- $(TAGLIB_CFLAGS) \
- $(TAGLIBC_CFLAGS)
-
-@@ -34,7 +33,6 @@ thunar_media_tags_plugin_la_LDFLAGS = \
- -export-dynamic \
- -module \
- $(THUNARX_LIBS) \
-- $(THUNARVFS_LIBS) \
- $(TAGLIB_LIBS) \
- $(TAGLIBC_LIBS) \
- $(PLATFORM_LDFLAGS)
-diff --git a/thunar-plugin/audio-tags-page.c b/thunar-plugin/audio-tags-page.c
-index 099d7ad..7e5dab5 100644
---- a/thunar-plugin/audio-tags-page.c
-+++ b/thunar-plugin/audio-tags-page.c
-@@ -32,7 +32,6 @@
- #include <taglib/tag_c.h>
-
- #include <exo/exo.h>
--#include <thunar-vfs/thunar-vfs.h>
-
- #include <audio-tags-page.h>
-
-@@ -977,8 +976,8 @@ audio_tags_page_info_activate (GtkAction *action,
-
- gchar *mimetype;
-
-- ThunarVfsInfo *vfs_info;
-- gchar *filename;
-+ GFileInfo *fileinfo;
-+ const char *filename;
- gchar *filesize;
-
- g_return_val_if_fail (page != NULL || IS_AUDIO_TAGS_PAGE (page), FALSE);
-@@ -1007,9 +1006,9 @@ audio_tags_page_info_activate (GtkAction *action,
-
- /* Additional information */
- mimetype = thunarx_file_info_get_mime_type (page->file);
-- vfs_info = thunarx_file_info_get_vfs_info (page->file);
-- filename = vfs_info->display_name;
-- filesize = thunar_vfs_humanize_size (vfs_info->size, NULL, 0);
-+ fileinfo = thunarx_file_info_get_file_info (page->file);
-+ filename = g_file_info_get_display_name (fileinfo);
-+ filesize = g_format_size_for_display (g_file_info_get_size (fileinfo));
-
- /* Create layout table */
- table = gtk_table_new (7, 2, FALSE);
-@@ -1121,7 +1120,7 @@ audio_tags_page_info_activate (GtkAction *action,
- g_free (filesize);
- g_free (mimetype);
-
-- thunar_vfs_info_unref (vfs_info);
-+ g_object_unref (fileinfo);
-
- return TRUE;
- }
---
-cgit v0.8.3.4
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/02_port-to-exo-1.patch
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/patches/02_port-to-exo-1.patch 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/02_port-to-exo-1.patch 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,177 +0,0 @@
-Description: Port to exo-1
- Patch slightly updated to patch configure.in instead of configure.in.in
- (not available in released tarballs), and to apply cleanly against 0.1.2.
-Origin: backport, http://bugzilla.xfce.org/attachment.cgi?id=2882
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6295
----
- configure.in | 3 ++-
- thunar-plugin/audio-tags-page.c | 22 +++++++---------------
- thunar-plugin/tag-renamer.c | 16 +++-------------
- 3 files changed, 12 insertions(+), 29 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index ed3099b..c345c5c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -64,7 +64,8 @@ XDT_I18N([@LINGUAS@])
- dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
--XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
-+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
-+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
- XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
- XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
-
-diff --git a/thunar-plugin/audio-tags-page.c b/thunar-plugin/audio-tags-page.c
-index 7e5dab5..40b226f 100644
---- a/thunar-plugin/audio-tags-page.c
-+++ b/thunar-plugin/audio-tags-page.c
-@@ -89,7 +89,6 @@ struct _AudioTagsPage
- ThunarxPropertyPage __parent__;
-
- /* Widgets */
-- GtkTooltips *tooltips;
- GtkWidget *table;
- GtkWidget *save_button;
- GtkWidget *info_button;
-@@ -281,10 +280,6 @@ audio_tags_page_init (AudioTagsPage *page)
-
- gtk_container_set_border_width (GTK_CONTAINER (page), 8);
-
-- /* Allocate the shared tooltips */
-- page->tooltips = gtk_tooltips_new ();
-- exo_gtk_object_ref_sink (GTK_OBJECT (page->tooltips));
--
- /* Main container */
- vbox = gtk_vbox_new (FALSE, 8);
- gtk_container_add (GTK_CONTAINER (page), vbox);
-@@ -316,7 +311,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Track spin button */
- spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
- exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "track");
-- gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the track number here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the track number here."));
- gtk_container_add (GTK_CONTAINER (alignment), spin);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
- gtk_widget_show (spin);
-@@ -339,7 +334,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Year spin button */
- spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
- exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "year");
-- gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the release year here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the release year here."));
- gtk_container_add (GTK_CONTAINER (alignment), spin);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
- gtk_widget_show (spin);
-@@ -354,7 +349,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Artist entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "artist");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the name of the artist or author of this file here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the name of the artist or author of this file here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
- gtk_widget_show (entry);
-@@ -369,7 +364,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Title entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "title");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the song title here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the song title here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_widget_show (entry);
-
-@@ -383,7 +378,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Album entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "album");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the album/record title here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the album/record title here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_widget_show (entry);
-
-@@ -397,7 +392,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Comment entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "comment");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter your comments here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter your comments here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 4, 5, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_widget_show (entry);
-
-@@ -411,7 +406,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Genre combo box */
- combo = gtk_combo_box_entry_new_text ();
- exo_mutual_binding_new (G_OBJECT (GTK_BIN (combo)->child), "text", G_OBJECT (page), "genre");
-- gtk_tooltips_set_tip (page->tooltips, combo, _("Select or enter the genre of this song here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (combo), _("Select or enter the genre of this song here."));
- gtk_table_attach (GTK_TABLE (page->table), combo, 1, 4, 5, 6, GTK_FILL, 0, 0, 0);
- gtk_widget_show (combo);
-
-@@ -511,9 +506,6 @@ audio_tags_page_finalize (GObject *object)
- if (G_LIKELY (page->genre != NULL))
- g_free (page->genre);
-
-- /* Release the tooltips */
-- g_object_unref (G_OBJECT (page->tooltips));
--
- (*G_OBJECT_CLASS (audio_tags_page_parent_class)->finalize) (object);
- }
-
-diff --git a/thunar-plugin/tag-renamer.c b/thunar-plugin/tag-renamer.c
-index acb694e..bdbb17c 100644
---- a/thunar-plugin/tag-renamer.c
-+++ b/thunar-plugin/tag-renamer.c
-@@ -116,9 +116,6 @@ struct _TagRenamer
- {
- ThunarxRenamer __parent__;
-
-- /* Widgets */
-- GtkTooltips *tooltips;
--
- /* Properties */
- TagRenamerFormat format;
- gboolean replace_spaces;
-@@ -209,10 +206,6 @@ tag_renamer_init (TagRenamer *tag_renamer)
- GEnumClass *klass;
- gint n;
-
-- /* Allocate shared tooltips */
-- tag_renamer->tooltips = gtk_tooltips_new ();
-- exo_gtk_object_ref_sink (GTK_OBJECT (tag_renamer->tooltips));
--
- table = gtk_table_new (2, 3, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-@@ -245,14 +238,14 @@ tag_renamer_init (TagRenamer *tag_renamer)
-
- button = gtk_check_button_new_with_mnemonic (_("_Underscores"));
- exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "replace-spaces");
-- gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("Activating this option will replace all spaces in the target filename "
-- "with underscores."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Activating this option will replace all spaces in the target filename "
-+ "with underscores."));
- gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
- gtk_widget_show (button);
-
- button = gtk_check_button_new_with_mnemonic (_("_Lowercase"));
- exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "lowercase");
-- gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("If you activate this, the resulting filename will only contain lowercase letters."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("If you activate this, the resulting filename will only contain lowercase letters."));
- gtk_table_attach (GTK_TABLE (table), button, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
- gtk_widget_show (button);
-
-@@ -272,9 +265,6 @@ tag_renamer_finalize (GObject *object)
- {
- TagRenamer *tag_renamer = TAG_RENAMER (object);
-
-- /* release the tooltips */
-- g_object_unref (G_OBJECT (tag_renamer->tooltips));
--
- /* Free strings */
- g_free (tag_renamer->artist);
- g_free (tag_renamer->title);
---
-1.6.3.3
-
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/03_fix-crash-with-ogg-video-files.patch
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/patches/03_fix-crash-with-ogg-video-files.patch 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/03_fix-crash-with-ogg-video-files.patch 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,30 +0,0 @@
-Description: Call taglib_file_is_valid() for input audio files
- Check that the file contains valid audio information to determine whether
- the plugin should act on it or not.
-Origin: other, http://bugzilla.xfce.org/attachment.cgi?id=2879
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6297
----
- thunar-plugin/media-tags-provider.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/thunar-plugin/media-tags-provider.c b/thunar-plugin/media-tags-provider.c
-index a7604ea..2c31a98 100644
---- a/thunar-plugin/media-tags-provider.c
-+++ b/thunar-plugin/media-tags-provider.c
-@@ -163,10 +163,11 @@ media_tags_get_audio_file_supported (ThunarxFileInfo *info)
-
- if (G_LIKELY (taglib_file != NULL))
- {
-+ /* Check that the file contains valid audio info */
-+ supported = taglib_file_is_valid (taglib_file);
-+
- /* Free the taglib file */
- taglib_file_free (taglib_file);
--
-- supported = TRUE;
- }
-
- g_free (filename);
---
-1.6.3.3
-
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/04_fix-implicit-dso-linking.patch
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/patches/04_fix-implicit-dso-linking.patch 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/04_fix-implicit-dso-linking.patch 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,13 +0,0 @@
-Description: add missing libs
-Origin: other, http://bugzilla.xfce.org/attachment.cgi?id=3284
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6295
---- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/Makefile.am
-+++ thunar-media-tags-plugin-0.1.2/thunar-plugin/Makefile.am
-@@ -32,6 +32,7 @@ thunar_media_tags_plugin_la_LDFLAGS =
- -avoid-version \
- -export-dynamic \
- -module \
-+ $(EXO_LIBS) \
- $(THUNARX_LIBS) \
- $(TAGLIB_LIBS) \
- $(TAGLIBC_LIBS) \
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/series
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/patches/series 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/patches/series 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,4 +0,0 @@
-01_port-to-thunarx-2.patch
-02_port-to-exo-1.patch
-03_fix-crash-with-ogg-video-files.patch
-04_fix-implicit-dso-linking.patch
Deleted: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/rules
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/rules 2011-11-28 15:13:09 UTC (rev 6239)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/rules 2011-12-01 06:21:20 UTC (rev 6246)
@@ -1,34 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/hardening-includes/hardening.make
-
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
-
-%:
- dh $@
-
-override_dh_auto_configure:
- NOCONFIGURE=1 xdt-autogen
- find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
- dh_auto_configure -- --enable-final
-
-override_dh_auto_clean:
- rm -f $$(find -name 'Makefile.in*')
- rm -f INSTALL aclocal.m4 config.guess config.h.in config.sub configure
- rm -f depcomp install-sh intltool-extract.in intltool-merge.in
- rm -f intltool-update.in ltmain.sh missing mkinstalldirs
- rm -f po/POTFILES.skip
- dh_auto_clean
-
-override_dh_install:
- rm -f $(CURDIR)/debian/thunar-media-tags-plugin/usr/lib/thunarx-2/*.la
- dh_install --fail-missing
-
-override_dh_makeshlibs:
- dh_makeshlibs -n -X /usr/lib/thunarx-2
Copied: goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/rules (from rev 6244, goodies/trunk/thunar-media-tags-plugin/debian/rules)
===================================================================
--- goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/rules (rev 0)
+++ goodies/tags/thunar-media-tags-plugin/0.2.0-1/debian/rules 2011-12-01 06:21:20 UTC (rev 6246)
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+%:
+ dh $@
+
+override_dh_install:
+ rm -f $(CURDIR)/debian/thunar-media-tags-plugin/usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2/*.la
+ dh_install --fail-missing
+
+override_dh_makeshlibs:
+ dh_makeshlibs -n -X /usr/lib/$(DEB_HOST_MULTIARCH)/thunarx-2
More information about the Pkg-xfce-commits
mailing list