[Pkg-xfce-commits] r10208 - in /desktop/branches/experimental/thunar: ./ debian/

[Yves-Alexis Perez]

Author: corsac
Date: Mon Nov 27 12:14:34 2017
New Revision: 10208

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=10208
Log:
merge changes from trunk

inherit the symlink-to-dir conversion for thunar-data docs

Added:
    desktop/branches/experimental/thunar/debian/libthunarx-2-0.postinst
      - copied unchanged from r10207, desktop/trunk/thunar/debian/libthunarx-2-0.postinst
    desktop/branches/experimental/thunar/debian/libthunarx-2-0.postrm
      - copied unchanged from r10207, desktop/trunk/thunar/debian/libthunarx-2-0.postrm
    desktop/branches/experimental/thunar/debian/libthunarx-2-0.preinst
      - copied unchanged from r10207, desktop/trunk/thunar/debian/libthunarx-2-0.preinst
    desktop/branches/experimental/thunar/debian/libthunarx-2-dev.postinst
      - copied unchanged from r10207, desktop/trunk/thunar/debian/libthunarx-2-dev.postinst
    desktop/branches/experimental/thunar/debian/libthunarx-2-dev.postrm
      - copied unchanged from r10207, desktop/trunk/thunar/debian/libthunarx-2-dev.postrm
    desktop/branches/experimental/thunar/debian/libthunarx-2-dev.preinst
      - copied unchanged from r10207, desktop/trunk/thunar/debian/libthunarx-2-dev.preinst
    desktop/branches/experimental/thunar/debian/thunar.postinst
      - copied unchanged from r10207, desktop/trunk/thunar/debian/thunar.postinst
    desktop/branches/experimental/thunar/debian/thunar.postrm
      - copied unchanged from r10207, desktop/trunk/thunar/debian/thunar.postrm
    desktop/branches/experimental/thunar/debian/thunar.preinst
      - copied unchanged from r10207, desktop/trunk/thunar/debian/thunar.preinst
Modified:
    desktop/branches/experimental/thunar/   (props changed)
    desktop/branches/experimental/thunar/debian/changelog
    desktop/branches/experimental/thunar/debian/control
    desktop/branches/experimental/thunar/debian/rules

Propchange: desktop/branches/experimental/thunar/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Nov 27 12:14:34 2017
@@ -1 +1,2 @@
 /desktop/branches/experimental/thunar:6571-7429
+/desktop/trunk/thunar:10185-10207

Modified: desktop/branches/experimental/thunar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/thunar/debian/changelog?rev=10208&op=diff
==============================================================================
--- desktop/branches/experimental/thunar/debian/changelog	(original)
+++ desktop/branches/experimental/thunar/debian/changelog	Mon Nov 27 12:14:34 2017
@@ -20,6 +20,18 @@
   * Update VCS-Browser link to secure address
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 26 Nov 2017 20:25:50 +0100
+
+thunar (1.6.13-2) unstable; urgency=medium
+
+  * debian/control:
+    - libthunarx-2-0: drop strict dependency on thunar-data.
+  * debian/rules:
+    - stop shipping all doc in thunar-data since symlinks are not authorized
+      between arch:all and arch:any packages
+  * Add maintainers scripts for thunar, libthunarx-2-0 and libthunarx-2-dev to
+    migrate doc symlink to directory.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 27 Nov 2017 12:59:33 +0100
 
 thunar (1.6.13-1) unstable; urgency=medium
 

Modified: desktop/branches/experimental/thunar/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/thunar/debian/control?rev=10208&op=diff
==============================================================================
--- desktop/branches/experimental/thunar/debian/control	(original)
+++ desktop/branches/experimental/thunar/debian/control	Mon Nov 27 12:14:34 2017
@@ -23,7 +23,7 @@
                libxfconf-0-dev, 
                libxml-parser-perl,
                xfce4-dev-tools,
-               xfce4-panel-dev
+               xfce4-panel-dev (>= 4.10.0)
 Standards-Version: 4.1.1
 Homepage: http://thunar.xfce.org
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/thunar/
@@ -45,7 +45,7 @@
 Section: libs
 Architecture: any
 Pre-depends: ${misc:Pre-Depends}
-Depends: thunar-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: thunar-data, ${misc:Depends}, ${shlibs:Depends}
 Description: extension library for thunar
  This package contains the Thunar extension library which permits adding new
  features to the Thunar file manager.

Modified: desktop/branches/experimental/thunar/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/branches/experimental/thunar/debian/rules?rev=10208&op=diff
==============================================================================
--- desktop/branches/experimental/thunar/debian/rules	(original)
+++ desktop/branches/experimental/thunar/debian/rules	Mon Nov 27 12:14:34 2017
@@ -33,10 +33,6 @@
 override_dh_missing:
 	dh_missing --fail-missing
 
-override_dh_installdocs:
-	dh_installdocs -p libthunarx-3-dev -p libthunarx-3-0 -p thunar --link-doc=thunar-data
-	dh_installdocs --remaining-packages
-
 override_dh_strip:
 	dh_strip --dbgsym-migration='thunar-dbg (<< 1.6.11-2~)'