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

[Evgeni Golov]

Author: evgeni
Date: 2010-06-29 07:35:29 +0000 (Tue, 29 Jun 2010)
New Revision: 4154

Added:
   goodies/trunk/xfce4-indicator-plugin/debian/patches/03_skip_pofiles_in_patches.patch
Modified:
   goodies/trunk/xfce4-indicator-plugin/debian/changelog
   goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch
   goodies/trunk/xfce4-indicator-plugin/debian/patches/series
Log:
Split the POTFILES.skip patch out, list all changed files in there.


Modified: goodies/trunk/xfce4-indicator-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/changelog	2010-06-29 07:32:21 UTC (rev 4153)
+++ goodies/trunk/xfce4-indicator-plugin/debian/changelog	2010-06-29 07:35:29 UTC (rev 4154)
@@ -5,8 +5,10 @@
     + Add Recommends: indicator-messages
   * debian/patches/02_menu_on_no-indicators.patch
     + Display a menu even when there are no indicators.        closes: #587167
+  * debian/patches/03_skip_pofiles_in_patches.patch
+    + Split the POTFILES.skip patch out, list all changed files in there.
 
- -- Evgeni Golov <evgeni at debian.org>  Tue, 29 Jun 2010 09:30:40 +0200
+ -- Evgeni Golov <evgeni at debian.org>  Tue, 29 Jun 2010 09:33:37 +0200
 
 xfce4-indicator-plugin (0.0.1-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch	2010-06-29 07:32:21 UTC (rev 4153)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch	2010-06-29 07:35:29 UTC (rev 4154)
@@ -118,12 +118,6 @@
  
  	return TRUE;
  }
-Index: xfce4-indicator-plugin-0.0.1/po/POTFILES.skip
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xfce4-indicator-plugin-0.0.1/po/POTFILES.skip	2010-06-13 18:00:35.548755923 +0200
-@@ -0,0 +1 @@
-+.pc/01_libindicator0.3.0_compat.patch/panel-plugin/indicator.c
 Index: xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.am
 ===================================================================
 --- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/Makefile.am	2010-06-13 18:01:02.988286674 +0200

Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/03_skip_pofiles_in_patches.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/03_skip_pofiles_in_patches.patch	                        (rev 0)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/03_skip_pofiles_in_patches.patch	2010-06-29 07:35:29 UTC (rev 4154)
@@ -0,0 +1,14 @@
+Description: skip files under .pc which contain translatable strings
+ the build will fail otherwise in update-po
+Forwarded: not-needed
+Author: Evgeni Golov <evgeni at debian.org>
+Last-Update: 2010-06-29
+
+Index: xfce4-indicator-plugin-0.0.1/po/POTFILES.skip
+===================================================================
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ xfce4-indicator-plugin-0.0.1/po/POTFILES.skip       2010-06-13 18:00:35.548755923 +0200
+@@ -0,0 +1,2 @@
++.pc/01_libindicator0.3.0_compat.patch/panel-plugin/indicator.c
++.pc/02_menu_on_no-indicators.patch/panel-plugin/indicator.c
+

Modified: goodies/trunk/xfce4-indicator-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/series	2010-06-29 07:32:21 UTC (rev 4153)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/series	2010-06-29 07:35:29 UTC (rev 4154)
@@ -1,2 +1,3 @@
 01_libindicator0.3.0_compat.patch
 02_menu_on_no-indicators.patch
+03_skip_pofiles_in_patches.patch