[Pkg-xfce-commits] r1269 - desktop/trunk/thunar/debian

[huggie at alioth.debian.org]

Author: huggie
Date: 2007-05-25 15:04:07 +0000 (Fri, 25 May 2007)
New Revision: 1269

Added:
   desktop/trunk/thunar/debian/thunar-data.docs
   desktop/trunk/thunar/debian/thunar-data.install
   desktop/trunk/thunar/debian/thunar.manpages
Removed:
   desktop/trunk/thunar/debian/thunar.docs
Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/control
   desktop/trunk/thunar/debian/rules
   desktop/trunk/thunar/debian/thunar.install
Log:
Commit the architecture independent split out bits destined for
experimental.


Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2007-05-25 15:00:26 UTC (rev 1268)
+++ desktop/trunk/thunar/debian/changelog	2007-05-25 15:04:07 UTC (rev 1269)
@@ -1,3 +1,9 @@
+thunar (0.8.0-4) UNRELEASED-experimental; urgency=low
+
+  * Split out the architecture independent files.
+
+ -- Simon Huggins <huggie at earth.li>  Thu, 24 May 2007 15:02:26 +0100
+
 thunar (0.8.0-3) unstable; urgency=low
 
   * debian/control: Suggests thunar-volman

Modified: desktop/trunk/thunar/debian/control
===================================================================
--- desktop/trunk/thunar/debian/control	2007-05-25 15:00:26 UTC (rev 1268)
+++ desktop/trunk/thunar/debian/control	2007-05-25 15:04:07 UTC (rev 1269)
@@ -27,7 +27,7 @@
 
 Package: thunar
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info
+Depends: ${shlibs:Depends}, ${misc:Depends}, desktop-file-utils, shared-mime-info, thunar-data (= ${source:Version})
 Recommends: hal, dbus, gamin
 Conflicts: libthunar-vfs-1 (<= 0.2.0alpha-r19548-3)
 Replaces: libthunar-vfs-dev (<= 0.3.0beta1-2)
@@ -38,3 +38,8 @@
   .
   Please read README.Debian for volume management stuff.
 
+Package: thunar-data
+Architecture: all
+Replaces: thunar (<= 0.8.0-3)
+Description: Provides thunar documentation, icons and translations
+ This package contains architecture-independent files for thunar.

Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules	2007-05-25 15:00:26 UTC (rev 1268)
+++ desktop/trunk/thunar/debian/rules	2007-05-25 15:04:07 UTC (rev 1269)
@@ -13,8 +13,6 @@
 	
 
 install/thunar::
-	cd $(CURDIR)/debian/tmp/usr/share/doc/ \
-	&& mv Thunar thunar
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la 
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la 
 	chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
@@ -23,8 +21,12 @@
 		$(CURDIR)/debian/tmp/usr/lib/thunarx-1/thunar-apr.so \
 		$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
 
+install/thunar-data::
+	cd $(CURDIR)/debian/tmp/usr/share/doc/ && mv Thunar thunar-data
+
 binary-post-install/thunar::
-	dh_installman -pthunar debian/thunar.1
+	rm -rf $(CURDIR)/debian/thunar/usr/share/doc/thunar
+	ln -s thunar-data $(CURDIR)/debian/thunar/usr/share/doc/thunar
 
 binary-post-install/libthunar-vfs-1-2::
 	install -D -p -o root -g root -m 644 debian/lintian $(CURDIR)/debian/libthunar-vfs-1/usr/share/lintian/overrides/libthunar-vfs-1

Copied: desktop/trunk/thunar/debian/thunar-data.docs (from rev 1256, desktop/trunk/thunar/debian/thunar.docs)
===================================================================
--- desktop/trunk/thunar/debian/thunar-data.docs	                        (rev 0)
+++ desktop/trunk/thunar/debian/thunar-data.docs	2007-05-25 15:04:07 UTC (rev 1269)
@@ -0,0 +1,3 @@
+debian/README.Debian
+FAQ
+HACKING

Added: desktop/trunk/thunar/debian/thunar-data.install
===================================================================
--- desktop/trunk/thunar/debian/thunar-data.install	                        (rev 0)
+++ desktop/trunk/thunar/debian/thunar-data.install	2007-05-25 15:04:07 UTC (rev 1269)
@@ -0,0 +1,2 @@
+debian/tmp/etc/*
+debian/tmp/usr/share/*

Deleted: desktop/trunk/thunar/debian/thunar.docs
===================================================================
--- desktop/trunk/thunar/debian/thunar.docs	2007-05-25 15:00:26 UTC (rev 1268)
+++ desktop/trunk/thunar/debian/thunar.docs	2007-05-25 15:04:07 UTC (rev 1269)
@@ -1,3 +0,0 @@
-debian/README.Debian
-FAQ
-HACKING

Modified: desktop/trunk/thunar/debian/thunar.install
===================================================================
--- desktop/trunk/thunar/debian/thunar.install	2007-05-25 15:00:26 UTC (rev 1268)
+++ desktop/trunk/thunar/debian/thunar.install	2007-05-25 15:04:07 UTC (rev 1269)
@@ -1,4 +1,2 @@
 debian/tmp/usr/bin/*
-debian/tmp/etc/*
 debian/tmp/usr/lib/thunar/*
-debian/tmp/usr/share/*

Added: desktop/trunk/thunar/debian/thunar.manpages
===================================================================
--- desktop/trunk/thunar/debian/thunar.manpages	                        (rev 0)
+++ desktop/trunk/thunar/debian/thunar.manpages	2007-05-25 15:04:07 UTC (rev 1269)
@@ -0,0 +1,2 @@
+debian/thunar.1
+docs/Thunar.1