[Pkg-xfce-commits] r6561 - desktop/branches/experimental/exo/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2012-03-31 14:24:12 +0000 (Sat, 31 Mar 2012)
New Revision: 6561

Modified:
   desktop/branches/experimental/exo/debian/changelog
   desktop/branches/experimental/exo/debian/control
   desktop/branches/experimental/exo/debian/rules
Log:
* debian/rules: drop --sourcedir from dh_install, unneeded, and pass -X .la
  to ignore .la files instead of deleting them manually.
  - update libxfce4util (build-)dep to libxfce4util6-dev.

Modified: desktop/branches/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog	2012-03-31 14:10:29 UTC (rev 6560)
+++ desktop/branches/experimental/exo/debian/changelog	2012-03-31 14:24:12 UTC (rev 6561)
@@ -10,10 +10,12 @@
     buttons.
   * debian/libexo-common.install: updated, docs aren't shipped anymore.
   * debian/libexo-1-0.symbols: updated for the new symbols.
+  * debian/rules: drop --sourcedir from dh_install, unneeded, and pass -X .la
+    to ignore .la files instead of deleting them manually.
 
   [ Yves-Alexis Perez ]
   * debian/control:
-    - update libxfce4util build-dep to libxfce4util6-dev.
+    - update libxfce4util (build-)dep to libxfce4util6-dev.
     - update standards version to 3.9.3.
     - update debhelper build-dep to 9.
     - add build-dep on dpkg-dev 1.16.1.

Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2012-03-31 14:10:29 UTC (rev 6560)
+++ desktop/branches/experimental/exo/debian/control	2012-03-31 14:24:12 UTC (rev 6561)
@@ -16,7 +16,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libexo-1-0 (= ${binary:Version}), libxfce4util-dev (>= 4.8.0),
+Depends: libexo-1-0 (= ${binary:Version}), libxfce4util6-dev,
  ${misc:Depends}, libgtk2.0-dev
 Description: Development files for libexo
  This package contains the headers and the static library

Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules	2012-03-31 14:10:29 UTC (rev 6560)
+++ desktop/branches/experimental/exo/debian/rules	2012-03-31 14:24:12 UTC (rev 6561)
@@ -15,10 +15,6 @@
 	dh_auto_configure -- --disable-gtk-doc --disable-python
 
 override_dh_install:
-	# delete the unneeded .a and .la files
-	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexo-$(EXO_LIBNAME).la
-	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gio/modules/libexo-module-$(EXO_LIBNAME).la
-
 	# Debianise
 	sed -i -e 's/^WebBrowser=.*/WebBrowser=debian-sensible-browser/' \
 		-e 's/TerminalEmulator=.*/TerminalEmulator=debian-x-terminal-emulator/' \
@@ -35,7 +31,7 @@
 		<debian/tmp/usr/share/xfce4/helpers/mutt.desktop \
 		>debian/tmp/usr/share/xfce4/helpers/muttng.desktop
 
-	dh_install --fail-missing --sourcedir=debian/tmp
+	dh_install --fail-missing -X .la
 
 override_dh_strip:
 	dh_strip -p $(EXO_SONAME) --dbg-package=$(EXO_SONAME)-dbg