[Pkg-xfce-commits] r4185 - in desktop/branches/experimental/thunar/debian: . patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Mon Jul 26 10:07:54 UTC 2010
Author: mrpouit-guest
Date: 2010-07-26 22:07:51 +0000 (Mon, 26 Jul 2010)
New Revision: 4185
Modified:
desktop/branches/experimental/thunar/debian/changelog
desktop/branches/experimental/thunar/debian/control
desktop/branches/experimental/thunar/debian/copyright
desktop/branches/experimental/thunar/debian/libthunarx-2-0.install
desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install
desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
desktop/branches/experimental/thunar/debian/rules
desktop/branches/experimental/thunar/debian/thunar-data.install
desktop/branches/experimental/thunar/debian/thunar.install
desktop/branches/experimental/thunar/debian/thunar.manpages
desktop/branches/experimental/thunar/debian/thunar.postinst
Log:
- build-depends on libnotify-dev and libgudev-1.0-dev, drop libcairo2-dev
- bump Standards-Version to 3.9.1, no change required.
* debian/thunar.postinst: explicitly set -e.
* Convert to dh7 + overrides:
- debian/control: bump dh to >= 7.0.50~ 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.
Modified: desktop/branches/experimental/thunar/debian/changelog
===================================================================
--- desktop/branches/experimental/thunar/debian/changelog 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/changelog 2010-07-26 22:07:51 UTC (rev 4185)
@@ -33,15 +33,23 @@
- update libthunarx-2-dev dep on libexo-0.3-dev to libexo-1-dev
- drop obsolete hal build and binary deps (this version uses GIO now)
- libthunarx-2-dev: drop dep on libexo-1-dev
- - build-depends on libnotify-dev and libgudev-1.0-dev
+ - build-depends on libnotify-dev and libgudev-1.0-dev, drop libcairo2-dev
- bump xfce4-panel-dev build-dep to >= 4.7.0
- - bump Standards-Version to 3.9.0, no change required.
+ - bump Standards-Version to 3.9.1, no change required.
* debian/copyright: refreshed.
* debian/source/format: switch to 3.0 (quilt).
* debian/rules: drop simple-patchsys.mk include.
* debian/patches:
- 02_thunar-icon-naming-spec-compliance.patch: refreshed to apply cleanly
- 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/*.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.
-- Yves-Alexis Perez <corsac at debian.org> Sun, 21 Feb 2010 15:37:20 +0100
Modified: desktop/branches/experimental/thunar/debian/control
===================================================================
--- desktop/branches/experimental/thunar/debian/control 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/control 2010-07-26 22:07:51 UTC (rev 4185)
@@ -4,14 +4,13 @@
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), libcairo2-dev,
- libexo-1-dev (>= 0.5.1), cdbs, libxml-parser-perl, libfam-dev,
- libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
+Build-Depends: debhelper (>= 7.0.50~), libexo-1-dev (>= 0.5.1), libxml-parser-perl,
+ libfam-dev, libdbus-glib-1-dev, libexif-dev, libgtk2.0-dev (>= 2.10.1),
xfce4-panel-dev (>= 4.7.0), chrpath, libpcre3-dev, libjpeg-dev,
libstartup-notification0-dev (>= 0.4), intltool, libxfce4ui-1-dev (>= 4.7.1),
libnotify-dev, libgudev-1.0-dev
Build-Conflicts: libgamin-dev [!hurd-i386]
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://thunar.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/thunar/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/thunar/
Modified: desktop/branches/experimental/thunar/debian/copyright
===================================================================
--- desktop/branches/experimental/thunar/debian/copyright 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/copyright 2010-07-26 22:07:51 UTC (rev 4185)
@@ -38,7 +38,7 @@
Licenses:
=========
-GNU/LGPL for files under thunarx, thunar-vfs , tdb folders
+GNU/LGPL for files under thunarx and tdb folders
GNU/GPL for the others
GNU/FDL v1.1 or later for documentation, with no invariant sections, using the
Modified: desktop/branches/experimental/thunar/debian/libthunarx-2-0.install
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-0.install 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-0.install 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/thunarx-2/*
+usr/lib/lib*.so.*
+usr/lib/thunarx-2/*
Modified: desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install
===================================================================
--- desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/libthunarx-2-dev.install 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
+usr/include/*
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
Modified: desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch
===================================================================
--- desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/patches/02_thunar-icon-naming-spec-compliance.patch 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,3 +1,13 @@
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index dc12c08..ec1b178 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -6,3 +6,5 @@ thunarx/thunarx-property-page-provider.c
+ thunarx/thunarx-provider-factory.c
+ thunarx/thunarx-provider-module.c
+ thunarx/thunarx-renamer-provider.c
++.pc/02_thunar-icon-naming-spec-compliance.patch/thunar/thunar-application.c
++.pc/02_thunar-icon-naming-spec-compliance.patch/thunar/thunar-dialogs.c
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index dc12c08..ec1b178 100644
--- a/thunar/thunar-application.c
Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/rules 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,48 +1,51 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-dbus --enable-startup-notification --enable-apr-plugin --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin
+#LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
-DEB_DH_SHLIBDEPS_ARGS_thunar = -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -dDepends
+%:
+ dh $@
-DEB_DH_MAKESHLIBS_ARGS_libthunarx-2-0 = -X debian/libthunarx-2-0/usr/lib/thunarx-2
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-dbus --enable-startup-notification --enable-apr-plugin \
+ --enable-exif --enable-pcre --enable-sbr-plugin --enable-tpa-plugin --enable-uca-plugin \
+ --docdir=\$${prefix}/share/doc/thunar-data
-install/thunar::
- rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
- rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la
+override_dh_auto_test:
+
+override_dh_install:
+ rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
+ rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.la
+ # install sendto stuff
+ install -m 0644 $(CURDIR)/debian/bluetooth-sendto.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+ install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+ install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+ # rpath
chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/Thunar \
$(CURDIR)/debian/tmp/usr/lib/thunar/thunar-* \
$(CURDIR)/debian/tmp/usr/lib/libthunar*.so.*0 \
$(CURDIR)/debian/tmp/usr/lib/thunarx-2/thunar-apr.so \
$(CURDIR)/debian/tmp/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa
+ dh_install --fail-missing --sourcedir=debian/tmp
-install/thunar-data::
- cd $(CURDIR)/debian/tmp/usr/share/doc/ && mv Thunar thunar-data
- rm -rf $(CURDIR)/debian/tmp/usr/share/man
- # install sendto stuff
- install -m 0644 $(CURDIR)/debian/bluetooth-sendto.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
- install -m 0644 $(CURDIR)/debian/gnome-obex-send.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
- install -m 0644 $(CURDIR)/debian/xfprint.desktop $(CURDIR)/debian/tmp/usr/share/Thunar/sendto/
+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
-binary-post-install/thunar-data::
- rm -rf $(CURDIR)/debian/thunar-data/usr/share/applications
- rm -rf $(CURDIR)/debian/thunar-data/usr/share/xfce4/
+override_dh_strip:
+ dh_strip --dbg-package=thunar-dbg
-# The symlinks below aren't enough for dpkg to replace a directory with a
-# symlink but they mean it's part of the package.
+override_dh_shlibdeps:
+ dh_shlibdeps -p thunar -X debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -- \
+ -dRecommends debian/thunar/usr/lib/thunar/xfce4/panel-plugins/thunar-tpa -dDepends
+ dh_shlibdeps
-binary-post-install/thunar::
- rm -rf $(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/libthunarx-2-0::
- cd $(CURDIR)/debian/libthunarx-2-0/usr/share/doc/ && \
- rm -rf libthunarx-2-0 && \
- ln -sf thunar-data libthunarx-2-0
-
-binary-post-install/libthunarx-2-dev::
- cd $(CURDIR)/debian/libthunarx-2-dev/usr/share/doc/ && \
- rm -rf libthunarx-2-dev && \
- ln -sf thunar-data libthunarx-2-dev
+override_dh_makeshlibs:
+ dh_makeshlibs -p libthunarx-2-0 -X debian/libthunarx-2-0/usr/lib/thunarx-2
Modified: desktop/branches/experimental/thunar/debian/thunar-data.install
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar-data.install 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/thunar-data.install 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,2 +1,8 @@
-debian/tmp/etc/*
-debian/tmp/usr/share/*
+etc/*
+usr/share/dbus-1
+usr/share/doc
+usr/share/gtk-doc
+usr/share/icons
+usr/share/locale
+usr/share/pixmaps
+usr/share/Thunar
Modified: desktop/branches/experimental/thunar/debian/thunar.install
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.install 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/thunar.install 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,4 +1,5 @@
-debian/tmp/usr/bin/*
-debian/tmp/usr/lib/thunar/*
-debian/tmp/usr/share/applications/*
-debian/tmp/usr/share/xfce4/panel-plugins/thunar-tpa.desktop
+usr/bin/*
+usr/lib/thunar/*
+usr/share/applications/*
+usr/share/man
+usr/share/xfce4/panel-plugins/thunar-tpa.desktop
Modified: desktop/branches/experimental/thunar/debian/thunar.manpages
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.manpages 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/thunar.manpages 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,2 +1 @@
debian/thunar.1
-docs/Thunar.1
Modified: desktop/branches/experimental/thunar/debian/thunar.postinst
===================================================================
--- desktop/branches/experimental/thunar/debian/thunar.postinst 2010-07-26 18:15:26 UTC (rev 4184)
+++ desktop/branches/experimental/thunar/debian/thunar.postinst 2010-07-26 22:07:51 UTC (rev 4185)
@@ -1,5 +1,7 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
+
if [ "$1" = "configure" ] && dpkg --compare-versions "$2" eq "1.0.0-2";
then
cd /usr/share/doc/thunar && rm -f thunar-data
More information about the Pkg-xfce-commits
mailing list