[Pkg-xfce-commits] r4549 - in desktop/branches/experimental/orage/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-07 17:35:43 +0000 (Sun, 07 Nov 2010)
New Revision: 4549

Added:
   desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch
Modified:
   desktop/branches/experimental/orage/debian/changelog
   desktop/branches/experimental/orage/debian/control
   desktop/branches/experimental/orage/debian/rules
Log:
  - add build-dep on xfce4-dev-tools and libtool.
  - run xdt-autogen after applying patches.
  - 01-dont-duplicate dropped.
  - 02_explicit-link-libxfcegui4 added, link explicitly against libxfcegui4. 

Modified: desktop/branches/experimental/orage/debian/changelog
===================================================================
--- desktop/branches/experimental/orage/debian/changelog	2010-11-07 16:53:56 UTC (rev 4548)
+++ desktop/branches/experimental/orage/debian/changelog	2010-11-07 17:35:43 UTC (rev 4549)
@@ -4,17 +4,19 @@
   * debian/control:
     - update standards version to 3.9.1.
     - add build-dep on libical-dev and libpopt-dev.
-  * debian/patches
-    - 01-dont-duplicate dropped.
+    - add build-dep on xfce4-dev-tools and libtool.
   * debian/watch updated to track upstream repository reorganization.
   * debian/rules:
     - update configure flags.
     - drop useless call to dh_desktop.
+    - run xdt-autogen after applying patches.
   * debian/patches
+    - 01-dont-duplicate dropped.
     - 01_fix-build-with-external-ical added, update includes to correctly pick
       system libical.
+    - 02_explicit-link-libxfcegui4 added, link explicitly against libxfcegui4. 
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 06 Mar 2010 10:58:45 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 18:03:13 +0100
 
 orage (4.6.1-1) unstable; urgency=low
 

Modified: desktop/branches/experimental/orage/debian/control
===================================================================
--- desktop/branches/experimental/orage/debian/control	2010-11-07 16:53:56 UTC (rev 4548)
+++ desktop/branches/experimental/orage/debian/control	2010-11-07 17:35:43 UTC (rev 4549)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 7), cdbs, libxml-parser-perl,
  libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.6.0), chrpath,
  libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool, 
- libdbus-1-dev, libical-dev, libpopt-dev
+ libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/

Added: desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch
===================================================================
--- desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch	                        (rev 0)
+++ desktop/branches/experimental/orage/debian/patches/02_explicit-link-libxfcegui4.patch	2010-11-07 17:35:43 UTC (rev 4549)
@@ -0,0 +1,45 @@
+diff --git a/globaltime/Makefile.am b/globaltime/Makefile.am
+index c9467f3..c0b27f5 100644
+--- a/globaltime/Makefile.am
++++ b/globaltime/Makefile.am
+@@ -26,12 +26,14 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ 
+ globaltime_CFLAGS =							\
+ 	$(LIBXFCEGUI4_CFLAGS)					\
++	$(LIBXFCE4PANEL_CFLAGS)					\
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"		\
+ 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
+ 
+ globaltime_LDADD =							\
+ 	$(LIBXFCEGUI4_LIBS)						\
+ 	$(LIBXFCEUTIL_LIBS)						\
++	$(LIBXFCE4PANEL_LIBS)						\
+ 	-lX11		            				\
+ 	$(INTLLIBS) 
+ 
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 7201c50..48c8e7d 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -7,8 +7,9 @@ xfce4_orageclock_plugin_CFLAGS =							\
+ 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"			\
+ 	@LIBXFCE4PANEL_CFLAGS@
+ 
+-xfce4_orageclock_plugin_LDFLAGS =						\
++xfce4_orageclock_plugin_LDADD =						\
+ 	@LIBXFCE4PANEL_LIBS@                            \
++	@LIBXFCEGUI4_LIBS@                            \
+ 	-lX11
+ 
+ xfce4_orageclock_plugin_SOURCES = 						\
+@@ -21,9 +22,7 @@ xfce4_orageclock_plugin_SOURCES = 						\
+ 	xfce4-orageclock-plugin.h
+ 
+ if HAVE_CYGWIN
+-xfce4_orageclock_plugin_LDFLAGS +=                      \
+-	-no-undefined                                  \
+-	@LIBXFCEGUI4_LIBS@
++xfce4_orageclock_plugin_LDFLAGS = -no-undefined
+ endif
+ 
+ # .desktop file

Modified: desktop/branches/experimental/orage/debian/rules
===================================================================
--- desktop/branches/experimental/orage/debian/rules	2010-11-07 16:53:56 UTC (rev 4548)
+++ desktop/branches/experimental/orage/debian/rules	2010-11-07 17:35:43 UTC (rev 4549)
@@ -6,6 +6,8 @@
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-libical
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
+post-patches::
+	NOCONFIGURE=1 xdt-autogen
 
 install/orage::
 	chrpath -d -k `pwd`/debian/orage/usr/bin/* \