[Pkg-xfce-commits] r6335 - in desktop/trunk: exo/debian exo/debian/patches xfce4-panel/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-01-22 00:21:42 +0000 (Sun, 22 Jan 2012)
New Revision: 6335

Added:
   desktop/trunk/exo/debian/patches/01_fix-link-lm.patch
   desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch
   desktop/trunk/exo/debian/patches/series
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/libexo-1-dev.install
   desktop/trunk/xfce4-panel/debian/changelog
   desktop/trunk/xfce4-panel/debian/rules
   desktop/trunk/xfce4-panel/debian/xfce4-panel-dev.install
   desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs
Log:
revert some bits that went to trunk instead of branches/exp

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2012-01-22 00:18:02 UTC (rev 6334)
+++ desktop/trunk/exo/debian/changelog	2012-01-22 00:21:42 UTC (rev 6335)
@@ -1,13 +1,3 @@
-exo (0.7.0-1) UNRELEASED; urgency=low
-
-  * New upstream development release.
-  * debian/patches:
-    - 01_fix-link-lm.patch, 02_fix-glib-link-test.patch: dropped, included
-      upstream.
-  * debian/libexo-1-dev.install: drop *.a files, not built anymore.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 01 Jan 2012 18:55:29 +0100
-
 exo (0.6.2-3) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: desktop/trunk/exo/debian/libexo-1-dev.install
===================================================================
--- desktop/trunk/exo/debian/libexo-1-dev.install	2012-01-22 00:18:02 UTC (rev 6334)
+++ desktop/trunk/exo/debian/libexo-1-dev.install	2012-01-22 00:21:42 UTC (rev 6335)
@@ -1,4 +1,5 @@
 usr/include/*
 usr/lib/*/pkgconfig/*
+usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/share/gtk-doc/html/exo-1/*

Added: desktop/trunk/exo/debian/patches/01_fix-link-lm.patch
===================================================================
--- desktop/trunk/exo/debian/patches/01_fix-link-lm.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/01_fix-link-lm.patch	2012-01-22 00:21:42 UTC (rev 6335)
@@ -0,0 +1,14 @@
+Index: exo-0.6.2/exo/Makefile.am
+===================================================================
+--- exo-0.6.2.orig/exo/Makefile.am	2011-09-05 22:11:21.302991166 +0200
++++ exo-0.6.2/exo/Makefile.am	2011-09-05 22:26:13.416502894 +0200
+@@ -105,7 +105,8 @@
+ 	$(GIO_LIBS)							\
+ 	$(GTK_LIBS)							\
+ 	$(LIBX11_LIBS)							\
+-	$(LIBXFCE4UTIL_LIBS)
++	$(LIBXFCE4UTIL_LIBS)						\
++	-lm
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = exo-$(LIBEXO_VERSION_API).pc

Added: desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch
===================================================================
--- desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/02_fix-glib-link-test.patch	2012-01-22 00:21:42 UTC (rev 6335)
@@ -0,0 +1,20 @@
+Index: exo-0.6.2/tests/Makefile.am
+===================================================================
+--- exo-0.6.2.orig/tests/Makefile.am	2011-06-10 19:05:27.000000000 +0200
++++ exo-0.6.2/tests/Makefile.am	2011-09-06 07:13:52.064039427 +0200
+@@ -39,6 +39,7 @@
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_noop_LDADD =							\
++	$(GLIB_LIBS)							\
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_string_SOURCES =						\
+@@ -52,6 +53,7 @@
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_string_LDADD =							\
++	$(GLIB_LIBS)							\
+ 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
+ 
+ test_exo_icon_chooser_dialog_SOURCES =					\

Added: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/series	2012-01-22 00:21:42 UTC (rev 6335)
@@ -0,0 +1,2 @@
+01_fix-link-lm.patch
+02_fix-glib-link-test.patch

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2012-01-22 00:18:02 UTC (rev 6334)
+++ desktop/trunk/xfce4-panel/debian/changelog	2012-01-22 00:21:42 UTC (rev 6335)
@@ -1,14 +1,3 @@
-xfce4-panel (4.9.0-1) UNRELEASED; urgency=low
-
-  * New upstream development release, including:
-    - "add items to panel" dialogs aren't on top anymore        Closes: #450910
-    - fix autosaving to avoid lost settings.                    Closes: #646981
-  * debian/xfce4-panel.shlibs: bump to >= 4.9.0, for the new "small" property.
-  * debian/rules, debian/xfce4-panel-dev.install: ignore *.a files, not built
-    anymore.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Sun, 01 Jan 2012 19:44:58 +0100
-
 xfce4-panel (4.8.6-1) unstable; urgency=low
 
   * New upstream release:

Modified: desktop/trunk/xfce4-panel/debian/rules
===================================================================
--- desktop/trunk/xfce4-panel/debian/rules	2012-01-22 00:18:02 UTC (rev 6334)
+++ desktop/trunk/xfce4-panel/debian/rules	2012-01-22 00:21:42 UTC (rev 6335)
@@ -6,6 +6,7 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_install:
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/*.a
 	dh_install --fail-missing --sourcedir=debian/tmp -X .la
 
 override_dh_strip:

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel-dev.install
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel-dev.install	2012-01-22 00:18:02 UTC (rev 6334)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel-dev.install	2012-01-22 00:21:42 UTC (rev 6335)
@@ -1,4 +1,5 @@
 usr/include/
 usr/lib/*/pkgconfig/
+usr/lib/*/lib*.a
 usr/lib/*/lib*.so
 usr/share/gtk-doc/

Modified: desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs
===================================================================
--- desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs	2012-01-22 00:18:02 UTC (rev 6334)
+++ desktop/trunk/xfce4-panel/debian/xfce4-panel.shlibs	2012-01-22 00:21:42 UTC (rev 6335)
@@ -1 +1 @@
-libxfce4panel-1.0 3 xfce4-panel (>= 4.9.0)
+libxfce4panel-1.0 3 xfce4-panel (>= 4.7.7)