[Pkg-xfce-commits] r5299 - in goodies/trunk/xfce4-places-plugin: . debian
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sat Apr 2 10:17:00 UTC 2011
Author: mrpouit-guest
Date: 2011-04-02 22:17:00 +0000 (Sat, 02 Apr 2011)
New Revision: 5299
Added:
goodies/trunk/xfce4-places-plugin/debian/patches/
goodies/trunk/xfce4-places-plugin/debian/source/
Modified:
goodies/trunk/xfce4-places-plugin/
goodies/trunk/xfce4-places-plugin/debian/changelog
goodies/trunk/xfce4-places-plugin/debian/compat
goodies/trunk/xfce4-places-plugin/debian/control
goodies/trunk/xfce4-places-plugin/debian/rules
Log:
merge experimental changes into trunk
Property changes on: goodies/trunk/xfce4-places-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-places-plugin:4419-5298
Modified: goodies/trunk/xfce4-places-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-places-plugin/debian/changelog 2011-04-02 22:14:23 UTC (rev 5298)
+++ goodies/trunk/xfce4-places-plugin/debian/changelog 2011-04-02 22:17:00 UTC (rev 5299)
@@ -1,12 +1,38 @@
xfce4-places-plugin (1.2.0-2) UNRELEASED; urgency=low
+ [ Yves-Alexis Perez ]
* debian/control:
- switch to xfce section.
- - add exo-utils versionned dependencies since exo-mount is gone in 0.5.
+ - update standards version to 3.9.1.
+ - update build-deps for Xfce 4.8.
+ - update debhelper build-dep for overrides.
* debian/watch edited to track Xfce archive reorganisation.
+ * debian/rules:
+ - switch to dh7 tiny rules.
+ * debian/compat bumped to 7.
+ * debian/patches:
+ - 03_port-to-libxfce4ui added (Xfce #7317)
+ - 04_port-to-gio added (Xfce #6663)
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 14 Aug 2010 11:09:45 +0200
+ [ Lionel Le Folgoc ]
+ * debian/control:
+ - b-dep on libexo-1-dev instead of libexo-0.3-dev.
+ - add xfce4-dev-tools, automake, autoconf and libtool to b-deps for the
+ xdt-autogen call.
+ - add myself to Uploaders.
+ * Switch to 3.0 (quilt).
+ * debian/rules:
+ - add .pc files to POTFILES.skip, and clean it after the build.
+ - call xdt-autogen, and clean up autogenerated files after the build.
+ * debian/patches:
+ - 01_port-to-exo-1.patch: added, replaces a dropped exo symbol by a gtk
+ equivalent.
+ - 02_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
+ Closes: #556699
+ - series: added.
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 23 Feb 2011 23:00:41 +0100
+
xfce4-places-plugin (1.2.0-1) unstable; urgency=low
[ Evgeni Golov ]
Modified: goodies/trunk/xfce4-places-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-places-plugin/debian/compat 2011-04-02 22:14:23 UTC (rev 5298)
+++ goodies/trunk/xfce4-places-plugin/debian/compat 2011-04-02 22:17:00 UTC (rev 5299)
@@ -1 +1 @@
-5
+7
Modified: goodies/trunk/xfce4-places-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-places-plugin/debian/control 2011-04-02 22:14:23 UTC (rev 5298)
+++ goodies/trunk/xfce4-places-plugin/debian/control 2011-04-02 22:17:00 UTC (rev 5299)
@@ -2,20 +2,20 @@
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 (>= 5), autotools-dev, pkg-config,
- libgtk2.0-dev (>= 2.6.0), libxfce4util-dev (>= 4.4.2),
- xfce4-panel-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2),
- libthunar-vfs-1-dev (>= 0.4.0), libexo-0.3-dev (>= 0.3.4),
- libxml-parser-perl, intltool
-Standards-Version: 3.8.2
+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~), autotools-dev, pkg-config,
+ libgtk2.0-dev (>= 2.6.0), libxfce4util-dev (>= 4.8),
+ libexo-1-dev (>= 0.5.0), libxfce4ui-1-dev (>= 4.8), xfce4-panel-dev (>= 4.8),
+ libxml-parser-perl, intltool, xfce4-dev-tools, automake, autoconf, libtool
+Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin
Vcs-Svn: svn://svn.debian.org/svn/pkg-xfce/goodies/trunk/xfce4-places-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-places-plugin/
Package: xfce4-places-plugin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, thunar, exo-utils (<< 0.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, thunar
Description: quick access to folders, documents and removable media
This plugin brings much of the functionality of GNOME’s Places menu to Xfce.
It puts a simple button on the panel. Clicking on this button opens up a menu
Modified: goodies/trunk/xfce4-places-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-places-plugin/debian/rules 2011-04-02 22:14:23 UTC (rev 5298)
+++ goodies/trunk/xfce4-places-plugin/debian/rules 2011-04-02 22:17:00 UTC (rev 5299)
@@ -1,65 +1,15 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-#include /usr/share/quilt/quilt.make
+override_dh_auto_configure:
+ find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
+ NOCONFIGURE=1 xdt-autogen
+ dh_auto_configure
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f $$(find -name 'Makefile.in*')
+ rm -f INSTALL aclocal.m4 config.h.in configure depcomp install-sh
+ rm -f ltmain.sh missing mkinstalldirs po/POTFILES.skip
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-config.status: configure
- dh_testdir
- ./configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --libexecdir=\$${prefix}/lib \
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean build-stamp
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/xfce4-places-plugin install
-
-binary-indep: build install
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- 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 $@
More information about the Pkg-xfce-commits
mailing list