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

huggie at alioth.debian.org huggie at alioth.debian.org
Fri May 25 15:00:26 UTC 2007 

Author: huggie
Date: 2007-05-25 15:00:26 +0000 (Fri, 25 May 2007)
New Revision: 1268

Added:
   desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install
   desktop/trunk/xfdesktop4/debian/xfdesktop4.install
   desktop/trunk/xfdesktop4/debian/xfdesktop4.manpages
   desktop/trunk/xfdesktop4/debian/xfdesktop4.menu
   desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst
   desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm
   desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm
Removed:
   desktop/trunk/xfdesktop4/debian/menu
   desktop/trunk/xfdesktop4/debian/postinst
   desktop/trunk/xfdesktop4/debian/postrm
   desktop/trunk/xfdesktop4/debian/prerm
Modified:
   desktop/trunk/xfdesktop4/debian/changelog
   desktop/trunk/xfdesktop4/debian/control
   desktop/trunk/xfdesktop4/debian/rules
Log:
Commit the architecture independent split out bits destined for
experimental.


Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog	2007-05-25 11:02:53 UTC (rev 1267)
+++ desktop/trunk/xfdesktop4/debian/changelog	2007-05-25 15:00:26 UTC (rev 1268)
@@ -1,3 +1,10 @@
+xfdesktop4 (4.4.1-3) UNRELEASED-experimental; urgency=low
+
+  * Split out architecture independent files to xfdesktop4-data based on a
+    patch by Darren Salt                                       closes: #379814
+
+ -- Simon Huggins <huggie at earth.li>  Thu, 24 May 2007 09:32:48 +0100
+
 xfdesktop4 (4.4.1-2) unstable; urgency=high
 
   * Remove duplicated copies of content in menu.xml.it and

Modified: desktop/trunk/xfdesktop4/debian/control
===================================================================
--- desktop/trunk/xfdesktop4/debian/control	2007-05-25 11:02:53 UTC (rev 1267)
+++ desktop/trunk/xfdesktop4/debian/control	2007-05-25 15:00:26 UTC (rev 1268)
@@ -6,9 +6,15 @@
 Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev (>= 2.10.1-1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.4.1), libexo-0.3-dev (>= 0.3.2), libthunar-vfs-1-dev (>= 0.8.0), chrpath, libdbus-glib-1-dev, quilt
 Standards-Version: 3.7.2
 
+Package: xfdesktop4-data
+Architecture: all
+Replaces: xfdesktop4 (<= 4.4.1-2)
+Description: Provides xfdesktop4 desktop background and root menu (common files)
+ This package contains architecture-independent files for xfdesktop4.
+
 Package: xfdesktop4
 Architecture: any
-Depends: ${shlibs:Depends}, xfce4-mcs-manager, xfce4-utils
+Depends: ${shlibs:Depends}, xfce4-mcs-manager, xfce4-utils, xfdesktop4-data (= ${source:Version})
 Recommends: dbus, librsvg2-common
 Suggests: menu
 Conflicts: menu (<<2.1.12)

Deleted: desktop/trunk/xfdesktop4/debian/menu
===================================================================
--- desktop/trunk/xfdesktop4/debian/menu	2007-05-25 11:02:53 UTC (rev 1267)
+++ desktop/trunk/xfdesktop4/debian/menu	2007-05-25 15:00:26 UTC (rev 1268)
@@ -1,2 +0,0 @@
-?package(xfdesktop4): needs="X11" section="Apps/Tools" command="xfdesktop" \
-  title="Xfdesktop" longtitle="Xfce configuration interface" hints="Configuration Interface"

Deleted: desktop/trunk/xfdesktop4/debian/postinst
===================================================================
--- desktop/trunk/xfdesktop4/debian/postinst	2007-05-25 11:02:53 UTC (rev 1267)
+++ desktop/trunk/xfdesktop4/debian/postinst	2007-05-25 15:00:26 UTC (rev 1268)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "configure" ]; then 
-	if [ ! -f /etc/xdg/xfce4/desktop/menudefs.hook ]; then
-		cat >/etc/xdg/xfce4/desktop/menudefs.hook <<EOF
-<!--
-	This file is deliberately empty.  Run update-menus to populate it
-	with the debian menu
--->
-EOF
-	fi
-
-	# Get xfce-mcs-manager to reinit
-	# hurd doesnt have procps so we do it another way
-	#pkill -USR1 -f xfce-mcs-manager || true
-	/bin/kill -USR1 `pidof xfce-mcs-manager` > /dev/null 2>&1|| true
-
-fi
-
-#DEBHELPER#

Deleted: desktop/trunk/xfdesktop4/debian/postrm
===================================================================
--- desktop/trunk/xfdesktop4/debian/postrm	2007-05-25 11:02:53 UTC (rev 1267)
+++ desktop/trunk/xfdesktop4/debian/postrm	2007-05-25 15:00:26 UTC (rev 1268)
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "purge" ]; then
-  rm -rf /etc/xdg/xfce4/desktop/menudefs.hook
-  rm -rf /etc/xdg/xfce4/desktop/notforuse.xml
-fi
-
-#DEBHELPER#

Deleted: desktop/trunk/xfdesktop4/debian/prerm
===================================================================
--- desktop/trunk/xfdesktop4/debian/prerm	2007-05-25 11:02:53 UTC (rev 1267)
+++ desktop/trunk/xfdesktop4/debian/prerm	2007-05-25 15:00:26 UTC (rev 1268)
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "remove" ]; then
-	# Get xfce-mcs-manager to reinit
-	pkill -USR1 -f xfce-mcs-manager || true
-fi
-
-#DEBHELPER#
-
-exit 0

Modified: desktop/trunk/xfdesktop4/debian/rules
===================================================================
--- desktop/trunk/xfdesktop4/debian/rules	2007-05-25 11:02:53 UTC (rev 1267)
+++ desktop/trunk/xfdesktop4/debian/rules	2007-05-25 15:00:26 UTC (rev 1268)
@@ -56,17 +56,17 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs 
 
-	$(MAKE) install DESTDIR=`pwd`/debian/xfdesktop4
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
 
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/mcs-plugins/*.la
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/mcs-plugins/*.a
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/modules/*.la
-	rm -f `pwd`/debian/xfdesktop4/usr/lib/xfce4/modules/*.a
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/modules/*.la
+	rm -f `pwd`/debian/tmp/usr/lib/xfce4/modules/*.a
 
-	chrpath -d -k `pwd`/debian/xfdesktop4/usr/bin/* \
-		`pwd`/debian/xfdesktop4/usr/lib/xfce4/*/*
+	chrpath -d -k `pwd`/debian/tmp/usr/bin/* \
+		`pwd`/debian/tmp/usr/lib/xfce4/*/*
 
 binary-indep: build install
 
@@ -76,21 +76,25 @@
 	dh_testroot
 
 	# use correct Debian defaults
-	for f in `pwd`/debian/xfdesktop4/etc/xdg/xfce4/desktop/menu.xml*; do \
+	for f in `pwd`/debian/tmp/etc/xdg/xfce4/desktop/menu.xml*; do \
 	   	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 \
+	for f in `pwd`/debian/tmp/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
-	dh_installman debian/xfce4-popup-menu.1
+	dh_installman
 	
 	dh_installchangelogs ChangeLog
+
+	dh_install
+
+	rm -rf `pwd`/debian/xfdesktop4/usr/share/doc/xfdesktop4
+	ln -s xfdesktop4-data `pwd`/debian/xfdesktop4/usr/share/doc/xfdesktop4
 	dh_link
 	
 	dh_strip
@@ -101,7 +105,7 @@
 
 	dh_shlibdeps
 	dh_gencontrol
-	
+
 	dh_md5sums
 	dh_builddeb
 

Added: desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4-data.install	2007-05-25 15:00:26 UTC (rev 1268)
@@ -0,0 +1,6 @@
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/man
+debian/tmp/usr/share/pixmaps
+debian/tmp/usr/share/xfce4-menueditor
+debian/tmp/usr/share/xfce4

Added: desktop/trunk/xfdesktop4/debian/xfdesktop4.install
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.install	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.install	2007-05-25 15:00:26 UTC (rev 1268)
@@ -0,0 +1,4 @@
+debian/tmp/etc
+debian/tmp/usr/bin
+debian/tmp/usr/lib
+debian/tmp/usr/share/applications

Added: desktop/trunk/xfdesktop4/debian/xfdesktop4.manpages
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.manpages	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.manpages	2007-05-25 15:00:26 UTC (rev 1268)
@@ -0,0 +1,2 @@
+debian/*.1
+xfdesktop.1

Copied: desktop/trunk/xfdesktop4/debian/xfdesktop4.menu (from rev 1256, desktop/trunk/xfdesktop4/debian/menu)
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.menu	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.menu	2007-05-25 15:00:26 UTC (rev 1268)
@@ -0,0 +1,2 @@
+?package(xfdesktop4): needs="X11" section="Apps/Tools" command="xfdesktop" \
+  title="Xfdesktop" longtitle="Xfce configuration interface" hints="Configuration Interface"

Copied: desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst (from rev 1256, desktop/trunk/xfdesktop4/debian/postinst)
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.postinst	2007-05-25 15:00:26 UTC (rev 1268)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]; then 
+	if [ ! -f /etc/xdg/xfce4/desktop/menudefs.hook ]; then
+		cat >/etc/xdg/xfce4/desktop/menudefs.hook <<EOF
+<!--
+	This file is deliberately empty.  Run update-menus to populate it
+	with the debian menu
+-->
+EOF
+	fi
+
+	# Get xfce-mcs-manager to reinit
+	# hurd doesnt have procps so we do it another way
+	#pkill -USR1 -f xfce-mcs-manager || true
+	/bin/kill -USR1 `pidof xfce-mcs-manager` > /dev/null 2>&1|| true
+
+fi
+
+#DEBHELPER#

Copied: desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm (from rev 1256, desktop/trunk/xfdesktop4/debian/postrm)
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.postrm	2007-05-25 15:00:26 UTC (rev 1268)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$1" = "purge" ]; then
+  rm -rf /etc/xdg/xfce4/desktop/menudefs.hook
+  rm -rf /etc/xdg/xfce4/desktop/notforuse.xml
+fi
+
+#DEBHELPER#

Copied: desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm (from rev 1256, desktop/trunk/xfdesktop4/debian/prerm)
===================================================================
--- desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm	                        (rev 0)
+++ desktop/trunk/xfdesktop4/debian/xfdesktop4.prerm	2007-05-25 15:00:26 UTC (rev 1268)
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ]; then
+	# Get xfce-mcs-manager to reinit
+	pkill -USR1 -f xfce-mcs-manager || true
+fi
+
+#DEBHELPER#
+
+exit 0

More information about the Pkg-xfce-commits mailing list