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

[huggie at alioth.debian.org]

Author: huggie
Date: 2007-08-07 11:34:52 +0000 (Tue, 07 Aug 2007)
New Revision: 1335

Added:
   desktop/trunk/thunar/debian/libthunar-vfs-1-2.postinst
   desktop/trunk/thunar/debian/libthunar-vfs-1-dev.postinst
   desktop/trunk/thunar/debian/thunar.postinst
Modified:
   desktop/trunk/thunar/debian/changelog
   desktop/trunk/thunar/debian/rules
Log:
Make /usr/share/doc/libthunar-vfs-1-dev/2 and thunar all be symlinks to
thunar-data.


Modified: desktop/trunk/thunar/debian/changelog
===================================================================
--- desktop/trunk/thunar/debian/changelog	2007-08-07 11:11:57 UTC (rev 1334)
+++ desktop/trunk/thunar/debian/changelog	2007-08-07 11:34:52 UTC (rev 1335)
@@ -1,9 +1,12 @@
 thunar (0.8.0-6) UNRELEASED; urgency=low
 
+  (Yves-Alexis Perez)
   * debian/control: build against libpcre3-dev to enable regexp in thunar mass
     renamer.                                                    closes: #434230
+  (Simon Huggins)
+  * Fix doc symlinks in packages.
 
- -- Yves-Alexis Perez <corsac at corsac.net>  Sun, 22 Jul 2007 18:48:56 +0200
+ -- Yves-Alexis Perez <corsac at corsac.net>  Tue, 07 Aug 2007 12:33:14 +0100
 
 thunar (0.8.0-5) unstable; urgency=low
 

Added: desktop/trunk/thunar/debian/libthunar-vfs-1-2.postinst
===================================================================
--- desktop/trunk/thunar/debian/libthunar-vfs-1-2.postinst	                        (rev 0)
+++ desktop/trunk/thunar/debian/libthunar-vfs-1-2.postinst	2007-08-07 11:34:52 UTC (rev 1335)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Frob /usr/share/doc so we don't needlessly duplicate things
+	rmdir /usr/share/doc/libthunar-vfs-1-2 2>/dev/null || true
+	cd /usr/share/doc && ln -sf thunar-data libthunar-vfs-1-2
+fi
+
+#DEBHELPER#
+
+exit 0


Property changes on: desktop/trunk/thunar/debian/libthunar-vfs-1-2.postinst
___________________________________________________________________
Name: svn:executable
   + *

Added: desktop/trunk/thunar/debian/libthunar-vfs-1-dev.postinst
===================================================================
--- desktop/trunk/thunar/debian/libthunar-vfs-1-dev.postinst	                        (rev 0)
+++ desktop/trunk/thunar/debian/libthunar-vfs-1-dev.postinst	2007-08-07 11:34:52 UTC (rev 1335)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Frob /usr/share/doc so we don't needlessly duplicate things
+	rmdir /usr/share/doc/libthunar-vfs-1-dev 2>/dev/null || true
+	cd /usr/share/doc && ln -sf thunar-data libthunar-vfs-1-dev
+fi
+
+#DEBHELPER#
+
+exit 0


Property changes on: desktop/trunk/thunar/debian/libthunar-vfs-1-dev.postinst
___________________________________________________________________
Name: svn:executable
   + *

Modified: desktop/trunk/thunar/debian/rules
===================================================================
--- desktop/trunk/thunar/debian/rules	2007-08-07 11:11:57 UTC (rev 1334)
+++ desktop/trunk/thunar/debian/rules	2007-08-07 11:34:52 UTC (rev 1335)
@@ -25,9 +25,21 @@
 	cd $(CURDIR)/debian/tmp/usr/share/doc/ && mv Thunar thunar-data
 	rm -rf $(CURDIR)/debian/tmp/usr/share/man
 
+# The symlinks below aren't enough for dpkg to replace a directory with a
+# symlink but they mean it's part of the package.
+
 binary-post-install/thunar::
 	rm -rf $(CURDIR)/debian/thunar/usr/share/doc/thunar
-	ln -s thunar-data $(CURDIR)/debian/thunar/usr/share/doc/thunar
+	cd $(CURDIR)/debian/thunar/usr/share/doc/ && \
+		rm -rf thunar && ln  -sf thunar-data 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
+	cd $(CURDIR)/debian/libthunar-vfs-1-2/usr/share/doc/ && \
+		rm -rf libthunar-vfs-1-2 && \
+		ln  -sf thunar-data libthunar-vfs-1-2
+
+binary-post-install/libthunar-vfs-1-dev::
+	cd $(CURDIR)/debian/libthunar-vfs-1-dev/usr/share/doc/ && \
+		rm -rf libthunar-vfs-1-dev && \
+		ln  -sf thunar-data libthunar-vfs-1-dev

Added: desktop/trunk/thunar/debian/thunar.postinst
===================================================================
--- desktop/trunk/thunar/debian/thunar.postinst	                        (rev 0)
+++ desktop/trunk/thunar/debian/thunar.postinst	2007-08-07 11:34:52 UTC (rev 1335)
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Frob /usr/share/doc so we don't needlessly duplicate things
+	rmdir /usr/share/doc/thunar 2>/dev/null || true
+	cd /usr/share/doc && ln -sf thunar-data thunar
+fi
+
+#DEBHELPER#
+
+exit 0


Property changes on: desktop/trunk/thunar/debian/thunar.postinst
___________________________________________________________________
Name: svn:executable
   + *