[Pkg-xfce-commits] r5157 - desktop/trunk/xfconf/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Wed Mar 30 03:25:05 UTC 2011
Author: corsac
Date: 2011-03-30 15:24:59 +0000 (Wed, 30 Mar 2011)
New Revision: 5157
Added:
desktop/trunk/xfconf/debian/libxfconf-0-2.symbols
Modified:
desktop/trunk/xfconf/debian/changelog
desktop/trunk/xfconf/debian/control
desktop/trunk/xfconf/debian/copyright
desktop/trunk/xfconf/debian/rules
desktop/trunk/xfconf/debian/xfconf.install
Log:
merge xfconf from experimental
Modified: desktop/trunk/xfconf/debian/changelog
===================================================================
--- desktop/trunk/xfconf/debian/changelog 2011-03-30 15:03:50 UTC (rev 5156)
+++ desktop/trunk/xfconf/debian/changelog 2011-03-30 15:24:59 UTC (rev 5157)
@@ -1,3 +1,43 @@
+xfconf (4.8.0-3) UNRELEASED; urgency=low
+
+ * debian/control:
+ - drop the build-conflict, not really supported for that purpose and 8.1.0
+ isn't available anywhere anymore anyway.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Feb 2011 18:42:29 +0100
+
+xfconf (4.8.0-2) experimental; urgency=low
+
+ * debian/control:
+ - add debhelper build-conflicts to avoid 8.1.0 because we use
+ --remaining-packages in overrides rules.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 20 Feb 2011 14:57:08 +0100
+
+xfconf (4.8.0-1) experimental; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/control:
+ - add build-dep on hardening-includes
+ * debian/rules:
+ - add hardening flags to {C,LD}FLAGS.
+ * debian/xfconf.install:
+ - update xfconfd path.
+ * debian/copyright updated for new release.
+
+ [ Lionel Le Folgoc ]
+ * debian/libxfconf-0-2.symbols: added.
+ * debian/rules:
+ - call dpkg-buildflags instead of doing manual tests
+ - call dh_shlibdeps with special options only for xfconf; use
+ --remaining-packages for the others.
+ * debian/control:
+ - bump Standards-Version to 3.9.1, no further change.
+ - bump required libxfce4util-dev b-dep to >= 4.8.0.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 06 Feb 2011 16:49:50 +0100
+
xfconf (4.6.2-1) unstable; urgency=low
[ Stefan Ott ]
Modified: desktop/trunk/xfconf/debian/control
===================================================================
--- desktop/trunk/xfconf/debian/control 2011-03-30 15:03:50 UTC (rev 5156)
+++ desktop/trunk/xfconf/debian/control 2011-03-30 15:24:59 UTC (rev 5157)
@@ -5,10 +5,10 @@
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.6.0),
- libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl,
- libextutils-depends-perl, libglib-perl, intltool
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev (>= 4.8.0),
+ libdbus-1-dev, libdbus-glib-1-dev, libextutils-pkgconfig-perl,
+ libextutils-depends-perl, libglib-perl, intltool, hardening-includes
+Standards-Version: 3.9.1
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfconf/
Modified: desktop/trunk/xfconf/debian/copyright
===================================================================
--- desktop/trunk/xfconf/debian/copyright 2011-03-30 15:03:50 UTC (rev 5156)
+++ desktop/trunk/xfconf/debian/copyright 2011-03-30 15:24:59 UTC (rev 5157)
@@ -8,47 +8,101 @@
Brian J. Tarricone <bjt23 at cornell.edu>
Stephan Arts <stephan at xfce.org>
+Files: common/xfconf-common-private.h
+ common/xfconf-errors.c
+ common/xfconf-gvaluefuncs.c
+ common/xfconf-gvaluefuncs.h
+ common/xfconf-types.c
+ tests/get-properties/t-get-arrayv.c
+ tests/get-properties/t-get-boolean.c
+ tests/get-properties/t-get-double.c
+ tests/get-properties/t-get-int.c
+ tests/get-properties/t-get-string.c
+ tests/get-properties/t-get-stringlist.c
+ tests/get-properties/t-get-uint64.c
+ tests/has-properties/t-has-arrayv.c
+ tests/has-properties/t-has-boolean.c
+ tests/has-properties/t-has-double.c
+ tests/has-properties/t-has-int.c
+ tests/has-properties/t-has-string.c
+ tests/has-properties/t-has-stringlist.c
+ tests/has-properties/t-has-uint64.c
+ tests/list-channels/t-list-channels.c
+ tests/property-changed-signal/t-string-changed-signal-detailed.c
+ tests/property-changed-signal/t-string-changed-signal.c
+ tests/reset-properties/t-reset-arrayv.c
+ tests/reset-properties/t-reset-boolean.c
+ tests/reset-properties/t-reset-double.c
+ tests/reset-properties/t-reset-int.c
+ tests/reset-properties/t-reset-string.c
+ tests/reset-properties/t-reset-stringlist.c
+ tests/reset-properties/t-reset-uint64.c
+ tests/set-properties/t-set-arrayv.c
+ tests/set-properties/t-set-boolean.c
+ tests/set-properties/t-set-double.c
+ tests/set-properties/t-set-int.c
+ tests/set-properties/t-set-string.c
+ tests/set-properties/t-set-stringlist.c
+ tests/set-properties/t-set-uint64.c
+ tests/tests-common.h
+ xfconf/xfconf-binding.h
+ xfconf/xfconf-channel.c
+ xfconf/xfconf-channel.h
+ xfconf/xfconf-errors.h
+ xfconf/xfconf-private.h
+ xfconf/xfconf-types.h
+ xfconf/xfconf.c
+ xfconf/xfconf.h
+ xfconfd/main.c
+ xfconfd/xfconf-backend-factory.c
+ xfconfd/xfconf-backend-factory.h
+ xfconfd/xfconf-backend-perchannel-xml.c
+ xfconfd/xfconf-backend-perchannel-xml.h
+ xfconfd/xfconf-backend.c
+ xfconfd/xfconf-backend.h
+ xfconfd/xfconf-daemon.c
+ xfconfd/xfconf-daemon.h
+ xfconfd/xfconf-locking-utils.c
+ xfconfd/xfconf-locking-utils.h
+Copyright: 2007, Brian Tarricone <bjt23 at cornell.edu>
+ 2007-2008, Brian Tarricone <bjt23 at cornell.edu>
+ 2007-2009, Brian Tarricone <bjt23 at cornell.edu>
+ 2008, Brian Tarricone <bjt23 at cornell.edu>
+License: GPL-2
-common/*
- © 2007 Brian Tarricone <bjt23 at cornell.edu>
- License: GPL-2
-common/xfconf-gvaluefuncs.c:
-common/xfconf-gvaluefuncs.h:
-common/xfconf-common-private.h:
- © 2008 Brian Tarricone <bjt23 at cornell.edu>
-common/make-exo-alias.pl:
- © 2004 The GLib Development Team.
- © 2005 Benedikt Meurer <benny at xfce.org>
- License: LGPL-2+
+Files: xfconf-perl/xs/Xfconf.xs
+ xfconf-perl/xs/XfconfBinding.xs
+ xfconf-perl/xs/XfconfChannel.xs
+Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
+License: LGPL-2+
-tests/*:
- © 2007 Brian Tarricone <bjt23 at cornell.edu>
- License: GPL-2
-tests/list-channels/t-list-channels.c:
-tests/property-changed-signal/t-string-changed-signal.c:
-tests/property-changed-signal/t-string-changed-signal-detailed.c:
- © 2008 Brian Tarricone <bjt23 at cornell.edu>
+Files: xfconf/xfconf-cache.c
+ xfconf/xfconf-cache.h
+Copyright: 2009, Brian Tarricone <brian at tarricone.org>
+License: GPL-2
-xfconf/*:
- © 2007 Brian Tarricone <bjt23 at cornell.edu>
- License: GPL-2
-xfconf/xfconf-binding.h:
- © 2008 Brian Tarricone <bjt23 at cornell.edu>
-xfconf/abicheck.sh:
- © 2004 The GLib Development Team.
- © 2005 Benedikt Meurer <benny at xfce.org>
-xfconf/xfconf-binding.c:
- © 2008 Brian Tarricone <bjt23 at cornell.edu>
-xfconf-query/main.c:
- © 2008 Stephan Arts <stephan at xfce.org>
- © 2008 Brian Tarricone <bjt23 at cornell.edu>
-xfsettingsd/registry.h:
- © 2008 Stephan Arts <stephan at xfce.org>
- © 2001 Red Hat, Inc.
-xfsettingsd/main.c:
- © 2008 Stephan Arts <stephan at xfce.org>
+Files: common/make-exo-alias.pl
+ xfconf/abicheck.sh
+Copyright: 2004, The GLib Development Team
+ 2005, Benedikt Meurer <benny at xfce.org>
+License: LGPL-2+
+
+Files: xfconf/xfconf-binding.c
+Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
+ 2009, Nick Schermer <nick at xfce.org>
+License: GPL-2
+
+Files: tests/object-bindings/t-object-bindings.c
+Copyright: 2009, Nick Schermer <nick at xfce.org>
+License: GPL-2
+
+Files: xfconf-query/main.c
+Copyright: 2008, Brian Tarricone <bjt23 at cornell.edu>
+ 2008, Stephan Arts <stephan at xfce.org>
+License: GPL-2+
+
On Debian systems, the complete text of the GNU General Public License (version
-2) can be found in the file `/usr/share/common-licenses/GPL-2' and the
-complete text of the GNU Lesser General Public License (version 2 or later)
-can be found in `/usr/share/common-licenses/LGPL'.
+2) can be found in the file `/usr/share/common-licenses/GPL-2' and the complete
+text of the GNU Lesser General Public License (version 2 or later) can be found
+in `/usr/share/common-licenses/LGPL'.
Copied: desktop/trunk/xfconf/debian/libxfconf-0-2.symbols (from rev 5156, desktop/branches/experimental/xfconf/debian/libxfconf-0-2.symbols)
===================================================================
--- desktop/trunk/xfconf/debian/libxfconf-0-2.symbols (rev 0)
+++ desktop/trunk/xfconf/debian/libxfconf-0-2.symbols 2011-03-30 15:24:59 UTC (rev 5157)
@@ -0,0 +1,57 @@
+libxfconf-0.so.2 libxfconf-0-2 #MINVER#
+ xfconf_array_free at Base 4.6.0
+ xfconf_channel_get at Base 4.6.0
+ xfconf_channel_get_array at Base 4.6.0
+ xfconf_channel_get_array_valist at Base 4.6.0
+ xfconf_channel_get_arrayv at Base 4.6.0
+ xfconf_channel_get_bool at Base 4.6.0
+ xfconf_channel_get_double at Base 4.6.0
+ xfconf_channel_get_int at Base 4.6.0
+ xfconf_channel_get_named_struct at Base 4.6.0
+ xfconf_channel_get_properties at Base 4.6.0
+ xfconf_channel_get_property at Base 4.6.0
+ xfconf_channel_get_string at Base 4.6.0
+ xfconf_channel_get_string_list at Base 4.6.0
+ xfconf_channel_get_struct at Base 4.6.0
+ xfconf_channel_get_struct_valist at Base 4.6.0
+ xfconf_channel_get_structv at Base 4.6.0
+ xfconf_channel_get_type at Base 4.6.0
+ xfconf_channel_get_uint64 at Base 4.6.0
+ xfconf_channel_get_uint at Base 4.6.0
+ xfconf_channel_has_property at Base 4.6.0
+ xfconf_channel_is_property_locked at Base 4.6.0
+ xfconf_channel_new at Base 4.6.0
+ xfconf_channel_new_with_property_base at Base 4.6.0
+ xfconf_channel_reset_property at Base 4.6.0
+ xfconf_channel_set_array at Base 4.6.0
+ xfconf_channel_set_array_valist at Base 4.6.0
+ xfconf_channel_set_arrayv at Base 4.6.0
+ xfconf_channel_set_bool at Base 4.6.0
+ xfconf_channel_set_double at Base 4.6.0
+ xfconf_channel_set_int at Base 4.6.0
+ xfconf_channel_set_named_struct at Base 4.6.0
+ xfconf_channel_set_property at Base 4.6.0
+ xfconf_channel_set_string at Base 4.6.0
+ xfconf_channel_set_string_list at Base 4.6.0
+ xfconf_channel_set_struct at Base 4.6.0
+ xfconf_channel_set_struct_valist at Base 4.6.0
+ xfconf_channel_set_structv at Base 4.6.0
+ xfconf_channel_set_uint64 at Base 4.6.0
+ xfconf_channel_set_uint at Base 4.6.0
+ xfconf_error_get_type at Base 4.6.0
+ xfconf_g_property_bind at Base 4.6.0
+ xfconf_g_property_bind_gdkcolor at Base 4.6.0
+ xfconf_g_property_unbind at Base 4.6.0
+ xfconf_g_property_unbind_all at Base 4.6.0
+ xfconf_g_property_unbind_by_property at Base 4.6.0
+ xfconf_g_value_get_int16 at Base 4.6.0
+ xfconf_g_value_get_uint16 at Base 4.6.0
+ xfconf_g_value_set_int16 at Base 4.6.0
+ xfconf_g_value_set_uint16 at Base 4.6.0
+ xfconf_get_error_quark at Base 4.6.0
+ xfconf_init at Base 4.6.0
+ xfconf_int16_get_type at Base 4.6.0
+ xfconf_list_channels at Base 4.6.0
+ xfconf_named_struct_register at Base 4.6.0
+ xfconf_shutdown at Base 4.6.0
+ xfconf_uint16_get_type at Base 4.6.0
Modified: desktop/trunk/xfconf/debian/rules
===================================================================
--- desktop/trunk/xfconf/debian/rules 2011-03-30 15:03:50 UTC (rev 5156)
+++ desktop/trunk/xfconf/debian/rules 2011-03-30 15:24:59 UTC (rev 5157)
@@ -1,12 +1,14 @@
#!/usr/bin/make -f
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+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
+
%:
dh $@
@@ -23,5 +25,6 @@
dh_strip --dbg-package=libxfconf-0-2-dbg
override_dh_shlibdeps:
- dh_shlibdeps -X debian/xfconf/usr/bin/xfconf-query -- \
+ dh_shlibdeps -p xfconf -X debian/xfconf/usr/bin/xfconf-query -- \
-dRecommends debian/xfconf/usr/bin/xfconf-query -dDepends
+ dh_shlibdeps --remaining-packages
Modified: desktop/trunk/xfconf/debian/xfconf.install
===================================================================
--- desktop/trunk/xfconf/debian/xfconf.install 2011-03-30 15:03:50 UTC (rev 5156)
+++ desktop/trunk/xfconf/debian/xfconf.install 2011-03-30 15:24:59 UTC (rev 5157)
@@ -1,4 +1,4 @@
usr/share/dbus-1
usr/share/locale
usr/bin
-usr/lib/xfconf/xfconfd
+usr/lib/xfce4/xfconf/xfconfd
More information about the Pkg-xfce-commits
mailing list