[Pkg-xfce-commits] r5326 - in goodies/trunk/xfce4-wmdock-plugin: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-03 12:51:39 +0000 (Sun, 03 Apr 2011)
New Revision: 5326

Added:
   goodies/trunk/xfce4-wmdock-plugin/debian/patches/
   goodies/trunk/xfce4-wmdock-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-wmdock-plugin/
   goodies/trunk/xfce4-wmdock-plugin/debian/changelog
   goodies/trunk/xfce4-wmdock-plugin/debian/control
   goodies/trunk/xfce4-wmdock-plugin/debian/copyright
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/xfce4-wmdock-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-wmdock-plugin:4419-5324

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/changelog	2011-04-03 12:50:38 UTC (rev 5325)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/changelog	2011-04-03 12:51:39 UTC (rev 5326)
@@ -7,9 +7,21 @@
   * debian/watch edited to track Xfce archive reorganisation.
   * debian/control:
     - switch to xfce section.
+    - update standards version to 3.9.1.
+    - add build-dep on libxfcegui4-dev.
+  * Switch to 3.0 (quilt) source format.
+  * debian/patches:
+    - 01_port-xfce4-panel-47 added, port plugin to xfce4-panel 4.7.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 19 Jun 2010 13:17:47 +0200
+  [ Lionel Le Folgoc ]
+  * debian/patches:
+    - 02_fix-indirect-dso-linking.patch: pass missing -lX11, fixes FTBFS
+      with binutils-gold.                                       Closes: #556702
+    - series: refreshed.
+  * debian/control: add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 05 Nov 2010 21:45:34 +0100
+
 xfce4-wmdock-plugin (0.3.2-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/control	2011-04-03 12:50:38 UTC (rev 5325)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/control	2011-04-03 12:51:39 UTC (rev 5326)
@@ -2,10 +2,12 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Enrique Monge <emonge at debian.org.sv>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
+Uploaders: Enrique Monge <emonge at debian.org.sv>, 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 (>= 6), autotools-dev, cdbs, xfce4-panel-dev,
- libwnck-dev, intltool
-Standards-Version: 3.8.0
+ libwnck-dev, intltool, libxfcegui4-dev
+Standards-Version: 3.9.1
 Homepage: http://www.ibh.de/~ellguth/xfce4-wmdock-plugin.html
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-wmdock-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-wmdock-plugin/

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/copyright
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/copyright	2011-04-03 12:50:38 UTC (rev 5325)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/copyright	2011-04-03 12:51:39 UTC (rev 5326)
@@ -16,4 +16,4 @@
 The plugin is licensed under the GPL version 2. On Debian system, it can be
 found in `/usr/share/common-licenses/GPL-2'.
 The Debian packaging is (C) 2007, Enrique Monge <emonge at debian.org.sv> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.