[Pkg-xfce-commits] r7475 - in desktop/trunk/libxfcegui4: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 10:30:34 UTC 2013
Author: corsac
Date: 2013-05-21 22:30:34 +0000 (Tue, 21 May 2013)
New Revision: 7475
Removed:
desktop/trunk/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch
desktop/trunk/libxfcegui4/debian/patches/03_fix-link-lm.patch
Modified:
desktop/trunk/libxfcegui4/
desktop/trunk/libxfcegui4/debian/changelog
desktop/trunk/libxfcegui4/debian/compat
desktop/trunk/libxfcegui4/debian/control
desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install
desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install
desktop/trunk/libxfcegui4/debian/patches/series
desktop/trunk/libxfcegui4/debian/rules
Log:
merge changes from experimental
Property changes on: desktop/trunk/libxfcegui4
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/libxfcegui4:6772-7429
Modified: desktop/trunk/libxfcegui4/debian/changelog
===================================================================
--- desktop/trunk/libxfcegui4/debian/changelog 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/changelog 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1,9 +1,41 @@
-libxfcegui4 (4.8.1-6) UNRELEASED; urgency=low
+libxfcegui4 (4.10.0-1) experimental; urgency=low
+ * New upstream stable release.
+ * debian/patches:
+ - 01_xfce-exec-use-thunar.patch: dropped, now use exo-open.
+ - 03_fix-link-lm.patch: dropped, included upstream.
+ * debian/control: revert to unversioned libxfce4util-dev, bump required
+ version to >= 4.10.0.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 05 May 2012 14:21:58 +0200
+
+libxfcegui4 (4.9.0-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
* debian/patches: add missing DEP3 headers.
+ * debian/control: switch to libxfce4util6-dev for the new api.
- -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 20 Feb 2012 21:43:31 +0100
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ * debian/rules:
+ - build with --parallel.
+ - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
+ - use --fail-missing in dh_install.
+ * debian/control:
+ - bump debhelper build-dep to 9.
+ - add build-dep on dpkg-dev 1.16.1.
+ - drop hardening-includes build-dep.
+ - update standards version to 3.9.3.
+ - add Pre-Depends on ${misc:Pre-Depends} in libxfcegui4-4 for multiarch.
+ * debian/compat bumped to 9.
+ * Use multi-arch paths in install files.
+ * debian/libxfcegui4-4.install:
+ - stop installing glade files since they are gone.
+ * debian/libxfcegui4-dev:
+ - don't install static libs, we don't build them anymore.
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Apr 2012 16:28:07 +0200
+
libxfcegui4 (4.8.1-5) unstable; urgency=low
* debian/patches:
Modified: desktop/trunk/libxfcegui4/debian/compat
===================================================================
--- desktop/trunk/libxfcegui4/debian/compat 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/compat 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1 +1 @@
-7
+9
Modified: desktop/trunk/libxfcegui4/debian/control
===================================================================
--- desktop/trunk/libxfcegui4/debian/control 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/control 2013-05-21 22:30:34 UTC (rev 7475)
@@ -4,11 +4,11 @@
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~), libgtk2.0-dev (>= 2.10.6),
- libxfce4util-dev (>= 4.8.0), libxfconf-0-dev (>=4.8.0),
- libstartup-notification0-dev, libglade2-dev, intltool, hardening-includes,
+Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.10.6),
+ libxfce4util-dev (>= 4.10.0), libxfconf-0-dev (>= 4.10.0),
+ libstartup-notification0-dev, libglade2-dev, intltool, dpkg-dev (>= 1.16.1),
xfce4-dev-tools, libtool, gtk-doc-tools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfcegui4/
@@ -16,7 +16,7 @@
Package: libxfcegui4-dev
Section: libdevel
Architecture: any
-Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.8.0),
+Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.10.0),
libgtk2.0-dev, ${misc:Depends}
Suggests: devhelp
Description: Development files for libxfcegui4-4
@@ -31,6 +31,7 @@
Package: libxfcegui4-4
Section: libs
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, xfce-keyboard-shortcuts
Breaks: xfwm4 (<< 4.8), xfce4-settings (<< 4.8)
Description: Basic GUI C functions for Xfce4
Modified: desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install
===================================================================
--- desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/libxfcegui4-4.install 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1,4 +1,3 @@
-usr/lib/lib*.so.*
-usr/lib/libglade/2.0/libxfce4.so
+usr/lib/*/lib*.so.*
usr/share/locale/*
usr/share/icons/hicolor/*
Modified: desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install
===================================================================
--- desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/libxfcegui4-dev.install 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1,6 +1,4 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/libglade/2.0/*.a
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
usr/share/gtk-doc/html/libxfcegui4/*
Deleted: desktop/trunk/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/patches/01_xfce-exec-use-thunar.patch 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1,17 +0,0 @@
-Descrption: xfce-exec calls xftree4 instead of thunar
-Author: Yves-Alexis Perez <corsac at debian.org>
-Bug: https://bugzilla.xfce.org/show_bug.cgi?id=4048
-
-diff --git xfce_4_4/libxfcegui4/xfce-exec.c b/branches/xfce_4_4/libxfcegui4/xfce-exec.c
-index 3d58cf4..bcfad09 100644
---- xfce_4_4/libxfcegui4/xfce-exec.c
-+++ xfce_4_4/libxfcegui4/xfce-exec.c
-@@ -218,7 +218,7 @@ xfce_exec_create_argv (const char *cmd, gboolean in_terminal, GError **error)
- if (in_terminal)
- argv[0] = g_strdup ("xfterm4");
- else
-- argv[0] = g_strdup ("xftree4");
-+ argv[0] = g_strdup ("thunar");
-
- argv[1] = realcmd;
- argv[2] = NULL;
Deleted: desktop/trunk/libxfcegui4/debian/patches/03_fix-link-lm.patch
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/03_fix-link-lm.patch 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/patches/03_fix-link-lm.patch 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1,14 +0,0 @@
-Index: libxfcegui4-4.8.1/libxfcegui4/Makefile.am
-===================================================================
---- libxfcegui4-4.8.1.orig/libxfcegui4/Makefile.am 2011-09-05 21:06:48.451070643 +0200
-+++ libxfcegui4-4.8.1/libxfcegui4/Makefile.am 2011-09-05 21:07:08.935197556 +0200
-@@ -183,7 +183,8 @@
- $(LIBX11_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(LIBSTARTUP_NOTIFICATION_LIBS) \
-- $(PLATFORM_LIBS)
-+ $(PLATFORM_LIBS) \
-+ -lm
-
- libxfcegui4_la_CFLAGS = \
- $(NETK_CFLAGS) \
Modified: desktop/trunk/libxfcegui4/debian/patches/series
===================================================================
--- desktop/trunk/libxfcegui4/debian/patches/series 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/patches/series 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1,3 +1 @@
-01_xfce-exec-use-thunar.patch
02_fix-menu-icons.patch
-03_fix-link-lm.patch
Modified: desktop/trunk/libxfcegui4/debian/rules
===================================================================
--- desktop/trunk/libxfcegui4/debian/rules 2013-05-21 22:30:09 UTC (rev 7474)
+++ desktop/trunk/libxfcegui4/debian/rules 2013-05-21 22:30:34 UTC (rev 7475)
@@ -1,15 +1,10 @@
#!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
-export CFLAGS LDFLAGS
-
%:
- dh $@
+ dh $@ --parallel
override_dh_strip:
dh_strip --dbg-package=libxfcegui4-4-dbg
More information about the Pkg-xfce-commits
mailing list