[Pkg-xfce-commits] r4233 - desktop/branches/lenny-backports/xfdesktop4/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Aug 17 09:08:47 UTC 2010
Author: corsac
Date: 2010-08-17 21:08:39 +0000 (Tue, 17 Aug 2010)
New Revision: 4233
Modified:
desktop/branches/lenny-backports/xfdesktop4/debian/changelog
desktop/branches/lenny-backports/xfdesktop4/debian/control
desktop/branches/lenny-backports/xfdesktop4/debian/docs
desktop/branches/lenny-backports/xfdesktop4/debian/rules
desktop/branches/lenny-backports/xfdesktop4/debian/watch
Log:
merge changes from latest version in squeeze to backports
Modified: desktop/branches/lenny-backports/xfdesktop4/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/xfdesktop4/debian/changelog 2010-08-17 20:38:38 UTC (rev 4232)
+++ desktop/branches/lenny-backports/xfdesktop4/debian/changelog 2010-08-17 21:08:39 UTC (rev 4233)
@@ -1,9 +1,32 @@
-xfdesktop4 (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+xfdesktop4 (4.6.2-1~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 11 Jul 2009 12:40:51 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 17 Aug 2010 22:48:36 +0200
+xfdesktop4 (4.6.2-1) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/rules:
+ - ship upstream NEWS file. closes: #524930
+
+ [ Stefan Ott ]
+ * debian/watch edited to track Xfce archive reorganisation.
+
+ [ Lionel Le Folgoc ]
+ * New upstream release:
+ - fix incorrect encoding of the italian translation closes: #526479
+ - fix spelling error in the italian translation closes: #543264
+ * debian/control:
+ - add myself to Uploaders
+ - bump Standards-Version to 3.8.4
+ - add ${misc:Depends} to dependencies
+ - use << instead of <
+ - build-depends on debhelper >= 7.0.50~ for overrides
+ * debian/rules: switch to rules.tiny + overrides.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 23 May 2010 14:52:20 +0200
+
xfdesktop4 (4.6.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/branches/lenny-backports/xfdesktop4/debian/control
===================================================================
--- desktop/branches/lenny-backports/xfdesktop4/debian/control 2010-08-17 20:38:38 UTC (rev 4232)
+++ desktop/branches/lenny-backports/xfdesktop4/debian/control 2010-08-17 21:08:39 UTC (rev 4233)
@@ -2,12 +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>
-Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.10.1), libxft-dev,
+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~), libgtk2.0-dev (>= 2.10.1), libxft-dev,
libxml2-dev, xfce4-panel-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100),
libthunar-vfs-1-dev (>= 1.0.0), chrpath, libwnck-dev, libxfconf-0-dev,
libglade2-dev, libxfce4menu-0.1-dev, intltool, libdbus-glib-1-dev
-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/xfdesktop4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/
@@ -15,14 +16,16 @@
Package: xfdesktop4-data
Section: xfce
Architecture: all
+Depends: ${misc:Depends}
Description: xfce desktop background, icons and root menu (common files)
This package contains architecture-independent files for xfdesktop4.
Package: xfdesktop4
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}, xfdesktop4-data (= ${source:Version}), exo-utils
-Replaces: xfdesktop4-data (< 4.5.92)
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfdesktop4-data (= ${source:Version}),
+ exo-utils
+Replaces: xfdesktop4-data (<< 4.5.92)
Recommends: dbus-x11, librsvg2-common, xdg-user-dirs, gamin, xfce4-utils
Suggests: menu
Description: xfce desktop background, icons and root menu manager
@@ -36,7 +39,7 @@
Section: debug
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, xfdesktop4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, xfdesktop4 (= ${binary:Version})
Description: debugging informations for xfdesktop4
This package contains debugging symbols for xfdesktop4, the desktop manager
for Xfce 4 Desktop Environment.
Modified: desktop/branches/lenny-backports/xfdesktop4/debian/docs
===================================================================
--- desktop/branches/lenny-backports/xfdesktop4/debian/docs 2010-08-17 20:38:38 UTC (rev 4232)
+++ desktop/branches/lenny-backports/xfdesktop4/debian/docs 2010-08-17 21:08:39 UTC (rev 4233)
@@ -1 +1,4 @@
+README
+TODO
+NEWS
doc/README.kiosk
Modified: desktop/branches/lenny-backports/xfdesktop4/debian/rules
===================================================================
--- desktop/branches/lenny-backports/xfdesktop4/debian/rules 2010-08-17 20:38:38 UTC (rev 4232)
+++ desktop/branches/lenny-backports/xfdesktop4/debian/rules 2010-08-17 21:08:39 UTC (rev 4233)
@@ -1,65 +1,24 @@
#!/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 --mandir=/usr/share/man --disable-rpath --libexecdir=\$${prefix}/lib --enable-final --enable-thunarx --enable-exo --enable-desktop-menu-dir-monitor
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-rpath --libexecdir=\$${prefix}/lib \
+ --enable-final --enable-thunarx --enable-exo --enable-desktop-menu-dir-monitor
-build: build-stamp
-build-stamp: config.status
-
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
-
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean
-
-install: build
-
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- dh_lintian
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
+override_dh_install:
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.la
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.a
-
-
-
+
chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/* \
$(CURDIR)/debian/tmp/usr/lib/xfce4/*/*
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
-
- # rename the generic terminal file
+ # rename the generic terminal file
mv $(CURDIR)/debian/tmp/usr/share/applications/xfce4-terminal.desktop \
$(CURDIR)/debian/tmp/usr/share/applications/xfce4-term.desktop
sed -i 's/xfce4-terminal/xfce4-term/' \
@@ -69,27 +28,17 @@
dh_installmenu
dh_installman -a
- dh_installchangelogs ChangeLog
-
dh_install --sourcedir=debian/tmp --fail-missing
# why oh why is this necessary?
rm -rf $(CURDIR)/debian/xfdesktop4-data/usr/share/man
+override_dh_link:
rm -rf $(CURDIR)/debian/xfdesktop4/usr/share/doc/xfdesktop4
ln -s xfdesktop4-data $(CURDIR)/debian/xfdesktop4/usr/share/doc/xfdesktop4
dh_link
-
+
+override_dh_strip:
dh_strip --dbg-package=xfdesktop4-dbg
- dh_compress
-
- dh_fixperms
- 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/xfdesktop4/debian/watch
===================================================================
--- desktop/branches/lenny-backports/xfdesktop4/debian/watch 2010-08-17 20:38:38 UTC (rev 4232)
+++ desktop/branches/lenny-backports/xfdesktop4/debian/watch 2010-08-17 21:08:39 UTC (rev 4233)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- xfdesktop-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/xfdesktop/([\d\.]+)/ \
+ xfdesktop-([\d\.]+)\.tar\.(?:gz|bz2)
More information about the Pkg-xfce-commits
mailing list