r26843 - in /desktop/experimental/gnome-control-center/debian: ./ images/ patches/ source/
fpeters at users.alioth.debian.org
fpeters at users.alioth.debian.org
Sat Mar 12 20:49:34 UTC 2011
Author: fpeters
Date: Sat Mar 12 20:49:33 2011
New Revision: 26843
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26843
Log:
* debian/rules, debian/images/*, debian/patches/12_timezones.patch: ship
and install missing timezone graphics.
* debian/libgnome-control-center1.symbols: updated with three new symbols.
Added:
desktop/experimental/gnome-control-center/debian/images/
desktop/experimental/gnome-control-center/debian/images/timezone_-11.png (with props)
desktop/experimental/gnome-control-center/debian/images/timezone_14.png (with props)
desktop/experimental/gnome-control-center/debian/images/timezone_8.75.png (with props)
desktop/experimental/gnome-control-center/debian/images/timezone_8.png (with props)
desktop/experimental/gnome-control-center/debian/patches/12_timezones.patch
desktop/experimental/gnome-control-center/debian/source/include-binaries
Modified:
desktop/experimental/gnome-control-center/debian/changelog
desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols
desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch
desktop/experimental/gnome-control-center/debian/patches/series
desktop/experimental/gnome-control-center/debian/rules
Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=26843&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Sat Mar 12 20:49:33 2011
@@ -1,3 +1,11 @@
+gnome-control-center (1:2.91.91-2) experimental; urgency=low
+
+ * debian/rules, debian/images/*, debian/patches/12_timezones.patch: ship
+ and install missing timezone graphics.
+ * debian/libgnome-control-center1.symbols: updated with three new symbols.
+
+ -- Frederic Peters <fpeters at debian.org> Sat, 12 Mar 2011 21:38:35 +0100
+
gnome-control-center (1:2.91.91-1) experimental; urgency=low
* New upstream release.
Added: desktop/experimental/gnome-control-center/debian/images/timezone_-11.png
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/images/timezone_-11.png?rev=26843&op=file
==============================================================================
Binary file - no diff available.
Propchange: desktop/experimental/gnome-control-center/debian/images/timezone_-11.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: desktop/experimental/gnome-control-center/debian/images/timezone_14.png
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/images/timezone_14.png?rev=26843&op=file
==============================================================================
Binary file - no diff available.
Propchange: desktop/experimental/gnome-control-center/debian/images/timezone_14.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: desktop/experimental/gnome-control-center/debian/images/timezone_8.75.png
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/images/timezone_8.75.png?rev=26843&op=file
==============================================================================
Binary file - no diff available.
Propchange: desktop/experimental/gnome-control-center/debian/images/timezone_8.75.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: desktop/experimental/gnome-control-center/debian/images/timezone_8.png
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/images/timezone_8.png?rev=26843&op=file
==============================================================================
Binary file - no diff available.
Propchange: desktop/experimental/gnome-control-center/debian/images/timezone_8.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols?rev=26843&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols [utf-8] Sat Mar 12 20:49:33 2011
@@ -1,5 +1,8 @@
libgnome-control-center.so.1 libgnome-control-center1 #MINVER#
* Build-Depends-Package: libgnome-control-center-dev
+ cc_lock_button_get_permission at Base 1:2.91.91
+ cc_lock_button_get_type at Base 1:2.91.91
+ cc_lock_button_new at Base 1:2.91.91
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
Added: desktop/experimental/gnome-control-center/debian/patches/12_timezones.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/12_timezones.patch?rev=26843&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/12_timezones.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/12_timezones.patch [utf-8] Sat Mar 12 20:49:33 2011
@@ -1,0 +1,26 @@
+commit 56d33f88cd118b70c3e1200a989f6b82f9ac0e03
+Author: Frédéric Péters <fpeters at 0d.be>
+Date: Sat Mar 12 20:49:20 2011 +0100
+
+ Add missing timezone files
+
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index 4384a28..05bd7ef 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -34,6 +34,7 @@ dist_ui_DATA = \
+ data/timezone_12.png \
+ data/timezone_12.75.png \
+ data/timezone_13.png \
++ data/timezone_14.png \
+ data/timezone_-2.png \
+ data/timezone_2.png \
+ data/timezone_-3.png \
+@@ -56,6 +57,7 @@ dist_ui_DATA = \
+ data/timezone_7.png \
+ data/timezone_-8.png \
+ data/timezone_8.png \
++ data/timezone_8.75.png \
+ data/timezone_-9.png \
+ data/timezone_9.png \
+ data/timezone_-9.5.png \
Modified: desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch?rev=26843&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/99_autoreconf.patch [utf-8] Sat Mar 12 20:49:33 2011
@@ -1,7 +1,7 @@
Index: gnome-control-center-2.91.91/configure
===================================================================
---- gnome-control-center-2.91.91.orig/configure 2011-03-10 15:05:05.313656000 +0100
-+++ gnome-control-center-2.91.91/configure 2011-03-10 15:05:59.137656002 +0100
+--- gnome-control-center-2.91.91.orig/configure 2011-03-08 12:48:09.000000000 +0100
++++ gnome-control-center-2.91.91/configure 2011-03-12 21:26:18.560843001 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -1676,25 +1676,43 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBM 1
_ACEOF
-@@ -15584,7 +15574,7 @@
+@@ -15569,7 +15559,6 @@
+ Alternatively, you may set the environment variables LIBGNOME_CONTROL_CENTER_CFLAGS
+ and LIBGNOME_CONTROL_CENTER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -15584,8 +15573,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
LIBGNOME_CONTROL_CENTER_CFLAGS=$pkg_cv_LIBGNOME_CONTROL_CENTER_CFLAGS
-@@ -15675,7 +15665,7 @@
+ LIBGNOME_CONTROL_CENTER_LIBS=$pkg_cv_LIBGNOME_CONTROL_CENTER_LIBS
+@@ -15660,7 +15648,6 @@
+ Alternatively, you may set the environment variables LIBLANGUAGE_CFLAGS
+ and LIBLANGUAGE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -15675,8 +15662,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
LIBLANGUAGE_CFLAGS=$pkg_cv_LIBLANGUAGE_CFLAGS
-@@ -15686,6 +15676,97 @@
+ LIBLANGUAGE_LIBS=$pkg_cv_LIBLANGUAGE_LIBS
+@@ -15686,6 +15672,95 @@
fi
pkg_failed=no
@@ -1763,7 +1781,6 @@
+Alternatively, you may set the environment variables LIBSHORTCUTS_CFLAGS
+and LIBSHORTCUTS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
-+
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
@@ -1779,7 +1796,6 @@
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5 ; }
-+
+else
+ LIBSHORTCUTS_CFLAGS=$pkg_cv_LIBSHORTCUTS_CFLAGS
+ LIBSHORTCUTS_LIBS=$pkg_cv_LIBSHORTCUTS_LIBS
@@ -1792,151 +1808,295 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHELL" >&5
$as_echo_n "checking for SHELL... " >&6; }
-@@ -15766,7 +15847,7 @@
+@@ -15751,7 +15826,6 @@
+ Alternatively, you may set the environment variables SHELL_CFLAGS
+ and SHELL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -15766,8 +15840,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
SHELL_CFLAGS=$pkg_cv_SHELL_CFLAGS
-@@ -15866,7 +15947,7 @@
+ SHELL_LIBS=$pkg_cv_SHELL_LIBS
+@@ -15851,7 +15924,6 @@
+ Alternatively, you may set the environment variables BACKGROUND_PANEL_CFLAGS
+ and BACKGROUND_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -15866,8 +15938,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
BACKGROUND_PANEL_CFLAGS=$pkg_cv_BACKGROUND_PANEL_CFLAGS
-@@ -15975,7 +16056,7 @@
+ BACKGROUND_PANEL_LIBS=$pkg_cv_BACKGROUND_PANEL_LIBS
+@@ -15960,7 +16031,6 @@
+ Alternatively, you may set the environment variables DATETIME_PANEL_CFLAGS
+ and DATETIME_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -15975,8 +16045,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
DATETIME_PANEL_CFLAGS=$pkg_cv_DATETIME_PANEL_CFLAGS
-@@ -16066,7 +16147,7 @@
+ DATETIME_PANEL_LIBS=$pkg_cv_DATETIME_PANEL_LIBS
+@@ -16051,7 +16120,6 @@
+ Alternatively, you may set the environment variables DISPLAY_PANEL_CFLAGS
+ and DISPLAY_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16066,8 +16134,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
DISPLAY_PANEL_CFLAGS=$pkg_cv_DISPLAY_PANEL_CFLAGS
-@@ -16157,7 +16238,7 @@
+ DISPLAY_PANEL_LIBS=$pkg_cv_DISPLAY_PANEL_LIBS
+@@ -16142,7 +16209,6 @@
+ Alternatively, you may set the environment variables INFO_PANEL_CFLAGS
+ and INFO_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16157,8 +16223,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
INFO_PANEL_CFLAGS=$pkg_cv_INFO_PANEL_CFLAGS
-@@ -16248,7 +16329,7 @@
+ INFO_PANEL_LIBS=$pkg_cv_INFO_PANEL_LIBS
+@@ -16233,7 +16298,6 @@
+ Alternatively, you may set the environment variables KEYBOARD_PANEL_CFLAGS
+ and KEYBOARD_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16248,8 +16312,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
KEYBOARD_PANEL_CFLAGS=$pkg_cv_KEYBOARD_PANEL_CFLAGS
-@@ -16339,7 +16420,7 @@
+ KEYBOARD_PANEL_LIBS=$pkg_cv_KEYBOARD_PANEL_LIBS
+@@ -16324,7 +16387,6 @@
+ Alternatively, you may set the environment variables MEDIA_PANEL_CFLAGS
+ and MEDIA_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16339,8 +16401,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
MEDIA_PANEL_CFLAGS=$pkg_cv_MEDIA_PANEL_CFLAGS
-@@ -16439,7 +16520,7 @@
+ MEDIA_PANEL_LIBS=$pkg_cv_MEDIA_PANEL_LIBS
+@@ -16424,7 +16485,6 @@
+ Alternatively, you may set the environment variables MOUSE_PANEL_CFLAGS
+ and MOUSE_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16439,8 +16499,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
MOUSE_PANEL_CFLAGS=$pkg_cv_MOUSE_PANEL_CFLAGS
-@@ -16530,7 +16611,7 @@
+ MOUSE_PANEL_LIBS=$pkg_cv_MOUSE_PANEL_LIBS
+@@ -16515,7 +16574,6 @@
+ Alternatively, you may set the environment variables NETWORK_PANEL_CFLAGS
+ and NETWORK_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16530,8 +16588,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
NETWORK_PANEL_CFLAGS=$pkg_cv_NETWORK_PANEL_CFLAGS
-@@ -16621,7 +16702,7 @@
+ NETWORK_PANEL_LIBS=$pkg_cv_NETWORK_PANEL_LIBS
+@@ -16606,7 +16663,6 @@
+ Alternatively, you may set the environment variables POWER_PANEL_CFLAGS
+ and POWER_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16621,8 +16677,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
POWER_PANEL_CFLAGS=$pkg_cv_POWER_PANEL_CFLAGS
-@@ -16721,7 +16802,7 @@
+ POWER_PANEL_LIBS=$pkg_cv_POWER_PANEL_LIBS
+@@ -16706,7 +16761,6 @@
+ Alternatively, you may set the environment variables PRINTERS_PANEL_CFLAGS
+ and PRINTERS_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16721,8 +16775,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
PRINTERS_PANEL_CFLAGS=$pkg_cv_PRINTERS_PANEL_CFLAGS
-@@ -16821,7 +16902,7 @@
+ PRINTERS_PANEL_LIBS=$pkg_cv_PRINTERS_PANEL_LIBS
+@@ -16806,7 +16859,6 @@
+ Alternatively, you may set the environment variables REGION_PANEL_CFLAGS
+ and REGION_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16821,8 +16873,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
REGION_PANEL_CFLAGS=$pkg_cv_REGION_PANEL_CFLAGS
-@@ -16912,7 +16993,7 @@
+ REGION_PANEL_LIBS=$pkg_cv_REGION_PANEL_LIBS
+@@ -16897,7 +16948,6 @@
+ Alternatively, you may set the environment variables SCREEN_PANEL_CFLAGS
+ and SCREEN_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -16912,8 +16962,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
SCREEN_PANEL_CFLAGS=$pkg_cv_SCREEN_PANEL_CFLAGS
-@@ -17039,7 +17120,7 @@
+ SCREEN_PANEL_LIBS=$pkg_cv_SCREEN_PANEL_LIBS
+@@ -17024,7 +17073,6 @@
+ Alternatively, you may set the environment variables SOUND_PANEL_CFLAGS
+ and SOUND_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -17039,8 +17087,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
SOUND_PANEL_CFLAGS=$pkg_cv_SOUND_PANEL_CFLAGS
-@@ -17130,7 +17211,7 @@
+ SOUND_PANEL_LIBS=$pkg_cv_SOUND_PANEL_LIBS
+@@ -17115,7 +17162,6 @@
+ Alternatively, you may set the environment variables UNIVERSAL_ACCESS_PANEL_CFLAGS
+ and UNIVERSAL_ACCESS_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -17130,8 +17176,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
UNIVERSAL_ACCESS_PANEL_CFLAGS=$pkg_cv_UNIVERSAL_ACCESS_PANEL_CFLAGS
-@@ -17248,7 +17329,7 @@
+ UNIVERSAL_ACCESS_PANEL_LIBS=$pkg_cv_UNIVERSAL_ACCESS_PANEL_LIBS
+@@ -17233,7 +17278,6 @@
+ Alternatively, you may set the environment variables USER_ACCOUNTS_PANEL_CFLAGS
+ and USER_ACCOUNTS_PANEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -17248,8 +17292,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
USER_ACCOUNTS_PANEL_CFLAGS=$pkg_cv_USER_ACCOUNTS_PANEL_CFLAGS
-@@ -17261,80 +17342,7 @@
+ USER_ACCOUNTS_PANEL_LIBS=$pkg_cv_USER_ACCOUNTS_PANEL_LIBS
+@@ -17261,80 +17304,7 @@
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
@@ -2018,7 +2178,7 @@
if test x$have_networkmanager = xyes; then
BUILD_NETWORK_TRUE=
BUILD_NETWORK_FALSE='#'
-@@ -17358,7 +17366,7 @@
+@@ -17358,7 +17328,7 @@
set dummy cups-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2027,7 +2187,7 @@
$as_echo_n "(cached) " >&6
else
case $CUPS_CONFIG in
-@@ -17381,7 +17389,7 @@
+@@ -17381,7 +17351,7 @@
done
IFS=$as_save_IFS
@@ -2036,16 +2196,25 @@
;;
esac
fi
-@@ -17617,7 +17625,7 @@
+@@ -17602,7 +17572,6 @@
+ Alternatively, you may set the environment variables ISOCODES_CFLAGS
+ and ISOCODES_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -17617,8 +17586,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
ISOCODES_CFLAGS=$pkg_cv_ISOCODES_CFLAGS
-@@ -17639,7 +17647,7 @@
+ ISOCODES_LIBS=$pkg_cv_ISOCODES_LIBS
+@@ -17639,7 +17607,7 @@
set dummy glib-genmarshal; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2054,7 +2223,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -17688,7 +17696,7 @@
+@@ -17688,7 +17656,7 @@
set dummy gconftool-2; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2063,7 +2232,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -17767,7 +17775,7 @@
+@@ -17767,7 +17735,7 @@
if test "${enable_schemas_install+set}" = set; then :
enableval=$enable_schemas_install; case ${enableval} in
yes|no) ;;
@@ -2072,16 +2241,25 @@
esac
fi
-@@ -17891,7 +17899,7 @@
+@@ -17876,7 +17844,6 @@
+ Alternatively, you may set the environment variables SOCIALWEB_CFLAGS
+ and SOCIALWEB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -17891,8 +17858,7 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-+See \`config.log' for more details" "$LINENO" 5 ; }
-
+-
++See \`config.log' for more details" "$LINENO" 5 ; }
else
SOCIALWEB_CFLAGS=$pkg_cv_SOCIALWEB_CFLAGS
-@@ -17919,7 +17927,7 @@
+ SOCIALWEB_LIBS=$pkg_cv_SOCIALWEB_LIBS
+@@ -17919,7 +17885,7 @@
set dummy update-mime-database; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2090,7 +2268,7 @@
$as_echo_n "(cached) " >&6
else
case $UPDATE_MIME_DATABASE in
-@@ -17980,7 +17988,7 @@
+@@ -17980,7 +17946,7 @@
set dummy gtkdoc-check; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2099,7 +2277,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -18022,7 +18030,7 @@
+@@ -18022,7 +17988,7 @@
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2108,7 +2286,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_REBASE in
-@@ -18066,7 +18074,7 @@
+@@ -18066,7 +18032,7 @@
set dummy gtkdoc-mkpdf; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -2117,7 +2295,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_MKPDF in
-@@ -18340,21 +18348,10 @@
+@@ -18340,21 +18306,10 @@
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
@@ -2141,7 +2319,7 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-@@ -18462,7 +18459,7 @@
+@@ -18462,7 +18417,7 @@
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -2150,7 +2328,7 @@
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -18563,7 +18560,6 @@
+@@ -18563,7 +18518,6 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -2158,7 +2336,7 @@
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -18871,7 +18867,7 @@
+@@ -18871,7 +18825,7 @@
# values after options handling.
ac_log="
This file was extended by gnome-control-center $as_me 2.91.91, which was
@@ -2167,7 +2345,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -18937,7 +18933,7 @@
+@@ -18937,7 +18891,7 @@
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
gnome-control-center config.status 2.91.91
@@ -2176,7 +2354,7 @@
with options \\"\$ac_cs_config\\"
Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -19429,7 +19425,7 @@
+@@ -19429,7 +19383,7 @@
"shell/gnome-control-center.desktop.in") CONFIG_FILES="$CONFIG_FILES shell/gnome-control-center.desktop.in" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -2185,7 +2363,7 @@
esac
done
-@@ -19452,10 +19448,9 @@
+@@ -19452,10 +19406,9 @@
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
@@ -2198,7 +2376,7 @@
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
-@@ -19463,13 +19458,12 @@
+@@ -19463,13 +19416,12 @@
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -2213,7 +2391,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -19491,7 +19485,7 @@
+@@ -19491,7 +19443,7 @@
ac_cs_awk_cr=$ac_cr
fi
@@ -2222,7 +2400,7 @@
_ACEOF
-@@ -19519,7 +19513,7 @@
+@@ -19519,7 +19471,7 @@
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -2231,7 +2409,7 @@
_ACEOF
sed -n '
h
-@@ -19567,7 +19561,7 @@
+@@ -19567,7 +19519,7 @@
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
@@ -2240,7 +2418,7 @@
for (key in S) S_is_set[key] = 1
FS = ""
-@@ -19599,7 +19593,7 @@
+@@ -19599,7 +19551,7 @@
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
@@ -2249,7 +2427,7 @@
|| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
_ACEOF
-@@ -19633,7 +19627,7 @@
+@@ -19633,7 +19585,7 @@
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
@@ -2258,7 +2436,7 @@
BEGIN {
_ACEOF
-@@ -19645,8 +19639,8 @@
+@@ -19645,8 +19597,8 @@
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
@@ -2269,7 +2447,7 @@
break
elif $ac_last_try; then
as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-@@ -19747,7 +19741,7 @@
+@@ -19747,7 +19699,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -2278,7 +2456,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -19766,7 +19760,7 @@
+@@ -19766,7 +19718,7 @@
for ac_f
do
case $ac_f in
@@ -2287,7 +2465,7 @@
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
-@@ -19775,7 +19769,7 @@
+@@ -19775,7 +19727,7 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -2296,7 +2474,7 @@
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -19801,8 +19795,8 @@
+@@ -19801,8 +19753,8 @@
esac
case $ac_tag in
@@ -2307,7 +2485,7 @@
esac
;;
esac
-@@ -19938,22 +19932,21 @@
+@@ -19938,22 +19890,21 @@
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
@@ -2337,7 +2515,7 @@
esac \
|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
;;
-@@ -19964,20 +19957,20 @@
+@@ -19964,20 +19915,20 @@
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
@@ -2365,8 +2543,8 @@
# Compute "$ac_file"'s index in $config_headers.
Index: gnome-control-center-2.91.91/panels/common/Makefile.in
===================================================================
---- gnome-control-center-2.91.91.orig/panels/common/Makefile.in 2011-03-10 15:05:32.337656001 +0100
-+++ gnome-control-center-2.91.91/panels/common/Makefile.in 2011-03-10 15:05:52.809656002 +0100
+--- gnome-control-center-2.91.91.orig/panels/common/Makefile.in 2011-03-08 12:48:10.000000000 +0100
++++ gnome-control-center-2.91.91/panels/common/Makefile.in 2011-03-12 21:26:19.972843000 +0100
@@ -66,7 +66,8 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(liblanguage_la_LDFLAGS) $(LDFLAGS) -o \
@@ -2405,3 +2583,41 @@
libshortcuts_la_LDFLAGS = $(PANEL_LDFLAGS)
all: all-am
+Index: gnome-control-center-2.91.91/panels/datetime/Makefile.in
+===================================================================
+--- gnome-control-center-2.91.91.orig/panels/datetime/Makefile.in 2011-03-12 21:26:07.748843000 +0100
++++ gnome-control-center-2.91.91/panels/datetime/Makefile.in 2011-03-12 21:26:20.088843000 +0100
+@@ -279,6 +279,8 @@
+ LIBLANGUAGE_LIBS = @LIBLANGUAGE_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LIBSHORTCUTS_CFLAGS = @LIBSHORTCUTS_CFLAGS@
++LIBSHORTCUTS_LIBS = @LIBSHORTCUTS_LIBS@
+ LIBTOOL = @LIBTOOL@
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+@@ -296,8 +298,6 @@
+ MSGFMT = @MSGFMT@
+ MSGFMT_015 = @MSGFMT_015@
+ MSGMERGE = @MSGMERGE@
+-NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@
+-NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@
+ NETWORK_PANEL_CFLAGS = @NETWORK_PANEL_CFLAGS@
+ NETWORK_PANEL_LIBS = @NETWORK_PANEL_LIBS@
+ NM = @NM@
+@@ -445,6 +445,7 @@
+ data/timezone_12.png \
+ data/timezone_12.75.png \
+ data/timezone_13.png \
++ data/timezone_14.png \
+ data/timezone_-2.png \
+ data/timezone_2.png \
+ data/timezone_-3.png \
+@@ -467,6 +468,7 @@
+ data/timezone_7.png \
+ data/timezone_-8.png \
+ data/timezone_8.png \
++ data/timezone_8.75.png \
+ data/timezone_-9.png \
+ data/timezone_9.png \
+ data/timezone_-9.5.png \
Modified: desktop/experimental/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/series?rev=26843&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/series [utf-8] Sat Mar 12 20:49:33 2011
@@ -1,3 +1,4 @@
00_disable-nm.patch
10_libshortcuts-link.patch
+12_timezones.patch
99_autoreconf.patch
Modified: desktop/experimental/gnome-control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/rules?rev=26843&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/rules [utf-8] Sat Mar 12 20:49:33 2011
@@ -31,4 +31,7 @@
clean::
rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center)
+pre-build::
+ cp debian/images/timezone*.png panels/datetime/data/
+
common-binary-post-install-arch:: list-missing
Added: desktop/experimental/gnome-control-center/debian/source/include-binaries
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/source/include-binaries?rev=26843&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/source/include-binaries (added)
+++ desktop/experimental/gnome-control-center/debian/source/include-binaries [utf-8] Sat Mar 12 20:49:33 2011
@@ -1,0 +1,4 @@
+debian/images/timezone_14.png
+debian/images/timezone_8.png
+debian/images/timezone_-11.png
+debian/images/timezone_8.75.png
More information about the pkg-gnome-commits
mailing list