[Pkg-xfce-commits] r5913 - in goodies/trunk/thunar-vcs-plugin/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Fri Aug 5 09:16:18 UTC 2011


Author: corsac
Date: 2011-08-05 09:16:17 +0000 (Fri, 05 Aug 2011)
New Revision: 5913

Removed:
   goodies/trunk/thunar-vcs-plugin/debian/thunar-archive-plugin.docs
Modified:
   goodies/trunk/thunar-vcs-plugin/debian/changelog
   goodies/trunk/thunar-vcs-plugin/debian/control
   goodies/trunk/thunar-vcs-plugin/debian/copyright
   goodies/trunk/thunar-vcs-plugin/debian/patches/01_fix-missing-links.patch
   goodies/trunk/thunar-vcs-plugin/debian/rules
   goodies/trunk/thunar-vcs-plugin/debian/watch
Log:
update packaging for thunar-vcs-plugin


Modified: goodies/trunk/thunar-vcs-plugin/debian/changelog
===================================================================
--- goodies/trunk/thunar-vcs-plugin/debian/changelog	2011-08-05 07:37:08 UTC (rev 5912)
+++ goodies/trunk/thunar-vcs-plugin/debian/changelog	2011-08-05 09:16:17 UTC (rev 5913)
@@ -1,125 +1,5 @@
-thunar-archive-plugin (0.3.0-3) unstable; urgency=low
+thunar-vcs-plugin (0.1.4-1) UNRELEASED; urgency=low
 
-  * debian/rules:
-    - pick build flags from dpkg-buildflags
-    - add -O1, -z,defs and --as-needed to LDFLAGS.
-    - run xdt-autogen before configure.
-    - add hardening flags to build flags.
-  * debian/control:
-    - add build-dep on hardening-includes.
-    - add build-dep on xfce4-dev-tools, libtool and gtk-doc-tools
-  * debian/patches:
-    - 01_fix-missing-links, fix ftbfs with --as-needed.
+  * Initial release.                                            closes: #636644
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 18 Jun 2011 23:20:35 +0200
-
-thunar-archive-plugin (0.3.0-2) unstable; urgency=low
-
-  * Upload to unstable.
-  * debian/control:
-    - remove Emanuele and Simon from uploaders, thanks to them.
-    - update standards version to 3.9.2.
-    - drop useless cdbs build-dep. 
-    - fix spelling error in long description. 
-
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 20 Apr 2011 12:55:58 +0200
-
-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 ]
-  * Fix Vcs-* fields, they were missing 'trunk' in the path.
-
-  [ Yves-Alexis Perez ]
-  * debian/watch edited to track Xfce archive reorganisation.
-  * debian/control:
-    - update standards version to 3.8.3.
-    - update debhelper build-dep to 7.
-    - switch to xfce section.
-  * debian/compat bumped to 7.
-  * debian/rules:
-    - ignore plugin folder in dh_makeshlibs.
-  * debian/copyright:
-    - update license information.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 11 Nov 2009 16:05:28 +0100
-
-thunar-archive-plugin (0.2.4-4) unstable; urgency=low
-
-  * debian/rules:
-    - fix build system to use libexecdir=/usr/lib and archivers scripts ends
-      in /usr/lib/thunar-archive-plugin.                        closes: #494436
-  * debian/control:
-    - update standards version to 3.8.0.
-    - remove Rudy Godoy and Martin Loschwitz from Uploaders:
-    - add version to squeeze Recommends:, to follow folder change.
-    - add ark to Recommends:.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 12 Aug 2008 21:21:29 +0200
-
-thunar-archive-plugin (0.2.4-3) unstable; urgency=low
-
-  * debian/patches: 01_use-correct-file-roller-args refreshed. 
-    Thanks Mathias Brodala.                            (really) closes: #424986
-
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 04 Mar 2008 21:28:16 +0100
-
-thunar-archive-plugin (0.2.4-2) unstable; urgency=low
-
-  [ Yves-Alexis Perez ]
-  * debian/control:
-    - move archivers from Depends: to Recommends:.
-    - add squeeze to archivers list.
-    - add my debian.org email address.
-    - updated standard versions to 3.7.3.
-    - relax build-dep on libthunar-vfs-1-dev to ease backports.
-  * debian/patches: 01_use-correct-file-roller-args added.      closes: #424986
-  * debian/copyright: add date and © sign.
-
-  [ Simon Huggins ]
-  * Add Vcs-* headers to debian/control
-
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 01 Mar 2008 00:09:59 +0100
-
-thunar-archive-plugin (0.2.4-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 29 Apr 2007 20:57:42 +0100
-
-thunar-archive-plugin (0.2.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/control: bumped dependencies to Thunar 0.5.0rc2.
-
- -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 16 Nov 2006 18:10:05 +0100
-
-thunar-archive-plugin (0.2.0-1) unstable; urgency=low
-
-  * New upstream release
-  * debian/copyright: corrected license, it's only LGPL 
-
- -- Yves-Alexis Perez <corsac at corsac.net>  Wed,  5 Jul 2006 13:48:04 +0200
-
-thunar-archive-plugin (0.1.2-1) unstable; urgency=low
-
-  * Initial release Closes: #367628
-
- -- Yves-Alexis Perez <corsac at corsac.net>  Sat, 17 Jun 2006 14:06:52 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 17 Jun 2006 14:06:52 +0100

Modified: goodies/trunk/thunar-vcs-plugin/debian/control
===================================================================
--- goodies/trunk/thunar-vcs-plugin/debian/control	2011-08-05 07:37:08 UTC (rev 5912)
+++ goodies/trunk/thunar-vcs-plugin/debian/control	2011-08-05 09:16:17 UTC (rev 5913)
@@ -1,4 +1,4 @@
-Source: thunar-archive-plugin
+Source: thunar-vcs-plugin
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
@@ -7,14 +7,18 @@
  intltool, libthunarx-2-dev, libexo-1-dev, hardening-includes,
  xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.2
-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/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-vcs-plugin/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-vcs-plugin/
 
-Package: thunar-archive-plugin
+Package: thunar-vcs-plugin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, thunar (>= 0.5.0rc2-1)
-Recommends: squeeze (>= 0.2.3-5) | xarchiver (>= 0.3.9.2beta2-2 ) | ark |file-roller
-Description: Archive plugin for Thunar file manager
- This plugin allows one to extract and create archive from inside the Thunar
- file manager. At the moment it uses file-roller but will use xarchiver in the
- future.
+Description: VCS plugin for Thunar file manager
+ Git and subversion integration into the Thunar file manager.
+ The current features are:
+   * most of the svn action: add, blame, checkout, cleanup, commit, copy,
+     delete, export, import, lock, log, move, properties, relocate, resolved,
+     revert, status, switch, unlock, update.
+   * subversion info in file properties dialog.
+   * Basic git actions: add, blame, branch, clean, clone, log, move, reset,
+     stash, status.

Modified: goodies/trunk/thunar-vcs-plugin/debian/copyright
===================================================================
--- goodies/trunk/thunar-vcs-plugin/debian/copyright	2011-08-05 07:37:08 UTC (rev 5912)
+++ goodies/trunk/thunar-vcs-plugin/debian/copyright	2011-08-05 09:16:17 UTC (rev 5913)
@@ -1,28 +1,147 @@
-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
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: thunar-vcs-plugin
+Upstream-Contact: Peter de Ridder <peter at xfce.org>
+Source: http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
 
-Files: de bi
+Files: ./thunar-vcs-plugin/thunar-vcs-plugin.c
+ ./thunar-vcs-plugin/tvp-git-action.c
+ ./thunar-vcs-plugin/tvp-git-action.h
+ ./thunar-vcs-plugin/tvp-provider.h
+ ./thunar-vcs-plugin/tvp-svn-action.c
+ ./thunar-vcs-plugin/tvp-svn-action.h
+ ./thunar-vcs-plugin/tvp-svn-backend.c
+ ./thunar-vcs-plugin/tvp-svn-backend.h
+ ./thunar-vcs-plugin/tvp-svn-property-page.c
+ ./thunar-vcs-plugin/tvp-svn-property-page.h
+ ./tvp-git-helper/main.c
+ ./tvp-git-helper/tgh-add.c
+ ./tvp-git-helper/tgh-add.h
+ ./tvp-git-helper/tgh-blame-dialog.c
+ ./tvp-git-helper/tgh-blame-dialog.h
+ ./tvp-git-helper/tgh-blame.c
+ ./tvp-git-helper/tgh-blame.h
+ ./tvp-git-helper/tgh-branch-dialog.c
+ ./tvp-git-helper/tgh-branch-dialog.h
+ ./tvp-git-helper/tgh-branch.c
+ ./tvp-git-helper/tgh-branch.h
+ ./tvp-git-helper/tgh-cell-renderer-graph.c
+ ./tvp-git-helper/tgh-cell-renderer-graph.h
+ ./tvp-git-helper/tgh-clean-dialog.c
+ ./tvp-git-helper/tgh-clean-dialog.h
+ ./tvp-git-helper/tgh-clean.c
+ ./tvp-git-helper/tgh-clean.h
+ ./tvp-git-helper/tgh-clone.c
+ ./tvp-git-helper/tgh-clone.h
+ ./tvp-git-helper/tgh-common.c
+ ./tvp-git-helper/tgh-common.h
+ ./tvp-git-helper/tgh-dialog-common.c
+ ./tvp-git-helper/tgh-dialog-common.h
+ ./tvp-git-helper/tgh-file-selection-dialog.c
+ ./tvp-git-helper/tgh-file-selection-dialog.h
+ ./tvp-git-helper/tgh-log-dialog.c
+ ./tvp-git-helper/tgh-log-dialog.h
+ ./tvp-git-helper/tgh-log.c
+ ./tvp-git-helper/tgh-log.h
+ ./tvp-git-helper/tgh-move.c
+ ./tvp-git-helper/tgh-move.h
+ ./tvp-git-helper/tgh-notify-dialog.c
+ ./tvp-git-helper/tgh-notify-dialog.h
+ ./tvp-git-helper/tgh-reset.c
+ ./tvp-git-helper/tgh-reset.h
+ ./tvp-git-helper/tgh-stash-dialog.c
+ ./tvp-git-helper/tgh-stash-dialog.h
+ ./tvp-git-helper/tgh-stash.c
+ ./tvp-git-helper/tgh-stash.h
+ ./tvp-git-helper/tgh-status-dialog.c
+ ./tvp-git-helper/tgh-status-dialog.h
+ ./tvp-git-helper/tgh-status.c
+ ./tvp-git-helper/tgh-status.h
+ ./tvp-git-helper/tgh-transfer-dialog.c
+ ./tvp-git-helper/tgh-transfer-dialog.h
+ ./tvp-svn-helper/main.c
+ ./tvp-svn-helper/tsh-add.c
+ ./tvp-svn-helper/tsh-add.h
+ ./tvp-svn-helper/tsh-blame-dialog.c
+ ./tvp-svn-helper/tsh-blame-dialog.h
+ ./tvp-svn-helper/tsh-blame.c
+ ./tvp-svn-helper/tsh-blame.h
+ ./tvp-svn-helper/tsh-checkout.c
+ ./tvp-svn-helper/tsh-checkout.h
+ ./tvp-svn-helper/tsh-cleanup.c
+ ./tvp-svn-helper/tsh-cleanup.h
+ ./tvp-svn-helper/tsh-commit.c
+ ./tvp-svn-helper/tsh-commit.h
+ ./tvp-svn-helper/tsh-common.c
+ ./tvp-svn-helper/tsh-common.h
+ ./tvp-svn-helper/tsh-copy.c
+ ./tvp-svn-helper/tsh-copy.h
+ ./tvp-svn-helper/tsh-delete.c
+ ./tvp-svn-helper/tsh-delete.h
+ ./tvp-svn-helper/tsh-dialog-common.c
+ ./tvp-svn-helper/tsh-dialog-common.h
+ ./tvp-svn-helper/tsh-export.c
+ ./tvp-svn-helper/tsh-export.h
+ ./tvp-svn-helper/tsh-file-dialog.c
+ ./tvp-svn-helper/tsh-file-dialog.h
+ ./tvp-svn-helper/tsh-file-selection-dialog.c
+ ./tvp-svn-helper/tsh-file-selection-dialog.h
+ ./tvp-svn-helper/tsh-import.c
+ ./tvp-svn-helper/tsh-import.h
+ ./tvp-svn-helper/tsh-lock-dialog.c
+ ./tvp-svn-helper/tsh-lock-dialog.h
+ ./tvp-svn-helper/tsh-lock.c
+ ./tvp-svn-helper/tsh-lock.h
+ ./tvp-svn-helper/tsh-log-dialog.c
+ ./tvp-svn-helper/tsh-log-dialog.h
+ ./tvp-svn-helper/tsh-log-message-dialog.c
+ ./tvp-svn-helper/tsh-log-message-dialog.h
+ ./tvp-svn-helper/tsh-log.c
+ ./tvp-svn-helper/tsh-log.h
+ ./tvp-svn-helper/tsh-login-dialog.c
+ ./tvp-svn-helper/tsh-login-dialog.h
+ ./tvp-svn-helper/tsh-move.c
+ ./tvp-svn-helper/tsh-move.h
+ ./tvp-svn-helper/tsh-notify-dialog.c
+ ./tvp-svn-helper/tsh-notify-dialog.h
+ ./tvp-svn-helper/tsh-properties-dialog.c
+ ./tvp-svn-helper/tsh-properties-dialog.h
+ ./tvp-svn-helper/tsh-properties.c
+ ./tvp-svn-helper/tsh-properties.h
+ ./tvp-svn-helper/tsh-relocate-dialog.c
+ ./tvp-svn-helper/tsh-relocate-dialog.h
+ ./tvp-svn-helper/tsh-relocate.c
+ ./tvp-svn-helper/tsh-relocate.h
+ ./tvp-svn-helper/tsh-resolved.c
+ ./tvp-svn-helper/tsh-resolved.h
+ ./tvp-svn-helper/tsh-revert.c
+ ./tvp-svn-helper/tsh-revert.h
+ ./tvp-svn-helper/tsh-status-dialog.c
+ ./tvp-svn-helper/tsh-status-dialog.h
+ ./tvp-svn-helper/tsh-status.c
+ ./tvp-svn-helper/tsh-status.h
+ ./tvp-svn-helper/tsh-switch.c
+ ./tvp-svn-helper/tsh-switch.h
+ ./tvp-svn-helper/tsh-transfer-dialog.c
+ ./tvp-svn-helper/tsh-transfer-dialog.h
+ ./tvp-svn-helper/tsh-tree-common.c
+ ./tvp-svn-helper/tsh-tree-common.h
+ ./tvp-svn-helper/tsh-trust-dialog.c
+ ./tvp-svn-helper/tsh-trust-dialog.h
+ ./tvp-svn-helper/tsh-unlock.c
+ ./tvp-svn-helper/tsh-unlock.h
+ ./tvp-svn-helper/tsh-update.c
+ ./tvp-svn-helper/tsh-update.h
+Copyright: 2007-2011, Peter de Ridder <peter at xfce.org>
+License: GPL-2+
 
-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>
+Files: ./thunar-vcs-plugin/tvp-provider.c
+Copyright: 2006, Peter de Ridder <peter at xfce.org>
 License: 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+
-
 Files: debian/*
-Copyright: 2006-2001 Yves-Alexis Perez <corsac at debian.org>
-License: GPL-2+
+Copyright: 2011, 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'.
+General Public License can be found in `/usr/share/common-licenses/GPL'.  

Modified: goodies/trunk/thunar-vcs-plugin/debian/patches/01_fix-missing-links.patch
===================================================================
--- goodies/trunk/thunar-vcs-plugin/debian/patches/01_fix-missing-links.patch	2011-08-05 07:37:08 UTC (rev 5912)
+++ goodies/trunk/thunar-vcs-plugin/debian/patches/01_fix-missing-links.patch	2011-08-05 09:16:17 UTC (rev 5913)
@@ -1,17 +1,41 @@
-diff --git a/thunar-archive-plugin/Makefile.am b/thunar-archive-plugin/Makefile.am
-index 4cbfefa..c08f8d0 100644
---- a/thunar-archive-plugin/Makefile.am
-+++ b/thunar-archive-plugin/Makefile.am
-@@ -26,6 +26,12 @@ thunar_archive_plugin_la_CFLAGS =					\
+diff --git a/thunar-vcs-plugin/Makefile.am b/thunar-vcs-plugin/Makefile.am
+index 53949b2..5542e47 100644
+--- a/thunar-vcs-plugin/Makefile.am
++++ b/thunar-vcs-plugin/Makefile.am
+@@ -62,17 +62,36 @@ thunar_vcs_plugin_la_CFLAGS =						\
+ 	$(PLATFORM_CFLAGS)						\
+ 	$(THUNARX_CFLAGS)						\
  	$(EXO_CFLAGS)							\
++	$(GTK_CFLAGS)							\
++	$(GLIB_CFLAGS)							\
++	$(GOBJECT_CFLAGS)						\
  	$(LIBXFCE4UTIL_CFLAGS)
+ if HAVE_SUBVERSION
+ thunar_vcs_plugin_la_CFLAGS +=						\
+ 	$(APR_CFLAGS)
+ endif
  
-+thunar_archive_plugin_la_LIBADD =					\
++thunar_vcs_plugin_la_LIBADD =						\
 +	$(PLATFORM_LIBS)						\
-+	$(THUNARX_LIBS)							\
++	$(THUNARX_LIBS)						\
 +	$(EXO_LIBS)							\
++	$(GTK_LIBS)							\
++	$(GLIB_LIBS)							\
++	$(GOBJECT_LIBS)						\
 +	$(LIBXFCE4UTIL_LIBS)
++if HAVE_SUBVERSION
++thunar_vcs_plugin_la_LIBADD +=						\
++	$(APR_LIBS)
++endif
 +
- thunar_archive_plugin_la_LDFLAGS =					\
+ thunar_vcs_plugin_la_LDFLAGS =						\
  	-avoid-version							\
  	-export-dynamic							\
+ 	-module								\
+ 	$(PLATFORM_LDFLAGS)						\
++	$(GTK_LDFLAGS)							\
++	$(GLIB_LDFLAGS)							\
++	$(GOBJECT_LDFLAGS)						\
+ 	$(THUNARX_LDFLAGS)						\
+ 	$(EXO_LDFLAGS)							\
+ 	$(LIBXFCE4UTIL_LDFLAGS)

Modified: goodies/trunk/thunar-vcs-plugin/debian/rules
===================================================================
--- goodies/trunk/thunar-vcs-plugin/debian/rules	2011-08-05 07:37:08 UTC (rev 5912)
+++ goodies/trunk/thunar-vcs-plugin/debian/rules	2011-08-05 09:16:17 UTC (rev 5913)
@@ -10,13 +10,13 @@
 
 override_dh_auto_configure:
 	NOCONFIGURE=1 xdt-autogen
-	dh_auto_configure -- --libexecdir=/usr/lib/
+	dh_auto_configure
 
 override_dh_makeshlibs:
 	dh_makeshlibs -n -X /usr/lib/thunarx-2/
 
 override_dh_install:
-	rm -rf debian/thunar-archive-plugin/usr/lib/thunarx-2/*.la
+	rm -rf debian/thunar-vcs-plugin/usr/lib/thunarx-2/*.la
 	dh_install --fail-missing
 
 %:

Deleted: goodies/trunk/thunar-vcs-plugin/debian/thunar-archive-plugin.docs
===================================================================
--- goodies/trunk/thunar-vcs-plugin/debian/thunar-archive-plugin.docs	2011-08-05 07:37:08 UTC (rev 5912)
+++ goodies/trunk/thunar-vcs-plugin/debian/thunar-archive-plugin.docs	2011-08-05 09:16:17 UTC (rev 5913)
@@ -1 +0,0 @@
-AUTHORS NEWS README THANKS

Modified: goodies/trunk/thunar-vcs-plugin/debian/watch
===================================================================
--- goodies/trunk/thunar-vcs-plugin/debian/watch	2011-08-05 07:37:08 UTC (rev 5912)
+++ goodies/trunk/thunar-vcs-plugin/debian/watch	2011-08-05 09:16:17 UTC (rev 5913)
@@ -1,3 +1,3 @@
 version=3
-http://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/([\d\.]+)/ \
-	thunar-archive-plugin-([\d\.]+)\.tar\.(?:gz|bz2)
+http://archive.xfce.org/src/thunar-plugins/thunar-vcs-plugin/([\d\.]+)/ \
+	thunar-vcs-plugin-([\d\.]+)\.tar\.(?:gz|bz2)




More information about the Pkg-xfce-commits mailing list