[Pkg-xfce-commits] r4194 - desktop/branches/experimental/thunar/debian
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Wed Jul 28 06:08:36 UTC 2010
Author: mrpouit-guest
Date: 2010-07-28 18:08:33 +0000 (Wed, 28 Jul 2010)
New Revision: 4194
Modified:
desktop/branches/experimental/thunar/debian/changelog
desktop/branches/experimental/thunar/debian/control
desktop/branches/experimental/thunar/debian/rules
Log:
- debian/control: bump dh to >= 7.4.2~ and drop cdbs build-deps
the dir manually as it breaks some docs
+ override dh_installdocs with --link-doc=thunar-data instead of making
the symlinks manually.
Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog 2010-07-28 06:32:27 UTC (rev 4193)
+++ desktop/branches/experimental/thunar/debian/changelog 2010-07-28 18:08:33 UTC (rev 4194)
@@ -51,12 +51,14 @@
- series: added, include the patch above.
* debian/thunar.postinst: explicitly set -e.
* Convert to dh7 + overrides:
- - debian/control: bump dh to >= 7.0.50~ and drop cdbs build-deps
+ - debian/control: bump dh to >= 7.4.2~ and drop cdbs build-deps
- debian/*.install: drop leading debian/tmp
- debian/rules:
+ adapt it to dh7
+ pass --docdir=\$${prefix}/share/doc/thunar-data instead of moving
- the dir manually as it breaks some docs.
+ the dir manually as it breaks some docs
+ + override dh_installdocs with --link-doc=thunar-data instead of making
+ the symlinks manually.
-- Yves-Alexis Perez <corsac at debian.org> Tue, 27 Jul 2010 08:07:49 +0200
Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control 2010-07-28 06:32:27 UTC (rev 4193)
+++ desktop/branches/experimental/thunar/debian/control 2010-07-28 18:08:33 UTC (rev 4194)
@@ -4,7 +4,7 @@
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libexo-1-dev (>= 0.5.1), libxml-parser-perl,
+Build-Depends: debhelper (>= 7.4.2~), libexo-1-dev (>= 0.5.1), libxml-parser-perl,
libfam-dev, libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
chrpath, libpcre3-dev, libjpeg-dev,
libstartup-notification0-dev (>= 0.4), intltool, libxfce4ui-1-dev (>= 4.7.1),
Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules 2010-07-28 06:32:27 UTC (rev 4193)
+++ desktop/branches/experimental/thunar/debian/rules 2010-07-28 18:08:33 UTC (rev 4194)
@@ -29,12 +29,9 @@
#$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
dh_install --fail-missing --sourcedir=debian/tmp
-override_dh_link:
- for p in libthunarx-2-dev libthunarx-2-0 thunar; do \
- cd $(CURDIR)/debian/$$p/usr/share/doc/ && \
- rm -rf $$p && ln -sf thunar-data $$p; \
- done
- dh_link
+override_dh_installdocs:
+ dh_installdocs -p libthunarx-2-dev -p libthunarx-2-0 -p thunar --link-doc=thunar-data
+ dh_installdocs --remaining-packages
override_dh_strip:
dh_strip --dbg-package=thunar-dbg
More information about the Pkg-xfce-commits
mailing list