[Pkg-xfce-commits] r5244 - in goodies/trunk/thunar-media-tags-plugin: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-02 14:31:21 +0000 (Sat, 02 Apr 2011)
New Revision: 5244

Added:
   goodies/trunk/thunar-media-tags-plugin/debian/patches/
   goodies/trunk/thunar-media-tags-plugin/debian/source/
Modified:
   goodies/trunk/thunar-media-tags-plugin/
   goodies/trunk/thunar-media-tags-plugin/debian/changelog
   goodies/trunk/thunar-media-tags-plugin/debian/control
   goodies/trunk/thunar-media-tags-plugin/debian/rules
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/thunar-media-tags-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/thunar-media-tags-plugin:4730-5243

Modified: goodies/trunk/thunar-media-tags-plugin/debian/changelog
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/changelog	2011-04-02 14:21:49 UTC (rev 5243)
+++ goodies/trunk/thunar-media-tags-plugin/debian/changelog	2011-04-02 14:31:21 UTC (rev 5244)
@@ -1,3 +1,30 @@
+thunar-media-tags-plugin (0.1.2-3) UNRELEASED; urgency=low
+
+  * debian/control:
+    - add myself to Uploaders.
+    - bump Standards-Version to 3.9.1.
+    - 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.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 16 Dec 2010 10:05:36 +0100
+
 thunar-media-tags-plugin (0.1.2-2) unstable; urgency=low
 
   [ Simon Huggins ]

Modified: goodies/trunk/thunar-media-tags-plugin/debian/control
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/control	2011-04-02 14:21:49 UTC (rev 5243)
+++ goodies/trunk/thunar-media-tags-plugin/debian/control	2011-04-02 14:31:21 UTC (rev 5244)
@@ -2,17 +2,19 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, pkg-config,
- libthunar-vfs-1-dev (>= 0.3.2beta2), libxml-parser-perl, 
- libexo-0.3-dev (>= 0.3.1.8beta2), libtagc0-dev
-Standards-Version: 3.8.3
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
+ Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>,
+ Martin Loschwitz <madkiss at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7), 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.1
 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 (>= 0.3.2beta2-1)
+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

Modified: goodies/trunk/thunar-media-tags-plugin/debian/rules
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/rules	2011-04-02 14:21:49 UTC (rev 5243)
+++ goodies/trunk/thunar-media-tags-plugin/debian/rules	2011-04-02 14:31:21 UTC (rev 5244)
@@ -1,12 +1,34 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
+include /usr/share/hardening-includes/hardening.make
 
-# Don't call ldconfig in postinst/postrm
-DEB_DH_MAKESHLIBS_ARGS := -n -X /usr/lib/thunarx-1
+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)
 
-binary-post-install/thunar-media-tags-plugin::
-	rm -rf debian/thunar-media-tags-plugin/usr/lib/thunarx-1/*.la
+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