Mailinglist Archive: opensuse-commit (1301 mails)
| < Previous | Next > |
commit control-center2
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 12 Jul 2007 01:24:07 +0200
- Message-id: <20070711232407.4C7F0678180@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package control-center2
checked in at Thu Jul 12 01:24:07 CEST 2007.
--------
--- GNOME/control-center2/control-center2.changes 2007-06-06 14:09:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/control-center2/control-center2.changes 2007-07-11 18:56:08.638538000 +0200
@@ -1,0 +2,19 @@
+Mon Jul 9 17:57:09 CEST 2007 - maw@xxxxxxx
+
+- Update to version 2.19.4
+- The source tarball is now called gnome-control-center-$version.tar.bz2;
+ however, the package's name remains the same
+- Concomitant with the tarball name change, a number of directories
+ packaged have been renamed from control-center to
+ gnome-control-center
+- Remove the following upstreamed patches:
+ * control-center2-217790-sanitize-dpi.diff
+ * control-center2-compiz-keybindings.patch
+ * control-center2-static-libslab.patch
+ * control-center-control-key-events.patch
+ * control-center-no-x-suse.patch
+- Bug fixes, updated translations
+- s#%run_ldconfig#/sbin/ldconfig# in the %post and %postun
+ sections.
+
+-------------------------------------------------------------------
Old:
----
control-center-2.18.0.tar.bz2
control-center2-217790-sanitize-dpi.diff
control-center2-compiz-keybindings.patch
control-center2-static-libslab.patch
control-center-control-key-events.patch
control-center-no-x-suse.patch
New:
----
gnome-control-center-2.19.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ control-center2.spec ++++++
--- /var/tmp/diff_new_pack.L25204/_old 2007-07-12 01:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.L25204/_new 2007-07-12 01:23:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package control-center2 (Version 2.18.0)
+# spec file for package control-center2 (Version 2.19.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,19 +13,18 @@
Name: control-center2
%define _name control-center
BuildRequires: desktop-file-utils docbook-xsl-stylesheets gnome-common gnome-desktop-devel gnome-doc-utils-devel gnome-menus-devel gnome-panel-devel gnome-patch-translation gstreamer010-plugins-base-devel intltool libglade2-devel libgnomekbd-devel libidl librsvg-devel libxklavier-devel mDNSResponder-devel metacity-devel nautilus-devel pam-devel perl-XML-Parser scrollkeeper sgml-skel update-desktop-files xorg-x11
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/GUI/GNOME
Obsoletes: fontilus themus acme
Provides: fontilus themus acme
-Version: 2.18.0
-Release: 36
+Version: 2.19.4
+Release: 1
Summary: The GNOME Control Center for the GNOME 2.x Desktop
-Source: %{_name}-%{version}.tar.bz2
+Source: gnome-%{_name}-%{version}.tar.bz2
Source1: control-center-art.tar.bz2
Source2: fontilus.xml
Source3: change-password.png
Source4: permissions.tar.bz2
-Patch: control-center-control-key-events.patch
Patch1: %{name}-default-config.patch
Patch2: control-center-keybinding-workaround.patch
Patch3: desktop.patch
@@ -37,15 +36,16 @@
Patch15: control-center-default-applications-ftp+news.patch
# control-center-default-applications-ftp+news.patch refers to folder-remote icon:
Requires: gnome-icon-theme
-Patch20: control-center2-compiz-keybindings.patch
+# FIXME: redo this patch
+### Patch20: control-center2-compiz-keybindings.patch
Patch22: control-center-2.12.2-beagle-search-hotkey.patch
-Patch23: control-center2-217790-sanitize-dpi.diff
+# FIXME: someone who understands this should check that we can safely remove it -- we don't
+# want to create a regression.
+### Patch23: control-center2-217790-sanitize-dpi.diff
Patch24: control-center2-dont-update-mimedb.patch
Patch25: control-center-seamonkey.patch
-Patch26: control-center2-static-libslab.patch
Patch27: control-center2-shell-schemas.patch
Patch28: control-center2-use-preferences-menu.patch
-Patch29: control-center-no-x-suse.patch
Patch100: control-center2-po-update.patch
URL: http://www.gnome.org
Requires: nautilus
@@ -90,11 +90,11 @@
Jonathan Blandford <jrb@xxxxxxxxxx>
%prep
-%setup -q -n %{_name}-%{version} -a 1 -a 2 -b 4
+%setup -q -n gnome-%{_name}-%{version} -a 1 -a 2 -b 4
# FIXME: fix these.
# %patch100
gnome-patch-translation-prepare
-%patch
+### %patch
%patch1
%patch2 -p1
%patch3 -p1
@@ -106,15 +106,14 @@
%patch14 -p0
cp %{S:3} capplets/passwd/change-password.png
%patch15
-%patch20
+# FIXME: redo this patch
+### %patch20
%patch22 -p1
-%patch23 -p1
+### %patch23 -p1
%patch24 -p1
%patch25
-%patch26
%patch27 -p1
%patch28
-%patch29
gnome-patch-translation-update
%build
@@ -131,6 +130,8 @@
%install
%makeinstall
# DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime
+# oh dear
+mv $RPM_BUILD_ROOT/%{_datadir}/pkgconfig/gnome-keybindings.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime
mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
cp %{S:2} $RPM_BUILD_ROOT%{_datadir}/mime/packages
@@ -138,16 +139,16 @@
# capplets
%suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal
%suse_update_desktop_file accessibility-keyboard X-SuSE-ControlCenter-Personal
-%suse_update_desktop_file background X-SuSE-ControlCenter-LookAndFeel
+### % # suse $ _update_desktop_file background X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustdoc-2" default-applications X-SuSE-ControlCenter-System
%suse_update_desktop_file display-properties X-SuSE-ControlCenter-Hardware
-%suse_update_desktop_file font-properties X-SuSE-ControlCenter-LookAndFeel
+### % # suse $ _update_desktop_file font-properties X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file gnome-passwd X-SuSE-ControlCenter-Personal
%suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file gnome-settings-sound X-SuSE-ControlCenter-System
%suse_update_desktop_file gnome-network-preferences X-SuSE-ControlCenter-System
-%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustuserinter-2" gnome-ui-properties X-SuSE-ControlCenter-LookAndFeel
-%suse_update_desktop_file gtk-theme-selector X-SuSE-ControlCenter-LookAndFeel
+### % # suse $ _update_desktop_file -D "user-guide/user-guide.xml?goscustuserinter-2" gnome-ui-properties X-SuSE-ControlCenter-LookAndFeel
+### % # suse $ _update_desktop_file gtk-theme-selector X-SuSE-ControlCenter-LookAndFeel
%suse_update_desktop_file keybinding X-SuSE-ControlCenter-Personal
%suse_update_desktop_file keyboard X-SuSE-ControlCenter-Hardware
%suse_update_desktop_file window-properties X-SuSE-ControlCenter-LookAndFeel
@@ -158,9 +159,9 @@
mkdir -p $RPM_BUILD_ROOT/etc/permissions.d
cp -a ../permissions/* $RPM_BUILD_ROOT/etc/permissions.d
%endif
-%find_lang %{_name}-2.0
+%find_lang gnome-%{_name}-2.0
%find_gconf_schemas
-cat %{_name}-2.0.lang %{name}.schemas_list >%{name}.lst
+cat gnome-%{_name}-2.0.lang %{name}.schemas_list >gnome-%{name}.lst
rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%clean
@@ -169,7 +170,7 @@
%pre -f %{name}.schemas_pre
%post
-%run_ldconfig
+/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
@@ -183,36 +184,39 @@
%preun -f %{name}.schemas_preun
%postun
-%run_ldconfig
+/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
-%files -f %{name}.lst
+%files -f gnome-%{name}.lst
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_bindir}/*
%{_datadir}/applications/*.desktop
-# %{_datadir}/control-center-2.0
%{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
%{_datadir}/desktop-directories/*.directory
%{_datadir}/gnome/cursor-fonts
-%{_datadir}/gnome/help/control-center
-%{_datadir}/gnome-background-properties
-%{_datadir}/control-center/gnome-default-applications.xml
+%dir %{_datadir}/gnome/help/control-center
+%dir %{_datadir}/gnome/help/control-center/*
+%{_datadir}/gnome/help/control-center/*/*.xml
+%{_datadir}/gnome-control-center/gnome-default-applications.xml
%{_datadir}/icons/hicolor/48x48/*/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
-%dir %{_datadir}/control-center/icons
-%{_datadir}/control-center/icons/*.png
+%dir %{_datadir}/gnome-control-center/icons
+%{_datadir}/gnome-control-center/icons/*.png
+%dir %{_datadir}/gnome-control-center/keybindings
+%{_datadir}/gnome-control-center/keybindings/*.xml
+%{_datadir}/gnome/autostart/*.desktop
%{_datadir}/mime/packages/*.xml
%{_datadir}/omf/control-center
-%dir %{_datadir}/control-center
-%dir %{_datadir}/control-center/glade
-%{_datadir}/control-center/glade/*.glade
-%dir %{_datadir}/control-center/pixmaps
-%{_datadir}/control-center/pixmaps/*.png
-%dir %{_datadir}/control-center/xrdb
-%{_datadir}/control-center/xrdb/*.ad
+%dir %{_datadir}/gnome-control-center
+%dir %{_datadir}/gnome-control-center/glade
+%{_datadir}/gnome-control-center/glade/*.glade
+%dir %{_datadir}/gnome-control-center/pixmaps
+%{_datadir}/gnome-control-center/pixmaps/*.png
+%dir %{_datadir}/gnome-control-center/xrdb
+%{_datadir}/gnome-control-center/xrdb/*.ad
%{_libdir}/*.so.*
%{_libdir}/gnome-vfs-2.0/modules/*.so
%{_libdir}/nautilus/extensions-1.0/*.so
@@ -222,7 +226,7 @@
%verify (not mode) %attr (4755, root, root) %{_sbindir}/change-passwd
%{_sysconfdir}/gnome-vfs-2.0/modules/*.conf
%{_sysconfdir}/xdg/menus/gnomecc.menu
-/etc/pam.d/gnome-passwd
+%{_sysconfdir}/pam.d/gnome-passwd
%if %suse_version <= 1020
/etc/permissions.d/*
%endif
@@ -237,6 +241,22 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Jul 09 2007 - maw@xxxxxxx
+- Update to version 2.19.4
+- The source tarball is now called gnome-control-center-$version.tar.bz2;
+ however, the package's name remains the same
+- Concomitant with the tarball name change, a number of directories
+ packaged have been renamed from control-center to
+ gnome-control-center
+- Remove the following upstreamed patches:
+ * control-center2-217790-sanitize-dpi.diff
+ * control-center2-compiz-keybindings.patch
+ * control-center2-static-libslab.patch
+ * control-center-control-key-events.patch
+ * control-center-no-x-suse.patch
+- Bug fixes, updated translations
+- s#%%run_ldconfig#/sbin/ldconfig# in the %%post and %%postun
+ sections.
* Wed Jun 06 2007 - sbrabec@xxxxxxx
- Removed invalid desktop Category "Application" (#254654).
* Tue May 22 2007 - sbrabec@xxxxxxx
++++++ control-center-2.12.2-beagle-search-hotkey.patch ++++++
--- /var/tmp/diff_new_pack.L25204/_old 2007-07-12 01:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.L25204/_new 2007-07-12 01:23:31.000000000 +0200
@@ -1,7 +1,7 @@
-Index: control-center-2.17.91/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+Index: gnome-control-center-2.19.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c
===================================================================
---- control-center-2.17.91.orig/gnome-settings-daemon/gnome-settings-multimedia-keys.c
-+++ control-center-2.17.91/gnome-settings-daemon/gnome-settings-multimedia-keys.c
+--- gnome-control-center-2.19.4.orig/gnome-settings-daemon/gnome-settings-multimedia-keys.c
++++ gnome-control-center-2.19.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c
@@ -41,6 +41,10 @@
#include "gsd-media-keys-window.h"
#include "gnome-settings-dbus.h"
@@ -13,23 +13,26 @@
#define VOLUME_STEP 6 /* percents for one volume button press */
/* we exclude shift, GDK_CONTROL_MASK and GDK_MOD1_MASK since we know what
-@@ -585,7 +589,18 @@ do_action (Acme *acme, int type)
- execute ("nautilus", FALSE);
+@@ -653,8 +657,20 @@ do_action (Acme *acme, int type)
+ g_free (cmd);
break;
case SEARCH_KEY:
-- execute ("gnome-search-tool", FALSE);
-+ {
-+ gchar *path;
-+
-+ path = g_find_program_in_path (SEARCH_EXECUTABLE_BEAGLE);
-+
-+ if (path != NULL) {
-+ execute (path, FALSE);
-+ g_free (path);
-+ } else {
-+ execute (SEARCH_EXECUTABLE_GNOME_SEARCH_TOOL, FALSE);
-+ }
+- execute (acme, "gnome-search-tool", FALSE, FALSE);
+- break;
++ // execute (acme, "gnome-search-tool", FALSE, FALSE);
++ {
++ gchar *path;
++
++ path = g_find_program_in_path (SEARCH_EXECUTABLE_BEAGLE);
++
++ if (path != NULL) {
++ execute (acme, path, FALSE, FALSE);
++ g_free (path);
++ } else {
++ execute (acme, SEARCH_EXECUTABLE_GNOME_SEARCH_TOOL, FALSE, FALSE);
+ }
- break;
++ }
++ break;
case EMAIL_KEY:
do_mail_action (acme);
+ break;
++++++ control-center2-dont-update-mimedb.patch ++++++
--- /var/tmp/diff_new_pack.L25204/_old 2007-07-12 01:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.L25204/_new 2007-07-12 01:23:31.000000000 +0200
@@ -1,9 +1,9 @@
-Index: control-center-2.17.91/capplets/theme-switcher/Makefile.am
+Index: gnome-control-center-2.19.4/capplets/appearance/Makefile.am
===================================================================
---- control-center-2.17.91.orig/capplets/theme-switcher/Makefile.am
-+++ control-center-2.17.91/capplets/theme-switcher/Makefile.am
-@@ -58,11 +58,11 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFIL
- EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files)
+--- gnome-control-center-2.19.4.orig/capplets/appearance/Makefile.am
++++ gnome-control-center-2.19.4/capplets/appearance/Makefile.am
+@@ -81,11 +81,11 @@ CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFIL
+ EXTRA_DIST = $(xml_in_files)
install-data-hook:
-if ENABLE_UPDATE_MIMEDB
++++++ control-center2-passwd-dialog.patch ++++++
--- /var/tmp/diff_new_pack.L25204/_old 2007-07-12 01:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.L25204/_new 2007-07-12 01:23:31.000000000 +0200
@@ -1,28 +1,28 @@
-Index: control-center-2.17.91/capplets/Makefile.am
+Index: gnome-control-center-2.19.4/capplets/Makefile.am
===================================================================
---- control-center-2.17.91.orig/capplets/Makefile.am
-+++ control-center-2.17.91/capplets/Makefile.am
-@@ -3,7 +3,8 @@ always_built_SUBDIRS = \
- default-applications font \
- background keyboard mouse sound \
- theme-switcher ui-properties \
-- keybindings network windows
-+ keybindings network windows \
+--- gnome-control-center-2.19.4.orig/capplets/Makefile.am
++++ gnome-control-center-2.19.4/capplets/Makefile.am
+@@ -8,7 +8,8 @@ always_built_SUBDIRS = \
+ sound \
+ keybindings \
+ network \
+- windows
++ windows \
+ passwd
SUBDIRS = $(always_built_SUBDIRS)
-Index: control-center-2.17.91/capplets/passwd/ChangeLog
+Index: gnome-control-center-2.19.4/capplets/passwd/ChangeLog
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/ChangeLog
++++ gnome-control-center-2.19.4/capplets/passwd/ChangeLog
@@ -0,0 +1,2 @@
+2005-02-04 Shakti Sen <shprasad@xxxxxxxxxx>
+ * Added the password change GUI utility
-Index: control-center-2.17.91/capplets/passwd/Makefile.am
+Index: gnome-control-center-2.19.4/capplets/passwd/Makefile.am
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/Makefile.am
++++ gnome-control-center-2.19.4/capplets/passwd/Makefile.am
@@ -0,0 +1,37 @@
+SUBDIRS = pam
+bin_PROGRAMS = gnome-passwd
@@ -61,10 +61,10 @@
+
+install-exec-hook:
+ chmod o-r $(DESTDIR)$(bindir)/gnome-passwd
-Index: control-center-2.17.91/capplets/passwd/gnome-passwd.c
+Index: gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.c
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/gnome-passwd.c
++++ gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.c
@@ -0,0 +1,214 @@
+/* gnome-passwd.c: password change capplet
+ *
@@ -280,10 +280,10 @@
+
+ return 0;
+}
-Index: control-center-2.17.91/capplets/passwd/gnome-passwd.desktop.in.in
+Index: gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.desktop.in.in
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/gnome-passwd.desktop.in.in
++++ gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
@@ -300,10 +300,10 @@
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=password
+X-GNOME-Bugzilla-Version=@VERSION@
-Index: control-center-2.17.91/capplets/passwd/gnome-passwd.glade
+Index: gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.glade
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/gnome-passwd.glade
++++ gnome-control-center-2.19.4/capplets/passwd/gnome-passwd.glade
@@ -0,0 +1,318 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
@@ -623,10 +623,10 @@
+</widget>
+
+</glade-interface>
-Index: control-center-2.17.91/capplets/passwd/pam-passwd.c
+Index: gnome-control-center-2.19.4/capplets/passwd/pam-passwd.c
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/pam-passwd.c
++++ gnome-control-center-2.19.4/capplets/passwd/pam-passwd.c
@@ -0,0 +1,255 @@
+/* pam-passwd.c: password change capplet
+ *
@@ -883,10 +883,10 @@
+ gtk_main_quit ();
+ }
+}
-Index: control-center-2.17.91/capplets/passwd/pam-passwd.h
+Index: gnome-control-center-2.19.4/capplets/passwd/pam-passwd.h
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/pam-passwd.h
++++ gnome-control-center-2.19.4/capplets/passwd/pam-passwd.h
@@ -0,0 +1,48 @@
+/* pam-passwd.h: password change capplet
+ *
@@ -936,10 +936,10 @@
+cb_dialog_response (GtkDialog *dialog, gint response_id, gpointer data);
+
+#endif /* __PAM_PASSWD_H */
-Index: control-center-2.17.91/capplets/passwd/pam/Makefile.am
+Index: gnome-control-center-2.19.4/capplets/passwd/pam/Makefile.am
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/pam/Makefile.am
++++ gnome-control-center-2.19.4/capplets/passwd/pam/Makefile.am
@@ -0,0 +1,15 @@
+sbin_PROGRAMS = change-passwd
+
@@ -956,10 +956,10 @@
+install-exec-hook:
+ chmod u+s $(DESTDIR)$(sbindir)/change-passwd
+
-Index: control-center-2.17.91/capplets/passwd/pam/gnome-passwd
+Index: gnome-control-center-2.19.4/capplets/passwd/pam/gnome-passwd
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/pam/gnome-passwd
++++ gnome-control-center-2.19.4/capplets/passwd/pam/gnome-passwd
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth include common-auth
@@ -967,10 +967,10 @@
+password include common-password
+session include common-session
+
-Index: control-center-2.17.91/capplets/passwd/pam/helper-passwd.c
+Index: gnome-control-center-2.19.4/capplets/passwd/pam/helper-passwd.c
===================================================================
--- /dev/null
-+++ control-center-2.17.91/capplets/passwd/pam/helper-passwd.c
++++ gnome-control-center-2.19.4/capplets/passwd/pam/helper-passwd.c
@@ -0,0 +1,520 @@
+/* helper-passwd.c: password change capplet
+ *
@@ -1492,14 +1492,15 @@
+ }
+ return 0;
+}
-Index: control-center-2.17.91/configure.in
+Index: gnome-control-center-2.19.4/configure.in
===================================================================
---- control-center-2.17.91.orig/configure.in
-+++ control-center-2.17.91/configure.in
-@@ -531,6 +531,18 @@ dnl End: Define the main variables
- dnl ==============================================
+--- gnome-control-center-2.19.4.orig/configure.in
++++ gnome-control-center-2.19.4/configure.in
+@@ -292,6 +292,18 @@ if test "x$enable_hal" != "xno"; then
+ AC_SUBST(HAL_LIBS)
+ fi
- dnl =======================================
++ dnl =======================================
+dnl Required For PAM
+dnl =======================================
+
@@ -1511,25 +1512,24 @@
+AC_SUBST(PASSWD_PAM_LIBS)
+AC_SUBST(PASSWD_PAM_INCLUDEDIR)
+
-+dnl =======================================
- dnl Variables for config_archiverConf.sh.in
- dnl =======================================
- CONFIG_ARCHIVER_LIBDIR='-L${libdir}'
-@@ -587,6 +599,9 @@ capplets/accessibility/Makefile
- capplets/accessibility/keyboard/Makefile
- capplets/accessibility/at-properties/Makefile
+ dnl ==============================================
+ dnl End: Check that we meet the dependencies
+ dnl ==============================================
+@@ -498,6 +510,9 @@ capplets/mouse/Makefile
+ capplets/mouse/gnome-settings-mouse.desktop.in
capplets/network/Makefile
+ capplets/network/gnome-network-preferences.desktop.in
+capplets/passwd/Makefile
+capplets/passwd/pam/Makefile
+capplets/passwd/gnome-passwd.desktop.in
+ capplets/sound/Makefile
+ capplets/sound/gnome-settings-sound.desktop.in
capplets/windows/Makefile
- capplets/about-me/Makefile
- help/Makefile
-Index: control-center-2.17.91/po/POTFILES.in
+Index: gnome-control-center-2.19.4/po/POTFILES.in
===================================================================
---- control-center-2.17.91.orig/po/POTFILES.in
-+++ control-center-2.17.91/po/POTFILES.in
-@@ -51,6 +51,10 @@ capplets/mouse/gnome-settings-mouse.desk
+--- gnome-control-center-2.19.4.orig/po/POTFILES.in
++++ gnome-control-center-2.19.4/po/POTFILES.in
+@@ -62,6 +62,10 @@ capplets/mouse/gnome-settings-mouse.desk
capplets/network/gnome-network-preferences.c
capplets/network/gnome-network-preferences.desktop.in.in
capplets/network/gnome-network-preferences.glade
@@ -1539,4 +1539,4 @@
+capplets/passwd/gnome-passwd.glade
capplets/sound/gnome-settings-sound.desktop.in.in
capplets/sound/mixer-support.c
- capplets/sound/sound-properties-capplet.c
+ capplets/sound/pipeline-tests.c
++++++ control-center2-system-proxy-configuration.diff ++++++
--- /var/tmp/diff_new_pack.L25204/_old 2007-07-12 01:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.L25204/_new 2007-07-12 01:23:31.000000000 +0200
@@ -238,7 +238,7 @@
</widget>
<packing>
<property name="padding">0</property>
-@@ -673,7 +693,7 @@
+@@ -669,7 +689,7 @@
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -261,16 +261,16 @@
libexec_PROGRAMS=gnome-settings-daemon
-@@ -54,6 +55,8 @@ gnome_settings_daemon_SOURCES = \
- gnome-settings-xrdb.h \
+@@ -55,6 +56,8 @@ gnome_settings_daemon_SOURCES = \
+ gnome-settings-xsettings.c \
gsd-media-keys-window.c \
gsd-media-keys-window.h \
+ gnome-settings-proxy.c \
+ gnome-settings-proxy.h \
- xsettings-common.c \
- xsettings-manager.c \
- xsettings-common.h \
-@@ -102,6 +105,11 @@ gnome_settings_daemon_SOURCES+=$(BUILT_S
+ list.c \
+ list.h \
+ reaper.c \
+@@ -96,6 +99,11 @@ gnome_settings_daemon_SOURCES+=$(BUILT_S
Gladedir = $(pkgdatadir)/glade
Glade_DATA = modmap-dialog.glade
@@ -282,7 +282,7 @@
Dbusapidir = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
Dbusapi_DATA = gnome-settings-client.h
-@@ -127,7 +135,7 @@ service_DATA = $(service_in_files:.servi
+@@ -121,7 +129,7 @@ service_DATA = $(service_in_files:.servi
org.gnome.SettingsDaemon.service: org.gnome.SettingsDaemon.service.in Makefile
@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@@ -295,30 +295,30 @@
===================================================================
--- gnome-settings-daemon/gnome-settings-daemon.c.orig
+++ gnome-settings-daemon/gnome-settings-daemon.c
-@@ -58,6 +58,7 @@
- #include "gnome-settings-gtk1theme.h"
+@@ -42,6 +42,7 @@
+ #include "gnome-settings-keybindings.h"
+ #include "gnome-settings-multimedia-keys.h"
#include "gnome-settings-xrdb.h"
- #include "gnome-settings-typing-break.h"
+#include "gnome-settings-proxy.h"
- #include "clipboard-manager.h"
-
-@@ -340,6 +341,7 @@ gnome_settings_daemon_new (void)
- gnome_settings_gtk1_theme_init (client);
- gnome_settings_xrdb_init (client);
- gnome_settings_typing_break_init (client);
-+ gnome_settings_proxy_init (client);
-
- for (list = directories; list; list = list->next)
- {
-@@ -394,6 +396,7 @@ gnome_settings_daemon_new (void)
- gnome_settings_gtk1_theme_load (client);
- gnome_settings_xrdb_load (client);
- gnome_settings_typing_break_load (client);
-+ gnome_settings_proxy_load (client);
-
- dbusServer = g_object_new (gnome_settings_server_get_type (), NULL);
+ struct _GnomeSettingsDaemonPrivate {
+ GHashTable *loaded_modules;
+@@ -304,6 +305,7 @@ gnome_settings_daemon_new (void)
+ gnome_settings_accessibility_keyboard_init (client);
+ gnome_settings_keybindings_init (client);
+ gnome_settings_xrdb_init (client);
++ gnome_settings_proxy_init (client);
+
+ /* load all modules */
+ initialize_modules (daemon, GNOME_SETTINGS_MODULE_RUNLEVEL_XSETTINGS);
+@@ -329,6 +331,7 @@ gnome_settings_daemon_new (void)
+ gnome_settings_accessibility_keyboard_load (client);
+ gnome_settings_keybindings_load (client);
+ gnome_settings_xrdb_load (client);
++ gnome_settings_proxy_load (client);
+ /* start all modules */
+ start_modules (daemon, GNOME_SETTINGS_MODULE_RUNLEVEL_XSETTINGS);
Index: gnome-settings-daemon/gnome-settings-proxy.c
===================================================================
--- /dev/null
@@ -712,7 +712,7 @@
+ if (use_system_settings)
+ g_free (use_system_settings);
+
-+ gnome_settings_daemon_register_callback (DIR_PROXY, dir_proxy_key_changed_cb);
++ gnome_settings_register_config_callback (DIR_PROXY, dir_proxy_key_changed_cb);
+
+ if (gnome_vfs_monitor_add (&monitor_handle, ETC_SYSCONFIG_PROXY_URI, GNOME_VFS_MONITOR_FILE,
+ monitor_cb, NULL) != GNOME_VFS_OK)
++++++ control-center-default-applications-ftp+news.patch ++++++
++++ 631 lines (skipped)
++++ between GNOME/control-center2/control-center-default-applications-ftp+news.patch
++++ and /mounts/work_src_done/STABLE/control-center2/control-center-default-applications-ftp+news.patch
++++++ control-center-seamonkey.patch ++++++
--- /var/tmp/diff_new_pack.L25204/_old 2007-07-12 01:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.L25204/_new 2007-07-12 01:23:31.000000000 +0200
@@ -1,7 +1,9 @@
---- capplets/default-applications/gnome-default-applications.xml.in
+Index: capplets/default-applications/gnome-default-applications.xml.in
+===================================================================
+--- capplets/default-applications/gnome-default-applications.xml.in.orig
+++ capplets/default-applications/gnome-default-applications.xml.in
-@@ -102,6 +102,16 @@
- <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
+@@ -112,6 +112,16 @@
+ <win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
</web-browser>
<web-browser>
+ <_name>SeaMonkey</_name>
@@ -17,7 +19,7 @@
<_name>Netscape Communicator</_name>
<executable>netscape</executable>
<command>netscape %s</command>
-@@ -257,6 +267,13 @@
+@@ -274,6 +284,13 @@
<run-in-terminal>false</run-in-terminal>
</mail-reader>
<mail-reader>
@@ -31,7 +33,7 @@
<_name>Mutt</_name>
<executable>mutt</executable>
<command>mutt %s</command>
-@@ -323,6 +340,13 @@
+@@ -340,6 +357,13 @@
<win-command>mozilla -news -remote "openurl(%s,new-window)"</win-command>
</news-reader>
<news-reader>
++++++ desktop.patch ++++++
--- /var/tmp/diff_new_pack.L25204/_old 2007-07-12 01:23:31.000000000 +0200
+++ /var/tmp/diff_new_pack.L25204/_new 2007-07-12 01:23:31.000000000 +0200
@@ -1,7 +1,7 @@
-Index: control-center-2.17.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+Index: gnome-control-center-2.19.4/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
===================================================================
---- control-center-2.17.91.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
-+++ control-center-2.17.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+--- gnome-control-center-2.19.4.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
++++ gnome-control-center-2.19.4/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
@@ -10,10 +10,10 @@
_Comment=Set your keyboard accessibility preferences
Exec=gnome-accessibility-keyboard-properties
Icon=gnome-settings-accessibility-keyboard
-Index: control-center-2.17.91/capplets/default-applications/default-applications.desktop.in.in
+Index: gnome-control-center-2.19.4/capplets/default-applications/default-applications.desktop.in.in
===================================================================
---- control-center-2.17.91.orig/capplets/default-applications/default-applications.desktop.in.in
-+++ control-center-2.17.91/capplets/default-applications/default-applications.desktop.in.in
+--- gnome-control-center-2.19.4.orig/capplets/default-applications/default-applications.desktop.in.in
++++ gnome-control-center-2.19.4/capplets/default-applications/default-applications.desktop.in.in
@@ -7,7 +7,7 @@ Icon=gnome-settings-default-applications
Terminal=false
Type=Application
@@ -23,22 +23,10 @@
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=control-center
-Index: control-center-2.17.91/capplets/font/font-properties.desktop.in.in
+Index: gnome-control-center-2.19.4/capplets/keybindings/keybinding.desktop.in.in
===================================================================
---- control-center-2.17.91.orig/capplets/font/font-properties.desktop.in.in
-+++ control-center-2.17.91/capplets/font/font-properties.desktop.in.in
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Font
-+_Name=Fonts
- _Comment=Select fonts for the desktop
- Exec=gnome-font-properties
- Icon=gnome-settings-font
-Index: control-center-2.17.91/capplets/keybindings/keybinding.desktop.in.in
-===================================================================
---- control-center-2.17.91.orig/capplets/keybindings/keybinding.desktop.in.in
-+++ control-center-2.17.91/capplets/keybindings/keybinding.desktop.in.in
+--- gnome-control-center-2.19.4.orig/capplets/keybindings/keybinding.desktop.in.in
++++ gnome-control-center-2.19.4/capplets/keybindings/keybinding.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
@@ -47,10 +35,10 @@
_Comment=Assign shortcut keys to commands
Exec=gnome-keybinding-properties
Icon=gnome-settings-keybindings
-Index: control-center-2.17.91/capplets/network/gnome-network-preferences.desktop.in.in
+Index: gnome-control-center-2.19.4/capplets/network/gnome-network-preferences.desktop.in.in
===================================================================
---- control-center-2.17.91.orig/capplets/network/gnome-network-preferences.desktop.in.in
-+++ control-center-2.17.91/capplets/network/gnome-network-preferences.desktop.in.in
+--- gnome-control-center-2.19.4.orig/capplets/network/gnome-network-preferences.desktop.in.in
++++ gnome-control-center-2.19.4/capplets/network/gnome-network-preferences.desktop.in.in
@@ -1,13 +1,13 @@
[Desktop Entry]
Encoding=UTF-8
@@ -67,4 +55,4 @@
+Categories=GNOME;GTK;Settings;AdvancedSettings;
OnlyShowIn=GNOME;
X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
+ X-GNOME-Bugzilla-Product=gnome-control-center
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |