r18035 - in /desktop/experimental/control-center/debian: changelog control control.in gnome-control-center.postinst patches/99_ltmain_as-needed.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Dec 28 13:35:51 2008
New Revision: 18035

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18035
Log:
  + Remove the pkg-config files in capplets-data.
* Remove -1 suffix in build-deps.
* 99_ltmain_as-needed.patch: make --as-needed work for the library as 
  well.
* debian/gnome-control-center.postinst: remove gnome-vfs conffiles.

Added:
    desktop/experimental/control-center/debian/gnome-control-center.postinst
    desktop/experimental/control-center/debian/patches/99_ltmain_as-needed.patch   (props changed)
      - copied unchanged from r18032, desktop/experimental/gnome-applets/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/experimental/control-center/debian/changelog
    desktop/experimental/control-center/debian/control
    desktop/experimental/control-center/debian/control.in
    desktop/experimental/control-center/debian/patches/series
    desktop/experimental/control-center/debian/rules

Modified: desktop/experimental/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/changelog?rev=18035&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/changelog (original)
+++ desktop/experimental/control-center/debian/changelog Sun Dec 28 13:35:51 2008
@@ -20,6 +20,11 @@
   * capplets-data.gconf-defaults: the /music key is renamed to /media.
   * Don’t remove the GConf schemas in the installation target.
   * *.install: simplify a lot the installation files.
+    + Remove the pkg-config files in capplets-data.
+  * Remove -1 suffix in build-deps.
+  * 99_ltmain_as-needed.patch: make --as-needed work for the library as 
+    well.
+  * debian/gnome-control-center.postinst: remove gnome-vfs conffiles.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 28 Dec 2008 12:38:50 +0100
 

Modified: desktop/experimental/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/control?rev=18035&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/control (original)
+++ desktop/experimental/control-center/debian/control Sun Dec 28 13:35:51 2008
@@ -22,7 +22,7 @@
                libglib2.0-dev (>= 2.17.4),
                libgconf2-dev,
                libgnomeui-dev (>= 2.16.0-2),
-               libglade2-dev (>= 1:2.4.0-1),
+               libglade2-dev (>= 1:2.4.0),
                libgnome-desktop-dev (>= 2.23.90),
                librsvg2-dev,
                libgnome-menu-dev (>= 2.12.0),

Modified: desktop/experimental/control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/control.in?rev=18035&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/control.in (original)
+++ desktop/experimental/control-center/debian/control.in Sun Dec 28 13:35:51 2008
@@ -22,7 +22,7 @@
                libglib2.0-dev (>= 2.17.4),
                libgconf2-dev,
                libgnomeui-dev (>= 2.16.0-2),
-               libglade2-dev (>= 1:2.4.0-1),
+               libglade2-dev (>= 1:2.4.0),
                libgnome-desktop-dev (>= 2.23.90),
                librsvg2-dev,
                libgnome-menu-dev (>= 2.12.0),

Added: desktop/experimental/control-center/debian/gnome-control-center.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/gnome-control-center.postinst?rev=18035&op=file
==============================================================================
--- desktop/experimental/control-center/debian/gnome-control-center.postinst (added)
+++ desktop/experimental/control-center/debian/gnome-control-center.postinst Sun Dec 28 13:35:51 2008
@@ -1,0 +1,7 @@
+#! /bin/sh
+set -e
+
+rm -f /etc/gnome-vfs-2.0/modules/theme-method.conf
+rm -f /etc/gnome-vfs-2.0/modules/font-method.conf
+
+#DEBHELPER#

Propchange: desktop/experimental/control-center/debian/patches/99_ltmain_as-needed.patch
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: desktop/experimental/control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/series?rev=18035&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/series (original)
+++ desktop/experimental/control-center/debian/patches/series Sun Dec 28 13:35:51 2008
@@ -3,3 +3,4 @@
 04_path_xtra.patch
 25_window_manager_settings.patch
 70_relibtoolize.patch
+99_ltmain_as-needed.patch

Modified: desktop/experimental/control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/rules?rev=18035&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/rules (original)
+++ desktop/experimental/control-center/debian/rules Sun Dec 28 13:35:51 2008
@@ -37,4 +37,5 @@
 
 binary-post-install/capplets-data::
 	rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache
+	rm -rf debian/capplets-data/usr/share/pkgconfig
 	dh_installmime -p$(cdbs_curpkg)