[Pkg-xfce-commits] r4222 - desktop/branches/lenny-backports/xfconf/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Aug 15 02:41:02 UTC 2010
Author: corsac
Date: 2010-08-15 14:40:55 +0000 (Sun, 15 Aug 2010)
New Revision: 4222
Added:
desktop/branches/lenny-backports/xfconf/debian/libxfconf-0-dev.docs
desktop/branches/lenny-backports/xfconf/debian/source/
desktop/branches/lenny-backports/xfconf/debian/xfconf.manpages
Modified:
desktop/branches/lenny-backports/xfconf/debian/changelog
desktop/branches/lenny-backports/xfconf/debian/control
desktop/branches/lenny-backports/xfconf/debian/rules
desktop/branches/lenny-backports/xfconf/debian/watch
desktop/branches/lenny-backports/xfconf/debian/xfconf-query.1
desktop/branches/lenny-backports/xfconf/debian/xfconf.install
Log:
merge changes from latest version in squeeze to backports
Modified: desktop/branches/lenny-backports/xfconf/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/changelog 2010-08-15 14:28:52 UTC (rev 4221)
+++ desktop/branches/lenny-backports/xfconf/debian/changelog 2010-08-15 14:40:55 UTC (rev 4222)
@@ -1,9 +1,44 @@
-xfconf (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+xfconf (4.6.2-1~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 30 Jun 2009 07:11:03 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Aug 2010 16:33:08 +0200
+xfconf (4.6.2-1) unstable; urgency=low
+
+ [ Stefan Ott ]
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * debian/control:
+ - add build-dep on intltool.
+ - update standards version to 3.8.4.
+ * Switch to 3.0 (quilt) source format.
+
+ [ Lionel Le Folgoc ]
+ * debian/xfconf.install: refreshed.
+ * debian/xfconf.manpages, debian/libxfconf-0-dev.docs: added.
+ * debian/control:
+ - add myself to Uploaders
+ - bump debhelper b-dep to (>= 7.0.50~) for overrides.
+ * debian/rules:
+ - switch to rules.tiny with overrides
+ - disable tests, they need dbus.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 22 May 2010 13:18:23 +0200
+
+xfconf (4.6.1-2) unstable; urgency=low
+
+ * debian/control:
+ - correct description, xfsettingsd is in xfce4-settings package.
+ - update standards version to 3.8.3.
+ - add depends on ${misc:Depends}.
+ * debian/xfconf-query.1:
+ - update xfconf-query manpage from latest version.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 30 Dec 2009 12:56:57 +0100
+
xfconf (4.6.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/branches/lenny-backports/xfconf/debian/control
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/control 2010-08-15 14:28:52 UTC (rev 4221)
+++ desktop/branches/lenny-backports/xfconf/debian/control 2010-08-15 14:40:55 UTC (rev 4222)
@@ -2,11 +2,13 @@
Section: xfce
Priority: optional
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>, Michael Casadevall <sonicmctails at gmail.com>
-Build-Depends: debhelper (>= 7.0.13), libxfce4util-dev (>= 4.6.0),
+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
-Standards-Version: 3.8.1
+ libextutils-depends-perl, libglib-perl, intltool
+Standards-Version: 3.8.4
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/
@@ -14,7 +16,7 @@
Package: libxfconf-0-dev
Section: libdevel
Architecture: any
-Depends: libxfconf-0-2 (= ${binary:Version}), libdbus-1-dev,
+Depends: libxfconf-0-2 (= ${binary:Version}), ${misc:Depends}, libdbus-1-dev,
libdbus-glib-1-dev, pkg-config, libglib2.0-dev
Description: Development files for libxfconf
This package contains the development files libxfconf which are
@@ -28,7 +30,7 @@
Package: libxfconf-0-2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, xfconf
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfconf
Description: Client library for Xfce4 configure interface
This package contains a library which can be used by every
program that aims to be a configuration-manager for Xfce4.
@@ -40,7 +42,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${shlibs:Depends}, libxfconf-0-2 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfconf-0-2 (= ${binary:Version})
Description: debugging informations for libxfconf
This package contains debugging symbols for libxfconf, which
provides basic functions for the Xfce4 configuration tool.
@@ -48,10 +50,9 @@
Package: xfconf
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}, dbus-x11
+Depends: ${shlibs:Depends}, ${misc:Depends}, dbus-x11
Recommends: ${shlibs:Recommends}
Description: utilities for managing settings in Xfce
- xfconf contains xfconfd and xfconf-query and xfsettingsd.
+ xfconf contains xfconfd and xfconf-query.
- xfconfd handles the Xfce settings storage
- xfconf-query enables users to tune settings from command line
- - xfsettings is an Xsettings daemon, queried by xfconfd
Copied: desktop/branches/lenny-backports/xfconf/debian/libxfconf-0-dev.docs (from rev 4058, desktop/trunk/xfconf/debian/libxfconf-0-dev.docs)
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/libxfconf-0-dev.docs (rev 0)
+++ desktop/branches/lenny-backports/xfconf/debian/libxfconf-0-dev.docs 2010-08-15 14:40:55 UTC (rev 4222)
@@ -0,0 +1,2 @@
+TODO
+NEWS
Modified: desktop/branches/lenny-backports/xfconf/debian/rules
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/rules 2010-08-15 14:28:52 UTC (rev 4221)
+++ desktop/branches/lenny-backports/xfconf/debian/rules 2010-08-15 14:40:55 UTC (rev 4222)
@@ -1,77 +1,27 @@
#!/usr/bin/make -f
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
-CFLAGS = -Wall -g
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-config.status: configure
-
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --enable-final --disable-perl-bindings --libexecdir=\$${prefix}/lib
+%:
+ dh $@
-build: build-stamp
-build-stamp: config.status
-
- dh_testdir
- $(MAKE)
- touch build-stamp
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-final --disable-perl-bindings
-clean:
-
- dh_testdir
- dh_testroot
- rm -f build-stamp
+override_dh_auto_test:
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
-
-install: build
-
- dh_testdir
- dh_testroot
- dh_prep
- dh_clean
- dh_installdirs
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+override_dh_install:
rm -f $(CURDIR)/debian/tmp/usr/lib/libxfconf-0.la
-
-binary-indep: build install
-binary-arch: build install
-
- dh_testdir
- dh_testroot
-
- dh_installchangelogs ChangeLog
- dh_installdocs NEWS TODO
-
- dh_installman -pxfconf debian/xfconf-query.1
-
dh_install --fail-missing --sourcedir=debian/tmp
+
+override_dh_strip:
dh_strip --dbg-package=libxfconf-0-2-dbg
- dh_compress
- dh_fixperms
-
- dh_makeshlibs -V 'libxfconf-0-2 (>= 4.6.0)'
- dh_installdeb
-
+override_dh_shlibdeps:
dh_shlibdeps -X debian/xfconf/usr/bin/xfconf-query -- \
-dRecommends debian/xfconf/usr/bin/xfconf-query -dDepends
- dh_gencontrol
-
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Modified: desktop/branches/lenny-backports/xfconf/debian/watch
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/watch 2010-08-15 14:28:52 UTC (rev 4221)
+++ desktop/branches/lenny-backports/xfconf/debian/watch 2010-08-15 14:40:55 UTC (rev 4222)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- xfconf-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/xfconf/([\d\.]+)/ \
+ xfconf-([\d\.]+)\.tar\.(?:gz|bz2)
Modified: desktop/branches/lenny-backports/xfconf/debian/xfconf-query.1
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/xfconf-query.1 2010-08-15 14:28:52 UTC (rev 4221)
+++ desktop/branches/lenny-backports/xfconf/debian/xfconf-query.1 2010-08-15 14:40:55 UTC (rev 4222)
@@ -1,14 +1,14 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH XFCONF-QUERY "1" "January 2009" "xfconf-query 4.5.92" "User Commands"
+.TH XFCONF-QUERY "1" "November 2009" "xfconf-query 4.6.1" "User Commands"
.SH NAME
-xfconf-query \- Command line utility for xfconf
+xfconf-query \- Command line utility for xfconf system
.SH DESCRIPTION
.SS "Usage:"
.IP
xfconf\-query [OPTION...] \- xfconf commandline utility
.SS "Help Options:"
.TP
-\-?, \fB\-\-help\fR
+\fB\-h\fR, \fB\-\-help\fR
Show help options
.SS "Application Options:"
.TP
@@ -16,22 +16,22 @@
Version information
.TP
\fB\-c\fR, \fB\-\-channel\fR
-Pick the channel
+The channel to query/modify
.TP
\fB\-p\fR, \fB\-\-property\fR
-Pick the property
+The property to query/modify
.TP
\fB\-s\fR, \fB\-\-set\fR
-Change or set the value of the property
+The new value to set for the property
.TP
\fB\-l\fR, \fB\-\-list\fR
-List properties (or channels if \fB\-c\fR isn't specified)
+List properties (or channels if \fB\-c\fR is not specified)
.TP
\fB\-v\fR, \fB\-\-verbose\fR
Verbose output
.TP
\fB\-n\fR, \fB\-\-create\fR
-Create new entry
+Create a new property if it does not already exist
.TP
\fB\-t\fR, \fB\-\-type\fR
Specify the property value type
@@ -45,11 +45,5 @@
\fB\-a\fR, \fB\-\-force\-array\fR
Force array even if only one element
.TP
-\fB\-x\fR, \fB\-\-export\fR
-Export channel to file
-.TP
-\fB\-i\fR, \fB\-\-import\fR
-Import channel from file
-.TP
\fB\-m\fR, \fB\-\-monitor\fR
Monitor a channel for property changes
Modified: desktop/branches/lenny-backports/xfconf/debian/xfconf.install
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/xfconf.install 2010-08-15 14:28:52 UTC (rev 4221)
+++ desktop/branches/lenny-backports/xfconf/debian/xfconf.install 2010-08-15 14:40:55 UTC (rev 4222)
@@ -1,4 +1,4 @@
usr/share/dbus-1
usr/share/locale
usr/bin
-usr/lib/xfconfd
+usr/lib/xfconf/xfconfd
Copied: desktop/branches/lenny-backports/xfconf/debian/xfconf.manpages (from rev 4058, desktop/trunk/xfconf/debian/xfconf.manpages)
===================================================================
--- desktop/branches/lenny-backports/xfconf/debian/xfconf.manpages (rev 0)
+++ desktop/branches/lenny-backports/xfconf/debian/xfconf.manpages 2010-08-15 14:40:55 UTC (rev 4222)
@@ -0,0 +1 @@
+debian/xfconf-query.1
More information about the Pkg-xfce-commits
mailing list