[Pkg-xfce-commits] r4221 - desktop/branches/lenny-backports/libxfce4util/debian

Yves-Alexis Perez corsac at alioth.debian.org
Sun Aug 15 02:29:03 UTC 2010 

Author: corsac
Date: 2010-08-15 14:28:52 +0000 (Sun, 15 Aug 2010)
New Revision: 4221

Added:
   desktop/branches/lenny-backports/libxfce4util/debian/README.source
   desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.install
   desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.manpages
   desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-common.install
   desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-dev.docs
   desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.shlibs
   desktop/branches/lenny-backports/libxfce4util/debian/source/
Modified:
   desktop/branches/lenny-backports/libxfce4util/debian/changelog
   desktop/branches/lenny-backports/libxfce4util/debian/control
   desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.install
   desktop/branches/lenny-backports/libxfce4util/debian/rules
   desktop/branches/lenny-backports/libxfce4util/debian/watch
   desktop/branches/lenny-backports/libxfce4util/debian/xfce4-kiosk-query.8
Log:
merge backport from latest version in squeeze


Copied: desktop/branches/lenny-backports/libxfce4util/debian/README.source (from rev 4058, desktop/trunk/libxfce4util/debian/README.source)
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/README.source	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4util/debian/README.source	2010-08-15 14:28:52 UTC (rev 4221)
@@ -0,0 +1,2 @@
+This package uses quilt patch system to apply patch at build-time. More
+information can be found in /usr/share/doc/quilt/README.source.

Modified: desktop/branches/lenny-backports/libxfce4util/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/changelog	2010-08-15 14:26:13 UTC (rev 4220)
+++ desktop/branches/lenny-backports/libxfce4util/debian/changelog	2010-08-15 14:28:52 UTC (rev 4221)
@@ -1,9 +1,44 @@
-libxfce4util (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+libxfce4util (4.6.2-1~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 25 Apr 2009 19:43:41 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 15 Aug 2010 16:21:54 +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:
+    - update standards version to 3.8.3.
+    - add depends on ${misc:Depends}.
+    - add two binary packages (-bin and -common) to ease
+      multiple-versions installations.
+  * debian/xfce4-kiosk-query.8: fix typo.
+  * debian/rules:
+    - stop installing debian/xfce4-kiosk-query.8, it'll be done automagically.
+    - stop doing shlibs, it'll done automagically.
+  * debian/libxfce4util-bin.manpages: add xfce4-kiosk-query.8 to installed
+    manpages.
+  * debian/libxfce4util4.shlibs: give shlibs informations.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 30 Dec 2009 14:29:07 +0100
+
 libxfce4util (4.6.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/lenny-backports/libxfce4util/debian/control
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/control	2010-08-15 14:26:13 UTC (rev 4220)
+++ desktop/branches/lenny-backports/libxfce4util/debian/control	2010-08-15 14:28:52 UTC (rev 4221)
@@ -3,8 +3,8 @@
 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.0), libglib2.0-dev, chrpath, quilt
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev, intltool
+Standards-Version: 3.8.4
 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/
@@ -12,7 +12,7 @@
 Package: libxfce4util-dev
 Section: libdevel
 Architecture: any
-Depends: libxfce4util4 (= ${binary:Version}), libglib2.0-dev
+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
@@ -26,7 +26,8 @@
 Package: libxfce4util4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util-common
+Recommends: libxfce4util-bin
 Description: Utility functions library for Xfce4
  This package contains libxfce4util4, the basic utility
  function library for Xfce4. If you intend to run Xfce4,
@@ -36,7 +37,28 @@
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, libxfce4util4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util4 (= ${binary:Version})
 Description: debugging informations for libxfce4util4
  This package contains debugging symbols for libxfce4util4, the basic
  utility function library for Xfce4.
+
+Package: libxfce4util-bin
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: 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.
+ At the moment, the following programs are included:
+  - 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)
+Replaces: libxfce4util4 (<< 4.6.1-2)
+Description: common files for libxfce4util
+ This package contains various infrastructure-independant common files for
+ libxfce4util, the Xfce utility library.

Copied: desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.install (from rev 4058, desktop/trunk/libxfce4util/debian/libxfce4util-bin.install)
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.install	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.install	2010-08-15 14:28:52 UTC (rev 4221)
@@ -0,0 +1 @@
+usr/sbin/xfce4-kiosk-query

Copied: desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.manpages (from rev 4058, desktop/trunk/libxfce4util/debian/libxfce4util-bin.manpages)
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.manpages	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-bin.manpages	2010-08-15 14:28:52 UTC (rev 4221)
@@ -0,0 +1 @@
+debian/xfce4-kiosk-query.8

Copied: desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-common.install (from rev 4058, desktop/trunk/libxfce4util/debian/libxfce4util-common.install)
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-common.install	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-common.install	2010-08-15 14:28:52 UTC (rev 4221)
@@ -0,0 +1 @@
+usr/share/locale/

Copied: desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-dev.docs (from rev 4058, desktop/trunk/libxfce4util/debian/libxfce4util-dev.docs)
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-dev.docs	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util-dev.docs	2010-08-15 14:28:52 UTC (rev 4221)
@@ -0,0 +1,2 @@
+NEWS
+TODO

Modified: desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.install
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.install	2010-08-15 14:26:13 UTC (rev 4220)
+++ desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.install	2010-08-15 14:28:52 UTC (rev 4221)
@@ -1,3 +1 @@
 usr/lib/lib*.so.*
-usr/sbin/xfce4-kiosk-query
-usr/share/locale/

Copied: desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.shlibs (from rev 4058, desktop/trunk/libxfce4util/debian/libxfce4util4.shlibs)
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.shlibs	                        (rev 0)
+++ desktop/branches/lenny-backports/libxfce4util/debian/libxfce4util4.shlibs	2010-08-15 14:28:52 UTC (rev 4221)
@@ -0,0 +1 @@
+libxfce4util 4 libxfce4util4 (>= 4.6.0)

Modified: desktop/branches/lenny-backports/libxfce4util/debian/rules
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/rules	2010-08-15 14:26:13 UTC (rev 4220)
+++ desktop/branches/lenny-backports/libxfce4util/debian/rules	2010-08-15 14:28:52 UTC (rev 4221)
@@ -1,10 +1,5 @@
 #!/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)
-
-CFLAGS = -Wall -g
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -12,77 +7,8 @@
 endif
 LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
-
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc patch-stamp
-
-config.status: configure patch-stamp
-	
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --enable-final
-
-build: build-stamp
-build-stamp: config.status
-	
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean: unpatch
-	
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-
-	rm -f `pwd`/debian/tmp/usr/lib/libxfce4util.la
-
-	chrpath -d -k `pwd`/debian/tmp/usr/lib/*.so.* \
-		`pwd`/debian/tmp/usr/sbin/*
-
-binary-indep: build install
-binary-arch: build install
-	
-	dh_testdir
-	dh_testroot
-	
-	dh_installchangelogs ChangeLog
-	dh_installdocs NEWS TODO
-	dh_installman -p libxfce4util4 debian/xfce4-kiosk-query.8 
-	
-	dh_install --fail-missing --sourcedir=debian/tmp
+override_dh_strip:
 	dh_strip --dbg-package=libxfce4util4-dbg
 
-	dh_compress
-	dh_fixperms
-
-	dh_makeshlibs -V 'libxfce4util4 (>= 4.6.0)'
-	dh_installdeb
-
-	dh_shlibdeps
-	dh_gencontrol
-	
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+%:
+	dh $@

Modified: desktop/branches/lenny-backports/libxfce4util/debian/watch
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/watch	2010-08-15 14:26:13 UTC (rev 4220)
+++ desktop/branches/lenny-backports/libxfce4util/debian/watch	2010-08-15 14:28:52 UTC (rev 4221)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
-	libxfce4util-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/libxfce4util/([\d\.]+)/ \
+	libxfce4util-([\d\.]+)\.tar\.(?:gz|bz2)

Modified: desktop/branches/lenny-backports/libxfce4util/debian/xfce4-kiosk-query.8
===================================================================
--- desktop/branches/lenny-backports/libxfce4util/debian/xfce4-kiosk-query.8	2010-08-15 14:26:13 UTC (rev 4220)
+++ desktop/branches/lenny-backports/libxfce4util/debian/xfce4-kiosk-query.8	2010-08-15 14:28:52 UTC (rev 4221)
@@ -30,7 +30,7 @@
 .\" respectively.
 \fBxfce4-kiosk-query\fP is a program that queries the given
 capabilities of module for the current user and reports whether
-the user has the capabilities or not. This tool is mainly ment
+the user has the capabilities or not. This tool is mainly meant
 for system administrators to test their Kiosk setup.
 .SH OPTIONS
 A summary of options is included below.

More information about the Pkg-xfce-commits mailing list