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

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-21 14:15:44 +0000 (Sun, 21 Nov 2010)
New Revision: 4577

Modified:
   desktop/branches/experimental/exo/debian/changelog
   desktop/branches/experimental/exo/debian/control
   desktop/branches/experimental/exo/debian/libexo-1-0.install
   desktop/branches/experimental/exo/debian/libexo-1-dev.install
   desktop/branches/experimental/exo/debian/rules
Log:
build-dep on experimental glib since we don't install the GIO module
anymore.

Modified: desktop/branches/experimental/exo/debian/changelog
===================================================================
--- desktop/branches/experimental/exo/debian/changelog	2010-11-21 13:44:46 UTC (rev 4576)
+++ desktop/branches/experimental/exo/debian/changelog	2010-11-21 14:15:44 UTC (rev 4577)
@@ -16,6 +16,8 @@
     - add dep on ${misc:Depends} for libexo-1-dev.
     - update standards version to 3.9.1.
     - add build-dep on hardening-includes
+    - build-dep on experimental glib since we don't install the GIO module
+      anymore.
   * debian/libexo-common.{preinst,postinst,prerm}:
     - use dpkg-maintscript-helper to remove /etc/xdg/xfce4/mount.rc.
   * debian/libexo-0-1.install:
@@ -33,7 +35,6 @@
     - drop some trailing spaces.
   * debian/rules:
     - switch to rules.tiny + overrides
-    - exclude exo gio module from dh_makeshlibs.
   * debian/compat: bump to 7.
   * debian/README.*: dropped, contain outdated info.
   * Hal support removed upstream:
@@ -59,7 +60,7 @@
   * Bugs fixed by 0.5.x/0.6.x series:
     - FTBFS with binutils-gold                                  Closes: #554276
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 04 Nov 2010 23:33:55 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 21 Nov 2010 15:09:36 +0100
 
 exo (0.3.106-2) unstable; urgency=low
 

Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2010-11-21 13:44:46 UTC (rev 4576)
+++ desktop/branches/experimental/exo/debian/control	2010-11-21 14:15:44 UTC (rev 4577)
@@ -3,10 +3,12 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
- Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
+ Yves-Alexis Perez <corsac at debian.org>, 
+ Michael Casadevall <sonicmctails at gmail.com>, 
  Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), libxfce4util-dev, 
- libxfce4ui-1-dev (>= 4.7.0), liburi-perl, chrpath, intltool, hardening-includes
+ libxfce4ui-1-dev (>= 4.7.0), liburi-perl, chrpath, intltool, 
+ hardening-includes, libglib2.0-dev (>= 2.27)
 Standards-Version: 3.9.1
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/

Modified: desktop/branches/experimental/exo/debian/libexo-1-0.install
===================================================================
--- desktop/branches/experimental/exo/debian/libexo-1-0.install	2010-11-21 13:44:46 UTC (rev 4576)
+++ desktop/branches/experimental/exo/debian/libexo-1-0.install	2010-11-21 14:15:44 UTC (rev 4577)
@@ -1,5 +1,4 @@
 usr/lib/xfce4/exo-1/*
 usr/lib/lib*.so.*
-usr/lib/gio/modules/*.so
 usr/share/locale/*/*/*.mo
 usr/share/pixmaps

Modified: desktop/branches/experimental/exo/debian/libexo-1-dev.install
===================================================================
--- desktop/branches/experimental/exo/debian/libexo-1-dev.install	2010-11-21 13:44:46 UTC (rev 4576)
+++ desktop/branches/experimental/exo/debian/libexo-1-dev.install	2010-11-21 14:15:44 UTC (rev 4577)
@@ -2,5 +2,4 @@
 usr/lib/pkgconfig/*
 usr/lib/lib*.a
 usr/lib/lib*.so
-usr/lib/gio/modules/*.a
 usr/share/gtk-doc/html/exo-1/*

Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules	2010-11-21 13:44:46 UTC (rev 4576)
+++ desktop/branches/experimental/exo/debian/rules	2010-11-21 14:15:44 UTC (rev 4577)
@@ -45,6 +45,3 @@
 	dh_strip -p $(EXO_SONAME) --dbg-package=$(EXO_SONAME)-dbg
 	dh_strip -p exo-utils --dbg-package=exo-utils-dbg
 	dh_strip --remaining-packages
-
-override_dh_makeshlibs:
-	dh_makeshlibs -p $(EXO_SONAME) --exclude=usr/lib/gio/modules/libexo-module-1.so