[Pkg-xfce-commits] r4366 - in desktop/branches/experimental/thunar/debian: . patches

Wed Nov 3 09:15:09 UTC 2010

Author: corsac
Date: 2010-11-03 21:14:57 +0000 (Wed, 03 Nov 2010)
New Revision: 4366

Removed:
   desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch
Modified:
   desktop/branches/experimental/thunar/debian/changelog
   desktop/branches/experimental/thunar/debian/control
   desktop/branches/experimental/thunar/debian/patches/series
   desktop/branches/experimental/thunar/debian/rules
Log:
remove 03_fix-build-as-needed as well


Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================

--- desktop/branches/experimental/thunar/debian/changelog	2010-11-03 21:12:09 UTC (rev 4365)
+++ desktop/branches/experimental/thunar/debian/changelog	2010-11-03 21:14:57 UTC (rev 4366)
@@ -27,8 +27,6 @@
     - 06_fix-sidepane-width.patch: dropped, included upstream.
     - 07_update-cursor-on-delete.patch: dropped.
     - 08_refilter-tree-hidden-dir.patch: dropped.
-    - 03_fix-build-as-needed added, fix build with -Wl,--as-needed.
-    + add build-dep on xfce4-dev-tools and run it before configure
     - debian/patches/04_fix-link-twp added fix flags for wallpaper plugin.
   * debian/control:
     - bump build-dep on exo (0.5.1).
@@ -74,7 +72,7 @@
   * debian/libthunarx-2-0.symbols: added.
   * debian/libthunarx-2-0.shlib: dropped.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 03 Nov 2010 22:11:26 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 03 Nov 2010 22:13:03 +0100
 
 thunar (1.0.2-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control	2010-11-03 21:12:09 UTC (rev 4365)
+++ desktop/branches/experimental/thunar/debian/control	2010-11-03 21:14:57 UTC (rev 4366)
@@ -8,7 +8,7 @@
  libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1), chrpath,
  libpcre3-dev, libjpeg-dev, libstartup-notification0-dev (>= 0.4), intltool,
  libxfce4ui-1-dev (>= 4.7.1), libnotify-dev, libgudev-1.0-dev [linux-any],
- xfce4-dev-tools, libtool, gtk-doc-tools, hardening-includes
+ hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://thunar.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/

Deleted: desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch	2010-11-03 21:12:09 UTC (rev 4365)
+++ desktop/branches/experimental/thunar/debian/patches/03_fix-build-as-needed.patch	2010-11-03 21:14:57 UTC (rev 4366)
@@ -1,132 +0,0 @@
-commit 6cb1271328235d533d594c0b94bde075f74865a3
-Author: Jannis Pohlmann <jannis at xfce.org>
-Date:   Mon Sep 6 00:02:39 2010 +0200
-
-    Fix build with -W1,--as-needed by linking against missing libraries.
-
-diff --git a/plugins/thunar-apr/Makefile.am b/plugins/thunar-apr/Makefile.am
-index 9ec59f9..2ed32de 100644
---- a/plugins/thunar-apr/Makefile.am
-+++ b/plugins/thunar-apr/Makefile.am
-@@ -29,6 +29,8 @@ thunar_apr_la_SOURCES =							\
- thunar_apr_la_CFLAGS =							\
- 	$(EXIF_CFLAGS)							\
- 	$(EXO_CFLAGS)							\
-+	$(GLIB_CFLAGS)							\
-+	$(GTK_CFLAGS)							\
- 	$(PLATFORM_CFLAGS)
- 
- thunar_apr_la_LDFLAGS =							\
-@@ -39,7 +41,15 @@ thunar_apr_la_LDFLAGS =							\
- 	$(PLATFORM_LDFLAGS)
- 
- thunar_apr_la_LIBADD =							\
--	$(EXIF_LIBS)
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
-+	$(EXIF_LIBS)							\
-+	$(EXO_LIBS)							\
-+	$(GLIB_LIBS)							\
-+	$(GTK_LIBS)
-+
-+thunar_apr_la_DEPENDENCIES =						\
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
-+	
- 
- EXTRA_DIST =								\
- 	README
-diff --git a/plugins/thunar-sbr/Makefile.am b/plugins/thunar-sbr/Makefile.am
-index 6231444..7d87564 100644
---- a/plugins/thunar-sbr/Makefile.am
-+++ b/plugins/thunar-sbr/Makefile.am
-@@ -34,6 +34,7 @@ thunar_sbr_la_SOURCES =							\
- thunar_sbr_la_CFLAGS =							\
- 	$(EXIF_CFLAGS)							\
- 	$(EXO_CFLAGS)							\
-+	$(GLIB_CFLAGS)							\
- 	$(PCRE_CFLAGS)							\
- 	$(PLATFORM_CFLAGS)
- 
-@@ -45,8 +46,14 @@ thunar_sbr_la_LDFLAGS =							\
- 	$(PLATFORM_LDFLAGS)
- 
- thunar_sbr_la_LIBADD =							\
--	$(PCRE_LIBS)							\
--	$(EXIF_LIBS)
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
-+	$(EXIF_LIBS)							\
-+	$(EXO_LIBS)							\
-+	$(GLIB_LIBS)							\
-+	$(PCRE_LIBS)
-+
-+thunar_sbr_la_DEPENDENCIES =						\
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
- 
- EXTRA_DIST =								\
- 	README
-diff --git a/plugins/thunar-uca/Makefile.am b/plugins/thunar-uca/Makefile.am
-index 2e37016..8c66d76 100644
---- a/plugins/thunar-uca/Makefile.am
-+++ b/plugins/thunar-uca/Makefile.am
-@@ -36,11 +36,6 @@ thunar_uca_la_CFLAGS =							\
- 	$(LIBXFCE4UI_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
- 
--thunar_uca_la_LIBADD =							\
--	$(EXO_LIBS)							\
--	$(LIBXFCE4UTIL_LIBS)						\
--	$(LIBXFCE4UI_LIBS)
--
- thunar_uca_la_LDFLAGS =							\
- 	-avoid-version							\
- 	-export-dynamic							\
-@@ -48,6 +43,15 @@ thunar_uca_la_LDFLAGS =							\
- 	-module								\
- 	$(PLATFORM_LDFLAGS)
- 
-+thunar_uca_la_LIBADD =							\
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
-+	$(EXO_LIBS)							\
-+	$(LIBXFCE4UTIL_LIBS)						\
-+	$(LIBXFCE4UI_LIBS)
-+
-+thunar_uca_la_DEPENDENCIES =						\
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
-+
- defaultsdir = $(sysconfdir)/xdg/Thunar
- defaults_in_files = uca.xml.in
- defaults_DATA = $(defaults_in_files:.xml.in=.xml)
-diff --git a/plugins/thunar-wallpaper/Makefile.am b/plugins/thunar-wallpaper/Makefile.am
-index 5846794..d476325 100644
---- a/plugins/thunar-wallpaper/Makefile.am
-+++ b/plugins/thunar-wallpaper/Makefile.am
-@@ -16,16 +16,25 @@ thunar_wallpaper_plugin_la_SOURCES =					\
- 	thunar-wallpaper-plugin.c
- 
- thunar_wallpaper_plugin_la_CFLAGS =					\
--	$(PLATFORM_CFLAGS)						\
--	$(THUNARX_CFLAGS)						\
--	$(EXO_CFLAGS)
-+	$(EXO_CFLAGS)							\
-+	$(GLIB_CFLAGS)							\
-+	$(GTK_CFLAGS)							\
-+	$(PLATFORM_CFLAGS)
- 
- thunar_wallpaper_plugin_la_LDFLAGS =					\
- 	-avoid-version							\
- 	-export-dynamic							\
- 	-export-symbols-regex "^thunar_extension_(shutdown|initialize|list_types)" \
- 	-module								\
--	$(PLATFORM_LDFLAGS)						\
--	$(THUNARX_LDFLAGS)
-+	$(PLATFORM_LDFLAGS)
-+
-+thunar_wallpaper_plugin_la_LIBADD =					\
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la	\
-+	$(EXO_LIBS)							\
-+	$(GLIB_LIBS)							\
-+	$(GTK_LIBS)
-+	
-+thunar_wallpaper_plugin_la_DEPENDENCIES =				\
-+	$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
- 
- # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Modified: desktop/branches/experimental/thunar/debian/patches/series
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/series	2010-11-03 21:12:09 UTC (rev 4365)
+++ desktop/branches/experimental/thunar/debian/patches/series	2010-11-03 21:14:57 UTC (rev 4366)
@@ -1,3 +1,2 @@
 02_thunar-icon-naming-spec-compliance.patch
-03_fix-build-as-needed.patch
 04_fix-link-twp.patch

Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules	2010-11-03 21:12:09 UTC (rev 4365)
+++ desktop/branches/experimental/thunar/debian/rules	2010-11-03 21:14:57 UTC (rev 4366)
@@ -12,7 +12,6 @@
 	dh $@
 
 override_dh_auto_configure:
-	NOCONFIGURE=1  xdt-autogen
 	dh_auto_configure -- --enable-dbus --enable-startup-notification --enable-apr-plugin \
     --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin \
     --docdir=\$${prefix}/share/doc/thunar-data


