[Pkg-xfce-commits] r1228 - desktop/trunk/xfdesktop4/debian

[Simon Huggins]

Author: huggie
Date: 2007-04-26 09:49:15 +0000 (Thu, 26 Apr 2007)
New Revision: 1228

Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/rules
Log:
Remove duplicated copies of menus for Italian locale and release.


Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2007-04-24 17:09:23 UTC (rev 1227)
+++ desktop/trunk/xfdesktop4/debian/changelog	2007-04-26 09:49:15 UTC (rev 1228)
@@ -1,3 +1,10 @@
+xfdesktop4 (4.4.1-2) unstable; urgency=high
+
+  * Remove duplicated copies of content in menu.xml.it and
+    xfce-registered-categories.xml.it                          closes: #420872
+
+ -- Simon Huggins <huggie at earth.li>  Thu, 26 Apr 2007 10:29:41 +0100
+
 xfdesktop4 (4.4.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2007-04-24 17:09:23 UTC (rev 1227)
+++ desktop/trunk/xfdesktop4/debian/rules	2007-04-26 09:49:15 UTC (rev 1228)
@@ -80,6 +80,11 @@
 	   	perl -0777 -i -pe 's/cmd="xfterm4"/cmd="x-terminal-emulator"/; s/cmd="mozilla"/cmd="sensible-browser"/; s/(<include type="system" style="simple" unique="true"\/>)/$$1\n<separator\/>\n<menu name="Debian"><include type="file" src="menudefs.hook" \/><\/menu>\n/; s/xffm/thunar/g' $$f; \
 	done
 
+	# Remove the duplicated copies of XML in the Italian menu files.
+	for f in `pwd`/debian/xfdesktop4/etc/xdg/xfce4/desktop/*.xml.it; do \
+	   	perl -i -ne 'BEGIN { $$state = 0; } if (/xml version="1.0"/) { $$state++; } if ($$state < 2) { print; }' $$f; \
+	done
+
 	dh_installdocs README TODO
 	dh_installmenu
 	dh_installman debian/xfce4-menueditor.1