[Pkg-xfce-commits] r4230 - desktop/branches/lenny-backports/xfwm4/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Tue Aug 17 07:42:24 UTC 2010
Author: corsac
Date: 2010-08-17 19:42:22 +0000 (Tue, 17 Aug 2010)
New Revision: 4230
Added:
desktop/branches/lenny-backports/xfwm4/debian/docs
desktop/branches/lenny-backports/xfwm4/debian/manpages
desktop/branches/lenny-backports/xfwm4/debian/source/
desktop/branches/lenny-backports/xfwm4/debian/xfwm4.lintian-overrides
Removed:
desktop/branches/lenny-backports/xfwm4/debian/lintian
Modified:
desktop/branches/lenny-backports/xfwm4/debian/changelog
desktop/branches/lenny-backports/xfwm4/debian/control
desktop/branches/lenny-backports/xfwm4/debian/rules
desktop/branches/lenny-backports/xfwm4/debian/watch
Log:
merge changes from latest version in squeeze to backports
Modified: desktop/branches/lenny-backports/xfwm4/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/changelog 2010-08-17 19:32:00 UTC (rev 4229)
+++ desktop/branches/lenny-backports/xfwm4/debian/changelog 2010-08-17 19:42:22 UTC (rev 4230)
@@ -1,9 +1,28 @@
-xfwm4 (4.6.1-1~bpo50+1) lenny-backports; urgency=low
+xfwm4 (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 11:27:47 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 17 Aug 2010 21:32:57 +0200
+xfwm4 (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
+ - update standards version to 3.8.4.
+ - add depends on ${misc:Depends}.
+ - debhelper build-dep bumped for overrides support.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - switch to tiny debhelper 7 rules.
+ * debian/docs: use dh_installdocs to install docs.
+ * debian/manpages: use dh_installman to install manpages.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 22 May 2010 19:04:10 +0200
+
xfwm4 (4.6.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/branches/lenny-backports/xfwm4/debian/control
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/control 2010-08-17 19:32:00 UTC (rev 4229)
+++ desktop/branches/lenny-backports/xfwm4/debian/control 2010-08-17 19:42:22 UTC (rev 4230)
@@ -3,11 +3,11 @@
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), libgtk2.0-dev (>= 2.10.6),
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6),
libxft-dev, libxdamage-dev, libxrender-dev, libxcomposite-dev,
libxfixes-dev, chrpath, libglade2-dev, libxfce4util-dev (>= 4.6.0),
libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, libwnck-dev, intltool
-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/xfwm4/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/
@@ -15,7 +15,7 @@
Package: xfwm4
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: xfwm4-themes, librsvg2-common
Suggests: xfce4
Provides: x-window-manager
Copied: desktop/branches/lenny-backports/xfwm4/debian/docs (from rev 4066, desktop/trunk/xfwm4/debian/docs)
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/docs (rev 0)
+++ desktop/branches/lenny-backports/xfwm4/debian/docs 2010-08-17 19:42:22 UTC (rev 4230)
@@ -0,0 +1,3 @@
+README
+TODO
+NEWS
Deleted: desktop/branches/lenny-backports/xfwm4/debian/lintian
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/lintian 2010-08-17 19:32:00 UTC (rev 4229)
+++ desktop/branches/lenny-backports/xfwm4/debian/lintian 2010-08-17 19:42:22 UTC (rev 4230)
@@ -1,2 +0,0 @@
-#Xfce doesn't have its FD.O category yet.
-xfwm4: desktop-entry-invalid-category
Copied: desktop/branches/lenny-backports/xfwm4/debian/manpages (from rev 4066, desktop/trunk/xfwm4/debian/manpages)
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/manpages (rev 0)
+++ desktop/branches/lenny-backports/xfwm4/debian/manpages 2010-08-17 19:42:22 UTC (rev 4230)
@@ -0,0 +1,4 @@
+debian/xfwm4.1
+debian/xfwm4-settings.1
+debian/xfwm4-tweaks-settings.1
+debian/xfwm4-workspace-settings.1
Modified: desktop/branches/lenny-backports/xfwm4/debian/rules
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/rules 2010-08-17 19:32:00 UTC (rev 4229)
+++ desktop/branches/lenny-backports/xfwm4/debian/rules 2010-08-17 19:42:22 UTC (rev 4230)
@@ -1,8 +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)
-
LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -10,67 +7,11 @@
CFLAGS += -O2
endif
-configure: configure-stamp
-configure-stamp:
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-compositor --libexecdir=\$${prefix}/lib
- dh_testdir
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-final --enable-compositor --libexecdir=\$${prefix}/lib
- touch configure-stamp
+override_dh_install:
+ chrpath -d -k `pwd`/debian/xfwm4/usr/bin/*
-build: build-stamp
-build-stamp: configure
-
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
-
- dh_testdir
- dh_testroot
-
- -rm -f configure-stamp build-stamp
-
- dh_clean
-
-install: build
-
- dh_testdir
- dh_testroot
- dh_prep
-
- $(MAKE) install DESTDIR=`pwd`/debian/xfwm4
-
- dh_installman debian/xfwm4.1 debian/xfwm4-settings.1 \
- debian/xfwm4-tweaks-settings.1 debian/xfwm4-workspace-settings.1
-
- chrpath -d -k `pwd`/debian/xfwm4/usr/bin/* \
-
- install -D -p -o root -g root -m 644 `pwd`/debian/lintian \
- `pwd`/debian/xfwm4/usr/share/lintian/overrides/xfwm4
-
-
-binary-indep: build install
-binary-arch: build install
-
- dh_testdir
- dh_testroot
-
- dh_installdocs -a README TODO NEWS
- dh_installmenu -a
-
- dh_installchangelogs ChangeLog -a
- dh_strip -a
- dh_compress -a
-
- dh_fixperms -a
- dh_installdeb -a
-
- dh_shlibdeps -a
- dh_gencontrol -a
-
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@
Modified: desktop/branches/lenny-backports/xfwm4/debian/watch
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/watch 2010-08-17 19:32:00 UTC (rev 4229)
+++ desktop/branches/lenny-backports/xfwm4/debian/watch 2010-08-17 19:42:22 UTC (rev 4230)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- xfwm4-(\d+\.\d+.\d+)\.tar\.bz2
+http://archive.xfce.org/src/xfce/xfwm4/([\d\.]+)/ \
+ xfwm4-([\d\.]+)\.tar\.(?:gz|bz2)
Copied: desktop/branches/lenny-backports/xfwm4/debian/xfwm4.lintian-overrides (from rev 4066, desktop/trunk/xfwm4/debian/xfwm4.lintian-overrides)
===================================================================
--- desktop/branches/lenny-backports/xfwm4/debian/xfwm4.lintian-overrides (rev 0)
+++ desktop/branches/lenny-backports/xfwm4/debian/xfwm4.lintian-overrides 2010-08-17 19:42:22 UTC (rev 4230)
@@ -0,0 +1,2 @@
+#Xfce doesn't have its FD.O category yet.
+xfwm4: desktop-entry-invalid-category
More information about the Pkg-xfce-commits
mailing list