[Pkg-xfce-commits] r5155 - desktop/trunk/libxfce4util/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Wed Mar 30 03:00:39 UTC 2011
Author: corsac
Date: 2011-03-30 15:00:29 +0000 (Wed, 30 Mar 2011)
New Revision: 5155
Added:
desktop/trunk/libxfce4util/debian/libxfce4util4.symbols
Modified:
desktop/trunk/libxfce4util/debian/changelog
desktop/trunk/libxfce4util/debian/control
desktop/trunk/libxfce4util/debian/copyright
desktop/trunk/libxfce4util/debian/rules
Log:
merge experimental branch
Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog 2011-03-30 14:39:13 UTC (rev 5154)
+++ desktop/trunk/libxfce4util/debian/changelog 2011-03-30 15:00:29 UTC (rev 5155)
@@ -1,3 +1,35 @@
+libxfce4util (4.8.1-2) UNRELEASED; urgency=low
+
+ * debian/control:
+ - update section to xfce.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 06 Feb 2011 16:48:19 +0100
+
+libxfce4util (4.8.1-1) experimental; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream development release.
+ * debian/libxfce4util.shlibs: bump package version to 4.7.0.
+ * debian/rules:
+ - add hardening flags to {C,LD}FLAGS
+ * debian/control:
+ - add build-dep on hardening-includes
+
+ [ Lionel Le Folgoc ]
+ * debian/libxfce4util4.symbols: added.
+ * debian/libxfce4util4.shlibs: dropped, not needed.
+ * debian/rules:
+ - call dpkg-buildflags instead of doing manual tests
+ - invoke dh_install with --fail-missing.
+ * debian/control:
+ - bump Standards-Version to 3.9.1, no change required
+ - drop some trailing spaces
+ - add myself to Uploaders.
+ * debian/copyright: refreshed.
+ * debian/README.source: dropped.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 06 Feb 2011 16:34:51 +0100
+
libxfce4util (4.6.2-1) unstable; urgency=low
[Yves-Alexis Perez]
@@ -16,6 +48,24 @@
-- Yves-Alexis Perez <corsac at debian.org> Sun, 23 May 2010 12:51:37 +0200
+libxfce4util (4.6.2-1) unstable; urgency=low
+
+ [Yves-Alexis Perez]
+ * New upstream release.
+ * debian/control:
+ - bump standards version to 3.8.4.
+ - add build-dep on intltool.
+ - drop quilt and chrpath build-deps.
+ - bump debhelper build-deps for overrides.
+ * debian/rules:
+ - switch to debhelper 7.
+ * switch to 3.0 (quilt) source format.
+
+ [Stefan Ott]
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 23 May 2010 12:51:37 +0200
+
libxfce4util (4.6.1-2) unstable; urgency=low
* debian/control:
Modified: desktop/trunk/libxfce4util/debian/control
===================================================================
--- desktop/trunk/libxfce4util/debian/control 2011-03-30 14:39:13 UTC (rev 5154)
+++ desktop/trunk/libxfce4util/debian/control 2011-03-30 15:00:29 UTC (rev 5155)
@@ -2,29 +2,29 @@
Priority: optional
Section: xfce
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, intltool
-Standards-Version: 3.8.4
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ 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.1
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/
Package: libxfce4util-dev
-Section: libdevel
Architecture: any
Depends: libxfce4util4 (= ${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
+ for the Xfce4 desktop environment, you need to install
this package.
.
- The libxfce4util4 Reference Manual is also included and
+ The libxfce4util4 Reference Manual is also included and
it can be consulted using Devhelp or a web browser.
Package: libxfce4util4
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util-common
Recommends: libxfce4util-bin
@@ -43,7 +43,6 @@
utility function library for Xfce4.
Package: libxfce4util-bin
-Section: xfce
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libxfce4util4 (<< 4.6.1-2)
@@ -54,7 +53,6 @@
- xfce4-kiosk-query: query Xfce kiosk capabilities.
Package: libxfce4util-common
-Section: xfce
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libxfce4util4 (<< 4.6.1-2)
Modified: desktop/trunk/libxfce4util/debian/copyright
===================================================================
--- desktop/trunk/libxfce4util/debian/copyright 2011-03-30 14:39:13 UTC (rev 5154)
+++ desktop/trunk/libxfce4util/debian/copyright 2011-03-30 15:00:29 UTC (rev 5155)
@@ -4,14 +4,82 @@
libxfce4util can be downloaded from the official Xfce4 website, which is
http://www.xfce.org/
-Upstream author and copyright holders are:
-© 2002-2007 Benedikt Meurer <benny at xfce.org>
-© 2004 Jasper Huijsmans <jasper at xfce.org>
-© 2003 Olivier Fourdan <fourdan at xfce.org>
+Upstream author and copyright holders are:
-Maarten Boekhold <boekhold at emirates.net.ae>, cygwin patches.
+Files: libxfce4util/debug.h
+ libxfce4util/libxfce4util-config.c
+ libxfce4util/libxfce4util-private.c
+ libxfce4util/libxfce4util-private.h
+ libxfce4util/libxfce4util.h
+ libxfce4util/util.h
+ libxfce4util/xfce-fileutils.c
+ libxfce4util/xfce-fileutils.h
+ libxfce4util/xfce-generics.h
+ libxfce4util/xfce-kiosk.c
+ libxfce4util/xfce-kiosk.h
+ libxfce4util/xfce-license.c
+ libxfce4util/xfce-license.h
+ libxfce4util/xfce-miscutils.c
+ libxfce4util/xfce-miscutils.h
+ libxfce4util/xfce-private.h
+ libxfce4util/xfce-rc-config.c
+ libxfce4util/xfce-rc-private.h
+ libxfce4util/xfce-rc-simple.c
+ libxfce4util/xfce-rc.c
+ 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>
+License: LGPL-2+
-libxfce4util/abicheck.sh contains code © 2004 The GLib Development Team.
+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
+ libxfce4util/xfce-i18n.h
+Copyright: 2003-2006, Benedikt Meurer <benny at xfce.org>
+ 2004, Jasper Huijsman <jasper at xfce.org>
+License: LGPL-2+
+
+Files: libxfce4util/utf8.h
+ libxfce4util/xfce-utf8.c
+ libxfce4util/xfce-utf8.h
+Copyright: 2003, Olivier Fourdan <fourdan 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>
+License: LGPL-2+
+
+Files: libxfce4util/xfce-posix-signal-handler.c
+ libxfce4util/xfce-posix-signal-handler.h
+Copyright: 2007, Brian Tarricone <bjt23 at cornell.edu>
+License: LGPL-2+
+
License:
This package is free software; you can redistribute it and/or
Copied: desktop/trunk/libxfce4util/debian/libxfce4util4.symbols (from rev 5154, desktop/branches/experimental/libxfce4util/debian/libxfce4util4.symbols)
===================================================================
--- desktop/trunk/libxfce4util/debian/libxfce4util4.symbols (rev 0)
+++ desktop/trunk/libxfce4util/debian/libxfce4util4.symbols 2011-03-30 15:00:29 UTC (rev 5155)
@@ -0,0 +1,79 @@
+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
Modified: desktop/trunk/libxfce4util/debian/rules
===================================================================
--- desktop/trunk/libxfce4util/debian/rules 2011-03-30 14:39:13 UTC (rev 5154)
+++ desktop/trunk/libxfce4util/debian/rules 2011-03-30 15:00:29 UTC (rev 5155)
@@ -1,12 +1,18 @@
#!/usr/bin/make -f
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+include /usr/share/hardening-includes/hardening.make
+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
+
override_dh_strip:
dh_strip --dbg-package=libxfce4util4-dbg
More information about the Pkg-xfce-commits
mailing list