r26013 - in /desktop/experimental/control-center/debian: ./ patches/

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sat Dec 18 20:23:12 UTC 2010


Author: sjoerd
Date: Sat Dec 18 20:23:11 2010
New Revision: 26013

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26013
Log:
First packaging round

Added:
    desktop/experimental/control-center/debian/gnome-control-center.postrm
    desktop/experimental/control-center/debian/libgnome-control-center-dev.install
    desktop/experimental/control-center/debian/libgnome-control-center1.install
    desktop/experimental/control-center/debian/libgnome-control-center1.symbols
    desktop/experimental/control-center/debian/patches/00git_gdk_window_get_geometry.patch
Removed:
    desktop/experimental/control-center/debian/libgnome-window-settings-dev.install
    desktop/experimental/control-center/debian/libgnome-window-settings1.install
    desktop/experimental/control-center/debian/patches/01_ml_po.patch
    desktop/experimental/control-center/debian/patches/25_window_manager_settings.patch
    desktop/experimental/control-center/debian/patches/70_relibtoolize.patch
    desktop/experimental/control-center/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/experimental/control-center/debian/capplets-data.install
    desktop/experimental/control-center/debian/changelog
    desktop/experimental/control-center/debian/control
    desktop/experimental/control-center/debian/control.in
    desktop/experimental/control-center/debian/gnome-control-center.install
    desktop/experimental/control-center/debian/patches/series
    desktop/experimental/control-center/debian/rules
    desktop/experimental/control-center/debian/watch

Modified: desktop/experimental/control-center/debian/capplets-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/capplets-data.install?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/capplets-data.install [utf-8] (original)
+++ desktop/experimental/control-center/debian/capplets-data.install [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,4 +1,14 @@
 debian/tmp/etc/gconf
-debian/tmp/etc/xdg/autostart /usr/share/gnome
+debian/tmp/etc/xdg/autostart
 debian/tmp/etc/xdg/menus
-debian/tmp/usr/share
+debian/tmp/usr/share/gnome-control-center
+debian/tmp/usr/share/gnome/help/control-center
+debian/tmp/usr/share/sounds
+debian/tmp/usr/share/desktop-directories
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/omf/
+debian/visual-effects_custom.svg /usr/share/gnome-control-center/pixmaps
+debian/visual-effects_extra.svg /usr/share/gnome-control-center/pixmaps
+debian/visual-effects_none.svg /usr/share/gnome-control-center/pixmaps
+debian/visual-effects_normal.svg /usr/share/gnome-control-center/pixmaps

Modified: desktop/experimental/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/changelog?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/control-center/debian/changelog [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,3 +1,16 @@
+gnome-control-center (1:2.91.3.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Based on ubuntu 1:2.91.3.1-0ubuntu1~build2, by Robert Ancell and others
+  * debian/patches/01_ml_po.patch
+    - Removed
+  * patches/25_window_manager_settings.patch
+    - Removed, no longer applicable
+  * patches/00git_gdk_window_get_geometry.patch
+    - Added, fix build with recent GTK
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 18 Dec 2010 20:10:34 +0000
+
 control-center (1:2.30.1-2) unstable; urgency=low
 
   * debian/control.in:

Modified: desktop/experimental/control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/control?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/control [utf-8] (original)
+++ desktop/experimental/control-center/debian/control [utf-8] Sat Dec 18 20:23:11 2010
@@ -3,69 +3,66 @@
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
 
-Source: control-center
+Source: gnome-control-center
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
-Standards-Version: 3.8.3
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Standards-Version: 3.9.1
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
+               gnome-common,
                quilt,
                dpkg-dev (>= 1.13.19),
                debhelper (>= 5.0.0),
                docbook-to-man,
                autotools-dev,
-               type-handling (>= 0.2.8),
                gnome-doc-utils (>= 0.3.2),
                intltool (>= 0.37.1),
-               libxt-dev,
                libx11-dev,
-               libxss-dev,
-               libcanberra-gtk-dev,
-               libgtk2.0-dev (>= 2.18.0),
+               libcanberra-gtk3-dev,
+               libgtk3.0-dev (>= 2.91.6),
                libglib2.0-dev (>= 2.17.4),
                libgconf2-dev,
-               libgnome-desktop-dev (>= 2.29.4),
+               libgnome-desktop-3-dev (>= 2.91.0),
                libgnome-menu-dev (>= 2.10.1),
                libdbus-1-dev (>= 0.32),
                libdbus-glib-1-dev (>= 0.32),
                libxml2-dev,
-               libmetacity-dev (>= 1:2.23.1),
-               gnome-settings-daemon-dev (>= 2.22.0),
+               gnome-settings-daemon-dev (>= 2.91.0),
                libxft-dev (>= 2.1.2),
-               libxrender-dev,
-               libxrandr-dev,
-               libxcursor-dev,
-               libxi-dev (>= 2:1.2),
-               libgnomekbd-dev (>= 2.27.4),
+               libgnomekbd-dev (>= 2.91.0),
                libxklavier-dev (>= 4.0),
-               libebook1.2-dev (>= 1.7.90),
-               libunique-dev,
+               libupower-glib-dev (>= 0.9.1),
                desktop-file-utils,
                shared-mime-info,
-               libslab-dev (>= 2.27.91),
-               scrollkeeper
+               libgstreamer-plugins-base0.10-dev,
+               gsettings-desktop-schemas-dev,
+               libpolkit-gobject-1-dev (>= 0.97),
+               libpulse-dev
+
 
 Package: gnome-control-center
 Architecture: any
 Section: gnome
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         capplets-data (>= ${gnome:Version}),
+         capplets-data (>= ${source:Version}),
          capplets-data (<< ${gnome:NextVersion}),
-         libgnome-window-settings1 (= ${binary:Version}),
-         gnome-settings-daemon (>= 2.30),
+         gnome-settings-daemon (>= 2.91),
          gnome-menus (>= 2.12.0),
          gnome-desktop-data,
          gnome-icon-theme (>= 2.24),
-         evolution-data-server,
-         desktop-file-utils
-Recommends: bzip2,
-            gnome-user-guide,
+         desktop-file-utils,
+         libgnome-control-center1 (= ${binary:Version})
+Recommends: gnome-user-guide,
             gnome-session,
-            policykit-1-gnome
+            policykit-1-gnome,
+            mousetweaks,
+            iso-codes
 Conflicts: gnome-session (<< 2.22.0)
+Replaces: gnome-media-common (<< 2.91), gnome-media (<< 2.91)
+Breaks: gnome-media-common (<< 2.91)
 Suggests: libcanberra-gtk-module,
           gnome-screensaver | xscreensaver,
           x11-xserver-utils,
@@ -79,38 +76,35 @@
  It also contains a front end to these applets, which can also be
  accessed with the GNOME panel or the Nautilus file manager.
 
+Package: gnome-control-center-dev
+Architecture: all
+Section: gnome
+Depends: ${misc:Depends}
+Description: utilities to configure the GNOME desktop
+ This package contains the file required to get the keydirs location
+
 Package: capplets-data
 Architecture: all
 Section: gnome
 Depends: ${misc:Depends}
 Recommends: gnome-control-center (>= ${source:Version})
+Breaks: gnome-control-center (<< ${source:Version})
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
 
-Package: libgnome-window-settings1
+Package: libgnome-control-center-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libgnome-control-center1 (= ${binary:Version})
+Description: utilities to configure the GNOME desktop
+ This package contains the files needed to build Control Center panels
+
+Package: libgnome-control-center1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Utility library for getting window manager settings
- This package contains the libwindow-settings library, which is used by
- the GNOME window managers.
-
-Package: libgnome-window-settings-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgnome-window-settings1 (= ${binary:Version})
-Description: Utility library for getting window manager settings (headers)
- This package contains the libwindow-settings library header files.
-
-Package: gnome-control-center-dev
-Architecture: all
-Section: devel
-Conflicts: libgnome-settings-daemon-dev
-Replaces: libgnome-settings-daemon-dev
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+	 ${shlibs:Depends}
 Description: utilities to configure the GNOME desktop
- This package contains the file required to get the keydirs location
+ This package contains the library used by Control Center panels

Modified: desktop/experimental/control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/control.in?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/control-center/debian/control.in [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,66 +1,63 @@
-Source: control-center
+Source: gnome-control-center
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
+               gnome-common,
                quilt,
                dpkg-dev (>= 1.13.19),
                debhelper (>= 5.0.0),
                docbook-to-man,
                autotools-dev,
-               type-handling (>= 0.2.8),
                gnome-doc-utils (>= 0.3.2),
                intltool (>= 0.37.1),
-               libxt-dev,
                libx11-dev,
-               libxss-dev,
-               libcanberra-gtk-dev,
-               libgtk2.0-dev (>= 2.18.0),
+               libcanberra-gtk3-dev,
+               libgtk3.0-dev (>= 2.91.6),
                libglib2.0-dev (>= 2.17.4),
                libgconf2-dev,
-               libgnome-desktop-dev (>= 2.29.4),
+               libgnome-desktop-3-dev (>= 2.91.0),
                libgnome-menu-dev (>= 2.10.1),
                libdbus-1-dev (>= 0.32),
                libdbus-glib-1-dev (>= 0.32),
                libxml2-dev,
-               libmetacity-dev (>= 1:2.23.1),
-               gnome-settings-daemon-dev (>= 2.22.0),
+               gnome-settings-daemon-dev (>= 2.91.0),
                libxft-dev (>= 2.1.2),
-               libxrender-dev,
-               libxrandr-dev,
-               libxcursor-dev,
-               libxi-dev (>= 2:1.2),
-               libgnomekbd-dev (>= 2.27.4),
+               libgnomekbd-dev (>= 2.91.0),
                libxklavier-dev (>= 4.0),
-               libebook1.2-dev (>= 1.7.90),
-               libunique-dev,
+               libupower-glib-dev (>= 0.9.1),
                desktop-file-utils,
                shared-mime-info,
-               libslab-dev (>= 2.27.91),
-               scrollkeeper
+               libgstreamer-plugins-base0.10-dev,
+               gsettings-desktop-schemas-dev,
+               libpolkit-gobject-1-dev (>= 0.97),
+               libpulse-dev
+
 
 Package: gnome-control-center
 Architecture: any
 Section: gnome
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         capplets-data (>= ${gnome:Version}),
+         capplets-data (>= ${source:Version}),
          capplets-data (<< ${gnome:NextVersion}),
-         libgnome-window-settings1 (= ${binary:Version}),
-         gnome-settings-daemon (>= 2.30),
+         gnome-settings-daemon (>= 2.91),
          gnome-menus (>= 2.12.0),
          gnome-desktop-data,
          gnome-icon-theme (>= 2.24),
-         evolution-data-server,
-         desktop-file-utils
-Recommends: bzip2,
-            gnome-user-guide,
+         desktop-file-utils,
+         libgnome-control-center1 (= ${binary:Version})
+Recommends: gnome-user-guide,
             gnome-session,
-            policykit-1-gnome
+            policykit-1-gnome,
+            mousetweaks,
+            iso-codes
 Conflicts: gnome-session (<< 2.22.0)
+Replaces: gnome-media-common (<< 2.91), gnome-media (<< 2.91)
+Breaks: gnome-media-common (<< 2.91)
 Suggests: libcanberra-gtk-module,
           gnome-screensaver | xscreensaver,
           x11-xserver-utils,
@@ -74,38 +71,35 @@
  It also contains a front end to these applets, which can also be
  accessed with the GNOME panel or the Nautilus file manager.
 
+Package: gnome-control-center-dev
+Architecture: all
+Section: gnome
+Depends: ${misc:Depends}
+Description: utilities to configure the GNOME desktop
+ This package contains the file required to get the keydirs location
+
 Package: capplets-data
 Architecture: all
 Section: gnome
 Depends: ${misc:Depends}
 Recommends: gnome-control-center (>= ${source:Version})
+Breaks: gnome-control-center (<< ${source:Version})
 Description: configuration applets for GNOME - data files
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
 
-Package: libgnome-window-settings1
+Package: libgnome-control-center-dev
+Architecture: any
+Section: libdevel
+Depends: ${misc:Depends},
+         libgnome-control-center1 (= ${binary:Version})
+Description: utilities to configure the GNOME desktop
+ This package contains the files needed to build Control Center panels
+
+Package: libgnome-control-center1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
-Description: Utility library for getting window manager settings
- This package contains the libwindow-settings library, which is used by
- the GNOME window managers.
-
-Package: libgnome-window-settings-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libgnome-window-settings1 (= ${binary:Version})
-Description: Utility library for getting window manager settings (headers)
- This package contains the libwindow-settings library header files.
-
-Package: gnome-control-center-dev
-Architecture: all
-Section: devel
-Conflicts: libgnome-settings-daemon-dev
-Replaces: libgnome-settings-daemon-dev
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+	 ${shlibs:Depends}
 Description: utilities to configure the GNOME desktop
- This package contains the file required to get the keydirs location
+ This package contains the library used by Control Center panels

Modified: desktop/experimental/control-center/debian/gnome-control-center.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/gnome-control-center.install?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/gnome-control-center.install [utf-8] (original)
+++ desktop/experimental/control-center/debian/gnome-control-center.install [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,2 +1,4 @@
 debian/control-center2.xpm usr/share/pixmaps
 debian/tmp/usr/bin
+debian/tmp/usr/lib/control-center-1/panels/*.so
+debian/tmp/usr/share/applications

Added: desktop/experimental/control-center/debian/gnome-control-center.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/gnome-control-center.postrm?rev=26013&op=file
==============================================================================
--- desktop/experimental/control-center/debian/gnome-control-center.postrm (added)
+++ desktop/experimental/control-center/debian/gnome-control-center.postrm [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,0 +1,12 @@
+#! /bin/sh
+set -e
+
+case "$1" in
+purge)
+	rm -f /etc/gnome-settings-daemon/xrandr/monitors.xml || true
+	;;
+*)
+	;;
+esac
+
+#DEBHELPER#

Added: desktop/experimental/control-center/debian/libgnome-control-center-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/libgnome-control-center-dev.install?rev=26013&op=file
==============================================================================
--- desktop/experimental/control-center/debian/libgnome-control-center-dev.install (added)
+++ desktop/experimental/control-center/debian/libgnome-control-center-dev.install [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,0 +1,4 @@
+debian/tmp/usr/share/gtk-doc
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/include/gnome-control-center-1
+debian/tmp/usr/lib/libgnome-control-center.so

Added: desktop/experimental/control-center/debian/libgnome-control-center1.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/libgnome-control-center1.install?rev=26013&op=file
==============================================================================
--- desktop/experimental/control-center/debian/libgnome-control-center1.install (added)
+++ desktop/experimental/control-center/debian/libgnome-control-center1.install [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/libgnome-control-center.so.*

Added: desktop/experimental/control-center/debian/libgnome-control-center1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/libgnome-control-center1.symbols?rev=26013&op=file
==============================================================================
--- desktop/experimental/control-center/debian/libgnome-control-center1.symbols (added)
+++ desktop/experimental/control-center/debian/libgnome-control-center1.symbols [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,0 +1,28 @@
+libgnome-control-center.so.1 libgnome-control-center1 #MINVER#
+ cc_marshal_VOID__STRING_POINTER at Base 1:2.91.2
+ cc_panel_get_shell at Base 1:2.91.2
+ cc_panel_get_type at Base 1:2.91.2
+ cc_shell_get_active_panel at Base 1:2.91.2
+ cc_shell_get_toplevel at Base 1:2.91.2
+ cc_shell_get_type at Base 1:2.91.2
+ cc_shell_set_active_panel at Base 1:2.91.2
+ cc_shell_set_active_panel_from_id at Base 1:2.91.2
+ gconf_peditor_new_boolean at Base 1:2.91.2
+ gconf_peditor_new_color at Base 1:2.91.2
+ gconf_peditor_new_combo_box at Base 1:2.91.2
+ gconf_peditor_new_combo_box_with_enum at Base 1:2.91.2
+ gconf_peditor_new_enum_toggle at Base 1:2.91.2
+ gconf_peditor_new_font at Base 1:2.91.2
+ gconf_peditor_new_image at Base 1:2.91.2
+ gconf_peditor_new_integer at Base 1:2.91.2
+ gconf_peditor_new_numeric_range at Base 1:2.91.2
+ gconf_peditor_new_select_radio at Base 1:2.91.2
+ gconf_peditor_new_select_radio_with_enum at Base 1:2.91.2
+ gconf_peditor_new_string at Base 1:2.91.2
+ gconf_peditor_new_tree_view at Base 1:2.91.2
+ gconf_peditor_widget_set_guard at Base 1:2.91.2
+ gconf_property_editor_get_key at Base 1:2.91.2
+ gconf_property_editor_get_type at Base 1:2.91.2
+ gconf_property_editor_get_ui_control at Base 1:2.91.2
+ gconf_value_float_to_int at Base 1:2.91.2
+ gconf_value_int_to_float at Base 1:2.91.2

Added: desktop/experimental/control-center/debian/patches/00git_gdk_window_get_geometry.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/00git_gdk_window_get_geometry.patch?rev=26013&op=file
==============================================================================
--- desktop/experimental/control-center/debian/patches/00git_gdk_window_get_geometry.patch (added)
+++ desktop/experimental/control-center/debian/patches/00git_gdk_window_get_geometry.patch [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,0 +1,24 @@
+From 5d7ad665ecb3bf780dfcff3c3efec73a4351810a Mon Sep 17 00:00:00 2001
+From: Owen W. Taylor <otaylor at fishsoup.net>
+Date: Mon, 06 Dec 2010 13:37:00 +0000
+Subject: xandr-capplet: Remove depth argument from gdk_window_get_geometry()
+
+Make compile again with the latest GTK+ 2.9x API changes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=636581
+---
+diff --git a/panels/display/xrandr-capplet.c b/panels/display/xrandr-capplet.c
+index cc7d122..3d7fd54 100644
+--- a/panels/display/xrandr-capplet.c
++++ b/panels/display/xrandr-capplet.c
+@@ -2354,7 +2354,7 @@ get_output_for_window (GnomeRRConfig *configuration, GdkWindow *window)
+   int largest_area;
+   int largest_index;
+ 
+-  gdk_window_get_geometry (window, &win_rect.x, &win_rect.y, &win_rect.width, &win_rect.height, NULL);
++  gdk_window_get_geometry (window, &win_rect.x, &win_rect.y, &win_rect.width, &win_rect.height);
+   gdk_window_get_origin (window, &win_rect.x, &win_rect.y);
+ 
+   largest_area = 0;
+--
+cgit v0.8.3.1

Modified: desktop/experimental/control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/patches/series?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/patches/series [utf-8] (original)
+++ desktop/experimental/control-center/debian/patches/series [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,4 +1,1 @@
-01_ml_po.patch
-25_window_manager_settings.patch
-70_relibtoolize.patch
-99_ltmain_as-needed.patch
+00git_gdk_window_get_geometry.patch

Modified: desktop/experimental/control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/rules?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/rules [utf-8] (original)
+++ desktop/experimental/control-center/debian/rules [utf-8] Sat Dec 18 20:23:11 2010
@@ -9,19 +9,22 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_AUTO_UPDATE_LIBTOOL=pre
+DEB_AUTO_UPDATE_ACLOCAL=1.11
+DEB_AUTO_UPDATE_AUTOCONF=1
+DEB_AUTO_UPDATE_AUTOHEADER=1
+DEB_AUTO_UPDATE_AUTOMAKE=1.11
+
 GNOME_MODULE := gnome-control-center
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
-                             --enable-aboutme \
-                             --enable-gstreamer=0.10 \
                              --disable-update-mimedb
 
 DEB_INSTALL_MANPAGES_gnome-control-center += debian/gnome-control-center.1
 
 DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act
-DEB_DH_MAKESHLIBS_ARGS_libgnome-window-settings1 = -V "libgnome-window-settings1 (>= 1:2.17.5)"
 
 build/gnome-control-center:: $(DEB_INSTALL_MANPAGES_gnome-control-center)
 

Modified: desktop/experimental/control-center/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/control-center/debian/watch?rev=26013&op=diff
==============================================================================
--- desktop/experimental/control-center/debian/watch [utf-8] (original)
+++ desktop/experimental/control-center/debian/watch [utf-8] Sat Dec 18 20:23:11 2010
@@ -1,2 +1,2 @@
-version=2
-http://ftp.gnome.org/pub/gnome/sources/gnome-control-center/([\d\.]+)[02468]/gnome-control-center-([\d\.]+)\.tar\.gz
+version=3
+http://download.gnome.org/sources/gnome-control-center/([0-9.]+)/gnome-control-center-([0-9.]+)\.tar\.gz debian




More information about the pkg-gnome-commits mailing list