[Pkg-xfce-commits] r4229 - desktop/branches/lenny-backports/xfce4-session/debian

Yves-Alexis Perez corsac at alioth.debian.org
Tue Aug 17 07:32:00 UTC 2010


Author: corsac
Date: 2010-08-17 19:32:00 +0000 (Tue, 17 Aug 2010)
New Revision: 4229

Added:
   desktop/branches/lenny-backports/xfce4-session/debian/docs
   desktop/branches/lenny-backports/xfce4-session/debian/manpages
   desktop/branches/lenny-backports/xfce4-session/debian/source/
Modified:
   desktop/branches/lenny-backports/xfce4-session/debian/changelog
   desktop/branches/lenny-backports/xfce4-session/debian/control
   desktop/branches/lenny-backports/xfce4-session/debian/rules
   desktop/branches/lenny-backports/xfce4-session/debian/watch
Log:
merge changes from latest version in squeeze to backports

Modified: desktop/branches/lenny-backports/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/changelog	2010-08-16 06:38:53 UTC (rev 4228)
+++ desktop/branches/lenny-backports/xfce4-session/debian/changelog	2010-08-17 19:32:00 UTC (rev 4229)
@@ -1,9 +1,31 @@
-xfce4-session (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+xfce4-session (4.6.2-1~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 10 Jul 2009 08:13:43 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 17 Aug 2010 20:54:58 +0200
 
+xfce4-session (4.6.2-1) unstable; urgency=low
+  [Stefan Ott]
+  * debian/watch edited to track Xfce archive reorganisation.
+
+  [Yves-Alexis Perez]
+  * New upstream release:
+    - fix wrong caption in german translation                   closes: #525499
+  * debian/README.Debian:
+    - add precisions about ConsoleKit/PolicyKit setup.
+  * debian/control:
+    - update standards version to 3.8.4.
+    - drop build-dep on quilt.
+    - add dep on ${misc:Depends}.
+    - update debhelper build-dep for overrides.
+  * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - drop quilt rules.
+    - switch to debhelper 7 tiny rules. 
+    - make intltool ignore c files in .pc quilt dir.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 22 May 2010 18:45:55 +0200
+
 xfce4-session (4.6.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/branches/lenny-backports/xfce4-session/debian/control
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/control	2010-08-16 06:38:53 UTC (rev 4228)
+++ desktop/branches/lenny-backports/xfce4-session/debian/control	2010-08-17 19:32:00 UTC (rev 4229)
@@ -3,12 +3,12 @@
 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>
-Build-Depends: debhelper (>= 7), libx11-dev, libxml-parser-perl, chrpath,
- quilt, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
+Build-Depends: debhelper (>= 7.0.50~), libx11-dev, libxml-parser-perl, chrpath,
+ fortune-mod, libdbus-1-dev, libdbus-glib-1-dev, 
  libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), libwnck-dev, 
  x11-xserver-utils, libxfconf-0-dev (>= 4.6.0), libglade2-dev, 
  intltool (>= 0.31)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/
@@ -16,7 +16,7 @@
 Package: xfce4-session
 Section: xfce
 Architecture: any
-Depends: ${shlibs:Depends}, fortune-mod, xfce4-settings, xfconf
+Depends: ${shlibs:Depends}, ${misc:Depends}, fortune-mod, xfce4-settings, xfconf
 Recommends: xfwm4, xfce4-utils, xfdesktop4, xfce4-panel, hal, dbus-x11, x11-xserver-utils
 Suggests: sudo
 Provides: x-session-manager

Copied: desktop/branches/lenny-backports/xfce4-session/debian/docs (from rev 4066, desktop/trunk/xfce4-session/debian/docs)
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/docs	                        (rev 0)
+++ desktop/branches/lenny-backports/xfce4-session/debian/docs	2010-08-17 19:32:00 UTC (rev 4229)
@@ -0,0 +1,6 @@
+BUGS
+NEWS
+README
+TODO
+doc/README.Kiosk
+doc/FAQ

Copied: desktop/branches/lenny-backports/xfce4-session/debian/manpages (from rev 4066, desktop/trunk/xfce4-session/debian/manpages)
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/manpages	                        (rev 0)
+++ desktop/branches/lenny-backports/xfce4-session/debian/manpages	2010-08-17 19:32:00 UTC (rev 4229)
@@ -0,0 +1,3 @@
+debian/xfce4-autostart-editor.1
+debian/xfce4-tips.1
+debian/xfce4-session-settings.1

Modified: desktop/branches/lenny-backports/xfce4-session/debian/rules
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/rules	2010-08-16 06:38:53 UTC (rev 4228)
+++ desktop/branches/lenny-backports/xfce4-session/debian/rules	2010-08-17 19:32:00 UTC (rev 4229)
@@ -1,20 +1,5 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-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
@@ -25,84 +10,25 @@
 	INSTALL_PROGRAM += -s
 endif
 
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
+override_dh_auto_configure:
+	dh_auto_configure -- --libexecdir=/usr/sbin
+	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 
-unpatch:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -rf .pc patch-stamp
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
 
-config.status: configure patch-stamp
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/sbin --enable-final --with-shutdown-style=hal
+override_dh_install:
+	rm -f debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
+	rm -f debian/xfce4-session/usr/lib/*.la
 
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_lintian
-
-	# Add here commands to install the package into debian/xfce4-session.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-session
-	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/xfce4/splash/engines/*.la
-	rm -f $(CURDIR)/debian/xfce4-session/usr/lib/*.la
-
-	chrpath -d -k `pwd`/debian/xfce4-session/usr/bin/* \
-		`pwd`/debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
-		`pwd`/debian/xfce4-session/usr/lib/xfce4/splash/engines/*so
+	chrpath -d -k debian/xfce4-session/usr/bin/* \
+		debian/xfce4-session/usr/sbin/xfsm-shutdown-helper \
+		debian/xfce4-session/usr/lib/xfce4/splash/engines/*so
 	
-	cat debian/debian-tips >> `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips
-	strfile `pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips \
-		`pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips.dat
+	cat debian/debian-tips >> debian/xfce4-session/usr/share/xfce4/tips/tips
+	strfile debian/xfce4-session/usr/share/xfce4/tips/tips \
+		debian/xfce4-session/usr/share/xfce4/tips/tips.dat
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs BUGS NEWS README TODO doc/README.Kiosk doc/FAQ
-	dh_installman debian/xfce4-autostart-editor.1 debian/xfce4-tips.1 \
-    debian/xfce4-session-settings.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps -l`pwd`/debian/xfce4-session/usr/lib
-	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/xfce4-session/debian/watch
===================================================================
--- desktop/branches/lenny-backports/xfce4-session/debian/watch	2010-08-16 06:38:53 UTC (rev 4228)
+++ desktop/branches/lenny-backports/xfce4-session/debian/watch	2010-08-17 19:32:00 UTC (rev 4229)
@@ -1,3 +1,3 @@
 version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
-	xfce4-session-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/xfce4-session/([\d\.]+)/ \
+	xfce4-session-([\d\.]+)\.tar\.(?:gz|bz2)




More information about the Pkg-xfce-commits mailing list