[Pkg-xfce-commits] r7391 - in desktop/trunk/libxfce4util: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 06:48:33 UTC 2013
Author: corsac
Date: 2013-05-21 18:48:32 +0000 (Tue, 21 May 2013)
New Revision: 7391
Added:
desktop/trunk/libxfce4util/debian/libxfce4util6.install
desktop/trunk/libxfce4util/debian/libxfce4util6.symbols
desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh
Removed:
desktop/trunk/libxfce4util/debian/libxfce4util4.install
desktop/trunk/libxfce4util/debian/libxfce4util4.symbols
Modified:
desktop/trunk/libxfce4util/
desktop/trunk/libxfce4util/debian/changelog
desktop/trunk/libxfce4util/debian/compat
desktop/trunk/libxfce4util/debian/control
desktop/trunk/libxfce4util/debian/copyright
desktop/trunk/libxfce4util/debian/libxfce4util-dev.install
desktop/trunk/libxfce4util/debian/patches/series
desktop/trunk/libxfce4util/debian/rules
Log:
merge changes from experimental
Property changes on: desktop/trunk/libxfce4util
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/libxfce4util:6525-7388
Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/changelog 2013-05-21 18:48:32 UTC (rev 7391)
@@ -1,10 +1,60 @@
-libxfce4util (4.8.2-2) UNRELEASED; urgency=low
+libxfce4util (4.10.0-2) experimental; urgency=low
+ * debian/patches:
+ - 02_fix-abicheck.sh added, fix FTBFS on ppc64. closes: #682414
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 22 Jul 2012 20:51:51 +0200
+
+libxfce4util (4.10.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * Revert to unversioned -dev package name, we don't intend to keep the old
+ one around.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Fri, 04 May 2012 07:59:19 +0200
+
+libxfce4util (4.9.1-1) experimental; urgency=low
+
[ Lionel Le Folgoc ]
+ * New upstream development release.
+
+ [ Yves-Alexis Perez ]
+ * debian/rules:
+ - build with --parallel.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 15 Apr 2012 14:46:01 +0200
+
+libxfce4util (4.9.0-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
* debian/patches: add missing DEP3 headers.
+ * debian/control: use Breaks instead of Conflicts when possible.
- -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 20 Feb 2012 21:42:16 +0100
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ - update symbols file.
+ - rename library package to follow soname change.
+ - rename -dev package to follow API change.
+ * debian/control:
+ - update standards version to 3.9.3.
+ - update debhelper build dep to 9.
+ - add build-dep on dpkg-dev 1.16.1.
+ - drop hardening-includes build-dep.
+ - add Pre-Depends on ${misc:Pre-Depends} for multi-arch.
+ - replace Conflicts by Breaks
+ - make libxfce4util6-dev Breaks/Replaces libxfce4util-dev
+ * debian/compat bumped to 8
+ * debian/libxfce4util6-dev.install:
+ - stop shipping static file, it's not built by default anymore anyway.
+ - update paths for multi-arch.
+ * debian/libxfce4util6.install:
+ - update paths for multi-arch.
+ * debian/rules:
+ - use hardening support of debhelper 9 and dpkg-dev 1.16.1.
+ * debian/copyright updated.
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 07 Apr 2012 13:30:31 +0200
+
libxfce4util (4.8.2-1) unstable; urgency=low
* New upstream release.
Modified: desktop/trunk/libxfce4util/debian/compat
===================================================================
--- desktop/trunk/libxfce4util/debian/compat 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/compat 2013-05-21 18:48:32 UTC (rev 7391)
@@ -1 +1 @@
-7
+9
Modified: desktop/trunk/libxfce4util/debian/control
===================================================================
--- desktop/trunk/libxfce4util/debian/control 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/control 2013-05-21 18:48:32 UTC (rev 7391)
@@ -4,9 +4,9 @@
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~), libglib2.0-dev, intltool,
- hardening-includes
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), libglib2.0-dev, intltool,
+ dpkg-dev (>= 1.16.1)
+Standards-Version: 3.9.3
Homepage: http://www.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4util/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4util/
@@ -14,39 +14,41 @@
Package: libxfce4util-dev
Architecture: any
Section: libdevel
-Depends: libxfce4util4 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev
+Depends: libxfce4util6 (= ${binary:Version}), ${misc:Depends}, libglib2.0-dev
Suggests: devhelp
-Description: Development files for libxfce4util4
- This package contains the headers and the static library
- for libxfce4util4. If you intend to code applications
- for the Xfce4 desktop environment, you need to install
- this package.
+Breaks: libxfce4util6-dev
+Replaces: libxfce4util6-dev
+Description: Development files for libxfce4util6
+ This package contains the headers for libxfce4util6. If you intend to code
+ applications for the Xfce4 desktop environment, you need to install this
+ package.
.
- The libxfce4util4 Reference Manual is also included and
+ The libxfce4util6 Reference Manual is also included and
it can be consulted using Devhelp or a web browser.
-Package: libxfce4util4
+Package: libxfce4util6
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util-common
Recommends: libxfce4util-bin
Description: Utility functions library for Xfce4
- This package contains libxfce4util4, the basic utility
+ This package contains libxfce4util6, the basic utility
function library for Xfce4. If you intend to run Xfce4,
you need this library.
-Package: libxfce4util4-dbg
+Package: libxfce4util6-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util4 (= ${binary:Version})
-Description: debugging informations for libxfce4util4
- This package contains debugging symbols for libxfce4util4, the basic
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util6 (= ${binary:Version})
+Description: debugging informations for libxfce4util6
+ This package contains debugging symbols for libxfce4util6, the basic
utility function library for Xfce4.
Package: libxfce4util-bin
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libxfce4util4 (<< 4.6.1-2)
+Breaks: libxfce4util4 (<< 4.6.1-2)
Replaces: libxfce4util4 (<< 4.6.1-2)
Description: tools for libxfce4util
This package contains binaries used by Xfce basic utility library.
@@ -56,7 +58,7 @@
Package: libxfce4util-common
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libxfce4util4 (<< 4.6.1-2)
+Breaks: libxfce4util4 (<< 4.6.1-2)
Replaces: libxfce4util4 (<< 4.6.1-2)
Description: common files for libxfce4util
This package contains various infrastructure-independant common files for
Modified: desktop/trunk/libxfce4util/debian/copyright
===================================================================
--- desktop/trunk/libxfce4util/debian/copyright 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/copyright 2013-05-21 18:48:32 UTC (rev 7391)
@@ -6,12 +6,12 @@
Upstream author and copyright holders are:
-Files: libxfce4util/debug.h
- libxfce4util/libxfce4util-config.c
+Files: libxfce4util/libxfce4util-config.c
+ libxfce4util/libxfce4util-config.h
libxfce4util/libxfce4util-private.c
libxfce4util/libxfce4util-private.h
libxfce4util/libxfce4util.h
- libxfce4util/util.h
+ libxfce4util/xfce-debug.h
libxfce4util/xfce-fileutils.c
libxfce4util/xfce-fileutils.h
libxfce4util/xfce-generics.h
@@ -29,50 +29,28 @@
libxfce4util/xfce-rc.h
libxfce4util/xfce-resource.c
libxfce4util/xfce-resource.h
- xfce4-kiosk-query/main.c
Copyright: 2003-2005, Benedikt Meurer <benny at xfce.org>
- 2003-2006, Benedikt Meurer <benny at xfce.org>
- 2003-2007, Benedikt Meurer <benny at xfce.org>
- 2004-2005, Benedikt Meurer <benny at xfce.org>
- 2006, Benedikt Meurer <benny at xfce.org>
+ 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2003-2007, Benedikt Meurer <benny at xfce.org>
+ 2006, Benedikt Meurer <benny at xfce.org>
License: LGPL-2+
-Files: libxfce4util/libxfce4util-alias.h
- libxfce4util/libxfce4util-aliasdef.c
-Copyright: 2005-2006, Benedikt Meurer <benny at xfce.org>
-License: LGPL-2+
-Comment: autogenerated by libxfce4util/make-libxfce4util-alias.pl
-
-Files: libxfce4util/libxfce4util-enum-types.c
- libxfce4util/libxfce4util-enum-types.h
-Copyright: 2005-2006, Benedikt Meurer <benny at xfce.org>
-License: LGPL-2+
-Comment: autogenerated by make dist when releasing the tarball
-
-Files: libxfce4util/i18n.h
- libxfce4util/xfce-i18n.c
+Files: libxfce4util/xfce-i18n.c
libxfce4util/xfce-i18n.h
Copyright: 2003-2006, Benedikt Meurer <benny at xfce.org>
- 2004, Jasper Huijsman <jasper at xfce.org>
+ 2004, Jasper Huijsman <jasper at xfce.org>
License: LGPL-2+
-Files: libxfce4util/utf8.h
- libxfce4util/xfce-utf8.c
+Files: libxfce4util/xfce-utf8.c
libxfce4util/xfce-utf8.h
Copyright: 2003, Olivier Fourdan <fourdan at xfce.org>
- 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2003-2006, Benedikt Meurer <benny at xfce.org>
License: LGPL-2+
-Files: libxfce4util/xfce-desktopentry.c
- libxfce4util/xfce-desktopentry.h
-Copyright: 2004, Jasper Huijsmans <jasper at xfce.org>
- 2006, Benedikt Meurer <benny at xfce.org>
-License: LGPL-2+
-
Files: libxfce4util/abicheck.sh
libxfce4util/make-libxfce4util-alias.pl
Copyright: 2004, The GLib Development Team
- 2005-2006, Benedikt Meurer <benny at xfce.org>
+ 2005-2006, Benedikt Meurer <benny at xfce.org>
License: LGPL-2+
Files: libxfce4util/xfce-posix-signal-handler.c
@@ -80,6 +58,20 @@
Copyright: 2007, Brian Tarricone <bjt23 at cornell.edu>
License: LGPL-2+
+Files: libxfce4util/libxfce4util-alias.h
+ libxfce4util/libxfce4util-aliasdef.c
+Copyright: 2005-2006 Benedikt Meurer <benny at xfce.org>
+License: GPL-2+
+Comment: autogenerated from libxfce4util/libxfce4util.symbols
+
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2006
+License: GPL-2+
+
+Files: xfce4-kiosk-query/main.c
+Copyright: 2004-2005, Benedikt Meurer <benny at xfce.org>
+License: GPL-2+
+
License:
This package is free software; you can redistribute it and/or
@@ -97,4 +89,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL' and the
+complete text of the GNU General Public License can be found in
+`/usr/share/common-licenses/GPL'
Modified: desktop/trunk/libxfce4util/debian/libxfce4util-dev.install
===================================================================
--- desktop/trunk/libxfce4util/debian/libxfce4util-dev.install 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/libxfce4util-dev.install 2013-05-21 18:48:32 UTC (rev 7391)
@@ -1,5 +1,4 @@
usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
usr/share/gtk-doc/html/libxfce4util/*
Deleted: desktop/trunk/libxfce4util/debian/libxfce4util4.install
===================================================================
--- desktop/trunk/libxfce4util/debian/libxfce4util4.install 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/libxfce4util4.install 2013-05-21 18:48:32 UTC (rev 7391)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
Deleted: desktop/trunk/libxfce4util/debian/libxfce4util4.symbols
===================================================================
--- desktop/trunk/libxfce4util/debian/libxfce4util4.symbols 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/libxfce4util4.symbols 2013-05-21 18:48:32 UTC (rev 7391)
@@ -1,79 +0,0 @@
-libxfce4util.so.4 libxfce4util4 #MINVER#
- libxfce4util_major_version at Base 4.3.99.2
- libxfce4util_micro_version at Base 4.3.99.2
- libxfce4util_minor_version at Base 4.3.99.2
- xfce_builtin_license_BSD at Base 4.3.99.2
- xfce_builtin_license_GPL at Base 4.3.99.2
- xfce_builtin_license_LGPL at Base 4.3.99.2
- xfce_desktop_entry_get_file at Base 4.3.99.2
- xfce_desktop_entry_get_int at Base 4.3.99.2
- xfce_desktop_entry_get_string at Base 4.3.99.2
- xfce_desktop_entry_get_type at Base 4.3.99.2
- xfce_desktop_entry_has_translated_entry at Base 4.3.99.2
- xfce_desktop_entry_new at Base 4.3.99.2
- xfce_desktop_entry_new_from_data at Base 4.3.99.2
- xfce_expand_variables at Base 4.3.99.2
- xfce_get_dir_localized at Base 4.3.99.2
- xfce_get_dir_localized_r at Base 4.3.99.2
- xfce_get_file_localized at Base 4.3.99.2
- xfce_get_file_localized_r at Base 4.3.99.2
- xfce_get_homedir at Base 4.3.99.2
- xfce_get_homefile_r at Base 4.3.99.2
- xfce_get_license_text at Base 4.3.99.2
- xfce_get_path_localized at Base 4.3.99.2
- xfce_get_userdir at Base 4.3.99.2
- xfce_get_userfile_r at Base 4.3.99.2
- xfce_gethostname at Base 4.3.99.2
- xfce_kiosk_free at Base 4.3.99.2
- xfce_kiosk_new at Base 4.3.99.2
- xfce_kiosk_query at Base 4.3.99.2
- xfce_license_text_type_get_type at Base 4.3.99.2
- xfce_locale_match at Base 4.3.99.2
- xfce_mkdirhier at Base 4.3.99.2
- xfce_posix_signal_handler_init at Base 4.6.0
- xfce_posix_signal_handler_restore_handler at Base 4.6.0
- xfce_posix_signal_handler_set_handler at Base 4.6.0
- xfce_posix_signal_handler_shutdown at Base 4.6.0
- xfce_putenv at Base 4.3.99.2
- xfce_rc_close at Base 4.3.99.2
- xfce_rc_config_open at Base 4.3.99.2
- xfce_rc_delete_entry at Base 4.3.99.2
- xfce_rc_delete_group at Base 4.3.99.2
- xfce_rc_flush at Base 4.3.99.2
- xfce_rc_get_entries at Base 4.3.99.2
- xfce_rc_get_group at Base 4.3.99.2
- xfce_rc_get_groups at Base 4.3.99.2
- xfce_rc_get_locale at Base 4.3.99.2
- xfce_rc_has_entry at Base 4.3.99.2
- xfce_rc_has_group at Base 4.3.99.2
- xfce_rc_is_dirty at Base 4.3.99.2
- xfce_rc_is_readonly at Base 4.3.99.2
- xfce_rc_read_bool_entry at Base 4.3.99.2
- xfce_rc_read_entry at Base 4.3.99.2
- xfce_rc_read_entry_untranslated at Base 4.3.99.2
- xfce_rc_read_int_entry at Base 4.3.99.2
- xfce_rc_read_list_entry at Base 4.3.99.2
- xfce_rc_rollback at Base 4.3.99.2
- xfce_rc_set_group at Base 4.3.99.2
- xfce_rc_simple_open at Base 4.3.99.2
- xfce_rc_write_bool_entry at Base 4.3.99.2
- xfce_rc_write_entry at Base 4.3.99.2
- xfce_rc_write_int_entry at Base 4.3.99.2
- xfce_rc_write_list_entry at Base 4.3.99.2
- xfce_resource_dirs at Base 4.3.99.2
- xfce_resource_lookup at Base 4.3.99.2
- xfce_resource_lookup_all at Base 4.3.99.2
- xfce_resource_match at Base 4.3.99.2
- xfce_resource_match_custom at Base 4.3.99.2
- xfce_resource_pop_path at Base 4.3.99.2
- xfce_resource_push_path at Base 4.3.99.2
- xfce_resource_save_location at Base 4.3.99.2
- xfce_resource_type_get_type at Base 4.3.99.2
- xfce_setenv at Base 4.3.99.2
- xfce_strip_context at Base 4.3.99.2
- xfce_strjoin at Base 4.3.99.2
- xfce_textdomain at Base 4.3.99.2
- xfce_unsetenv at Base 4.3.99.2
- xfce_utf8_remove_controls at Base 4.3.99.2
- xfce_utf8_strndup at Base 4.3.99.2
- xfce_version_string at Base 4.3.99.2
Copied: desktop/trunk/libxfce4util/debian/libxfce4util6.install (from rev 7388, desktop/branches/experimental/libxfce4util/debian/libxfce4util6.install)
===================================================================
--- desktop/trunk/libxfce4util/debian/libxfce4util6.install (rev 0)
+++ desktop/trunk/libxfce4util/debian/libxfce4util6.install 2013-05-21 18:48:32 UTC (rev 7391)
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
Copied: desktop/trunk/libxfce4util/debian/libxfce4util6.symbols (from rev 7388, desktop/branches/experimental/libxfce4util/debian/libxfce4util6.symbols)
===================================================================
--- desktop/trunk/libxfce4util/debian/libxfce4util6.symbols (rev 0)
+++ desktop/trunk/libxfce4util/debian/libxfce4util6.symbols 2013-05-21 18:48:32 UTC (rev 7391)
@@ -0,0 +1,66 @@
+libxfce4util.so.6 libxfce4util6 #MINVER#
+ libxfce4util_major_version at Base 4.9.0
+ libxfce4util_micro_version at Base 4.9.0
+ libxfce4util_minor_version at Base 4.9.0
+ xfce_expand_variables at Base 4.9.0
+ xfce_get_dir_localized at Base 4.9.0
+ xfce_get_dir_localized_r at Base 4.9.0
+ xfce_get_file_localized at Base 4.9.0
+ xfce_get_file_localized_r at Base 4.9.0
+ xfce_get_homedir at Base 4.9.0
+ xfce_get_homefile_r at Base 4.9.0
+ xfce_get_license_text at Base 4.9.0
+ xfce_get_path_localized at Base 4.9.0
+ xfce_get_userdir at Base 4.9.0
+ xfce_get_userfile_r at Base 4.9.0
+ xfce_gethostname at Base 4.9.0
+ xfce_kiosk_free at Base 4.9.0
+ xfce_kiosk_new at Base 4.9.0
+ xfce_kiosk_query at Base 4.9.0
+ xfce_locale_match at Base 4.9.0
+ xfce_mkdirhier at Base 4.9.0
+ xfce_posix_signal_handler_init at Base 4.9.0
+ xfce_posix_signal_handler_restore_handler at Base 4.9.0
+ xfce_posix_signal_handler_set_handler at Base 4.9.0
+ xfce_posix_signal_handler_shutdown at Base 4.9.0
+ xfce_putenv at Base 4.9.0
+ xfce_rc_close at Base 4.9.0
+ xfce_rc_config_open at Base 4.9.0
+ xfce_rc_delete_entry at Base 4.9.0
+ xfce_rc_delete_group at Base 4.9.0
+ xfce_rc_flush at Base 4.9.0
+ xfce_rc_get_entries at Base 4.9.0
+ xfce_rc_get_group at Base 4.9.0
+ xfce_rc_get_groups at Base 4.9.0
+ xfce_rc_get_locale at Base 4.9.0
+ xfce_rc_has_entry at Base 4.9.0
+ xfce_rc_has_group at Base 4.9.0
+ xfce_rc_is_dirty at Base 4.9.0
+ xfce_rc_is_readonly at Base 4.9.0
+ xfce_rc_read_bool_entry at Base 4.9.0
+ xfce_rc_read_entry at Base 4.9.0
+ xfce_rc_read_entry_untranslated at Base 4.9.0
+ xfce_rc_read_int_entry at Base 4.9.0
+ xfce_rc_read_list_entry at Base 4.9.0
+ xfce_rc_rollback at Base 4.9.0
+ xfce_rc_set_group at Base 4.9.0
+ xfce_rc_simple_open at Base 4.9.0
+ xfce_rc_write_bool_entry at Base 4.9.0
+ xfce_rc_write_entry at Base 4.9.0
+ xfce_rc_write_int_entry at Base 4.9.0
+ xfce_rc_write_list_entry at Base 4.9.0
+ xfce_resource_dirs at Base 4.9.0
+ xfce_resource_lookup at Base 4.9.0
+ xfce_resource_lookup_all at Base 4.9.0
+ xfce_resource_match at Base 4.9.0
+ xfce_resource_match_custom at Base 4.9.0
+ xfce_resource_pop_path at Base 4.9.0
+ xfce_resource_push_path at Base 4.9.0
+ xfce_resource_save_location at Base 4.9.0
+ xfce_setenv at Base 4.9.0
+ xfce_strjoin at Base 4.9.0
+ xfce_textdomain at Base 4.9.0
+ xfce_unsetenv at Base 4.9.0
+ xfce_utf8_remove_controls at Base 4.9.0
+ xfce_utf8_strndup at Base 4.9.0
+ xfce_version_string at Base 4.9.0
Copied: desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh (from rev 7388, desktop/branches/experimental/libxfce4util/debian/patches/02_fix-abicheck.sh)
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh (rev 0)
+++ desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh 2013-05-21 18:48:32 UTC (rev 7391)
@@ -0,0 +1,16 @@
+Description: fix abicheck.sh for ppc64
+Author: Aurelien Jarno <aurel32 at debian.org>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9146
+Bug-Debian: http://bugs.debian.org/682414
+
+Index: libxfce4util-4.10.0/libxfce4util/abicheck.sh
+===================================================================
+--- libxfce4util-4.10.0.orig/libxfce4util/abicheck.sh 2012-04-28 21:29:28.000000000 +0200
++++ libxfce4util-4.10.0/libxfce4util/abicheck.sh 2012-07-22 20:30:20.444917571 +0200
+@@ -20,5 +20,5 @@
+ #
+
+ cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/libxfce4util.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
+-nm -D .libs/libxfce4util.so | grep " T\|R\|G " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi
++nm -D .libs/libxfce4util.so | grep " T\|R\|G\|D " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi
+ diff -u expected-abi actual-abi && rm expected-abi actual-abi
Modified: desktop/trunk/libxfce4util/debian/patches/series
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/series 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/patches/series 2013-05-21 18:48:32 UTC (rev 7391)
@@ -1 +1,2 @@
01_add-desktop-base-in-config-dirs.patch
+02_fix-abicheck.sh
Modified: desktop/trunk/libxfce4util/debian/rules
===================================================================
--- desktop/trunk/libxfce4util/debian/rules 2013-05-21 18:46:36 UTC (rev 7390)
+++ desktop/trunk/libxfce4util/debian/rules 2013-05-21 18:48:32 UTC (rev 7391)
@@ -1,20 +1,13 @@
#!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
-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)
-
-export CFLAGS LDFLAGS
-
override_dh_install:
- rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4util.la
- dh_install --fail-missing
+ dh_install --fail-missing -X .la
override_dh_strip:
- dh_strip --dbg-package=libxfce4util4-dbg
+ dh_strip --dbg-package=libxfce4util6-dbg
%:
- dh $@
+ dh $@ --parallel
More information about the Pkg-xfce-commits
mailing list