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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-29 06:10:28 +0000 (Fri, 29 Apr 2011)
New Revision: 5711

Removed:
   goodies/trunk/xfce4-wmdock-plugin/debian/patches/01_port-xfce4-panel-47.patch
Modified:
   goodies/trunk/xfce4-wmdock-plugin/debian/changelog
   goodies/trunk/xfce4-wmdock-plugin/debian/patches/series
Log:
* debian/patches:
  - 01_port-xfce4-panel-47 dropped, included upstream.

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/changelog	2011-04-29 06:08:52 UTC (rev 5710)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/changelog	2011-04-29 06:10:28 UTC (rev 5711)
@@ -1,8 +1,10 @@
 xfce4-wmdock-plugin (0.3.4-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - 01_port-xfce4-panel-47 dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:05:32 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 29 Apr 2011 08:09:50 +0200
 
 xfce4-wmdock-plugin (0.3.2-2) unstable; urgency=low
 

Deleted: goodies/trunk/xfce4-wmdock-plugin/debian/patches/01_port-xfce4-panel-47.patch
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/patches/01_port-xfce4-panel-47.patch	2011-04-29 06:08:52 UTC (rev 5710)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/patches/01_port-xfce4-panel-47.patch	2011-04-29 06:10:28 UTC (rev 5711)
@@ -1,36 +0,0 @@
-commit fac72772086fbb33f85fb92ae8a0981b482f5066
-Author: Andre Ellguth <ellguth at columbo.ibh>
-Date:   Fri Sep 3 12:12:17 2010 +0200
-
-    Added build support for xfce4-panel 4.7 (patch by Lionel Le Folgoc)
-
-diff --git a/panel-plugin/wmdock.c b/panel-plugin/wmdock.c
-index f6877c6..ba545e2 100644
---- a/panel-plugin/wmdock.c
-+++ b/panel-plugin/wmdock.c
-@@ -34,11 +34,7 @@
- #include <gtk/gtk.h>
- #include <libxfce4util/libxfce4util.h>
- #include <libxfcegui4/libxfcegui4.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
--#include <libxfce4panel/xfce-panel-window.h>
--#include <libxfce4panel/xfce-hvbox.h>
--#include <libxfce4panel/xfce-arrow-button.h>
--#include <libxfce4panel/xfce-panel-convenience.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #include "wmdock.h"
- #include "xfce4-wmdock-plugin.xpm"
-diff --git a/panel-plugin/wmdock.h b/panel-plugin/wmdock.h
-index 1b0f178..f8c42c9 100644
---- a/panel-plugin/wmdock.h
-+++ b/panel-plugin/wmdock.h
-@@ -25,7 +25,7 @@
- #define __WMDOCK_H__
- 
- #include <gtk/gtk.h>
--#include <libxfce4panel/xfce-panel-plugin.h>
-+#include <libxfce4panel/libxfce4panel.h>
- 
- #define WNCK_I_KNOW_THIS_IS_UNSTABLE
- #include <libwnck/libwnck.h>

Modified: goodies/trunk/xfce4-wmdock-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-wmdock-plugin/debian/patches/series	2011-04-29 06:08:52 UTC (rev 5710)
+++ goodies/trunk/xfce4-wmdock-plugin/debian/patches/series	2011-04-29 06:10:28 UTC (rev 5711)
@@ -1,2 +1 @@
-01_port-xfce4-panel-47.patch
 02_fix-indirect-dso-linking.patch