[Pkg-xfce-commits] r5241 - in goodies/trunk/thunar-archive-plugin: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Apr 2 02:09:58 UTC 2011
Author: corsac
Date: 2011-04-02 14:09:55 +0000 (Sat, 02 Apr 2011)
New Revision: 5241
Added:
goodies/trunk/thunar-archive-plugin/debian/source/
goodies/trunk/thunar-archive-plugin/debian/thunar-archive-plugin.docs
Removed:
goodies/trunk/thunar-archive-plugin/debian/patches/01_use-correct-file-roller-args.patch
Modified:
goodies/trunk/thunar-archive-plugin/
goodies/trunk/thunar-archive-plugin/debian/changelog
goodies/trunk/thunar-archive-plugin/debian/control
goodies/trunk/thunar-archive-plugin/debian/copyright
goodies/trunk/thunar-archive-plugin/debian/rules
Log:
merge experimental changes into trunk
Property changes on: goodies/trunk/thunar-archive-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/thunar-archive-plugin:4825-5240
Modified: goodies/trunk/thunar-archive-plugin/debian/changelog
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/changelog 2011-04-02 14:08:37 UTC (rev 5240)
+++ goodies/trunk/thunar-archive-plugin/debian/changelog 2011-04-02 14:09:55 UTC (rev 5241)
@@ -1,3 +1,21 @@
+thunar-archive-plugin (0.3.0-1) experimental; urgency=low
+
+ * New upstream release:
+ - Add 7z archive support. closes: #581936
+ * Switch to 3.0 (quilt) source format.
+ * debian/patches:
+ - 01_use-correct-file-roller-args dropped, merged upstream.
+ * debian/copyright updated and switched to DEP-5 format.
+ * debian/control:
+ - add build-dep on intltool libthunarx-2-dev and libexo-1-dev, drop
+ build-dep on libthunar-vfs.
+ - update standards version to 3.9.1.
+ - update debhelper build-dep to 7.0.50~ for overrides.
+ * debian/rules:
+ - switch to debhelper 7 tiny rules.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Feb 2011 15:05:44 +0100
+
thunar-archive-plugin (0.2.4-5) unstable; urgency=low
[ Evgeni Golov ]
Modified: goodies/trunk/thunar-archive-plugin/debian/control
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/control 2011-04-02 14:08:37 UTC (rev 5240)
+++ goodies/trunk/thunar-archive-plugin/debian/control 2011-04-02 14:09:55 UTC (rev 5241)
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, pkg-config, libthunar-vfs-1-dev (>= 0.5.0rc2)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, cdbs, pkg-config,
+ intltool, libthunarx-2-dev, libexo-1-dev
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-archive-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-archive-plugin/
Modified: goodies/trunk/thunar-archive-plugin/debian/copyright
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/copyright 2011-04-02 14:08:37 UTC (rev 5240)
+++ goodies/trunk/thunar-archive-plugin/debian/copyright 2011-04-02 14:09:55 UTC (rev 5241)
@@ -1,15 +1,28 @@
-This package was debianized by Yves-Alexis Perez <corsac at corsac.net> on
-Thu, 11 May 2006 14:03:46 +0200
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=162
+Upstream-Name: thunar-archive-plugin
+Upstream-Contact: Jannis Pohlmann <jannis at xfce.org>
+Source: http://thunar.xfce.org/pwiki/projects/thunar-archive-plugin
-It was downloaded from
-http://foo-projects.org/~benny/projects/thunar-archive-plugin/
+Files: de bi
-Copyrights:
-© 2006 Benedikt Meurer <benny at xfce.org>
+Files: autogen.sh
+ thunar-archive-plugin/tap-backend.c
+ thunar-archive-plugin/tap-provider.c
+ thunar-archive-plugin/thunar-archive-plugin.c
+Copyright: 2002-2006, Benedikt Meurer <benny at xfce.org>
+ 2006, Benedikt Meurer <benny at xfce.org>
+ 2011, Jannis Pohlmann <jannis at xfce.org>
+License: LGPL-2+
-License:
-thunar-archive-plugin/*: LGPL-2+
+Files: thunar-archive-plugin/tap-backend.h
+ thunar-archive-plugin/tap-provider.h
+Copyright: 2006, Benedikt Meurer <benny at xfce.org>
+License: LGPL-2+
-On Debian systems, the complete text of the GNU Library General Public License
-can be found in `/usr/share/common-licenses/LGPL'.
+Files: debian/*
+Copyright: 2006-2001 Yves-Alexis Perez <corsac at debian.org>
+License: GPL-2+
+On Debian systems, the complete text of the GNU Library General Public License
+can be found in `/usr/share/common-licenses/LGPL'. The complete text of the GNU
+General Public License can be found in `/usr/share/common-licenses/GPL'.
Deleted: goodies/trunk/thunar-archive-plugin/debian/patches/01_use-correct-file-roller-args.patch
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/patches/01_use-correct-file-roller-args.patch 2011-04-02 14:08:37 UTC (rev 5240)
+++ goodies/trunk/thunar-archive-plugin/debian/patches/01_use-correct-file-roller-args.patch 2011-04-02 14:09:55 UTC (rev 5241)
@@ -1,11 +0,0 @@
---- thunar-archive-plugin-0.2.4/scripts/file-roller.tap.orig 2007-01-20 11:41:50.000000000 +0100
-+++ thunar-archive-plugin-0.2.4/scripts/file-roller.tap 2008-03-04 21:17:04.000000000 +0100
-@@ -34,7 +34,7 @@
- ;;
-
- extract-here)
-- exec file-roller "--extract-to=$folder" --force "$@"
-+ exec file-roller --force "--extract-to=$(pwd)" --extract-here "$@"
- ;;
-
- extract-to)
Modified: goodies/trunk/thunar-archive-plugin/debian/rules
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/rules 2011-04-02 14:08:37 UTC (rev 5240)
+++ goodies/trunk/thunar-archive-plugin/debian/rules 2011-04-02 14:09:55 UTC (rev 5241)
@@ -1,13 +1,14 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
-DEB_CONFIGURE_LIBEXECDIR = /usr/lib/
+override_dh_auto_configure:
+ dh_auto_configure -- --libexecdir=/usr/lib/
-# Don't call ldconfig in postinst/postrm
-DEB_DH_MAKESHLIBS_ARGS := -n -X /usr/lib/thunarx-1/
+override_dh_makeshlibs:
+ dh_makeshlibs -n -X /usr/lib/thunarx-2/
-binary-post-install/thunar-archive-plugin::
- rm -rf debian/thunar-archive-plugin/usr/lib/thunarx-1/*.la
+override_dh_install:
+ rm -rf debian/thunar-archive-plugin/usr/lib/thunarx-2/*.la
+ dh_install --fail-missing
+
+%:
+ dh $@
Copied: goodies/trunk/thunar-archive-plugin/debian/thunar-archive-plugin.docs (from rev 5240, goodies/branches/experimental/thunar-archive-plugin/debian/thunar-archive-plugin.docs)
===================================================================
--- goodies/trunk/thunar-archive-plugin/debian/thunar-archive-plugin.docs (rev 0)
+++ goodies/trunk/thunar-archive-plugin/debian/thunar-archive-plugin.docs 2011-04-02 14:09:55 UTC (rev 5241)
@@ -0,0 +1 @@
+AUTHORS NEWS README THANKS
More information about the Pkg-xfce-commits
mailing list