commit yast2-control-center-gnome

1 Sep 2007

Hello community,

here is the log from the commit of package yast2-control-center-gnome
checked in at Sat Sep 1 13:24:34 CEST 2007.

--------

--- yast2-control-center-gnome/yast2-control-center-gnome.changes	2007-05-23 01:44:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-control-center-gnome/yast2-control-center-gnome.changes	2007-08-25 01:41:25.089303000 +0200
@@ -1,0 +2,7 @@
+Sat Aug 25 01:17:16 CEST 2007 - sreeves@suse.de
+
+- Fix for 247684 - remove empty icon hierarchy
+  Fix for 8097 - use new yast window icon
+  Fix for 297243 - change app armor icon name
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-control-center-gnome.spec ++++++
--- /var/tmp/diff_new_pack.ae9896/_old	2007-09-01 13:24:29.000000000 +0200
+++ /var/tmp/diff_new_pack.ae9896/_new	2007-09-01 13:24:29.000000000 +0200
@@ -12,12 +12,12 @@
 
 Name:           yast2-control-center-gnome
 BuildRequires:  gnome-main-menu-devel libgnome-devel libgnomeui-devel pkgconfig qt3-devel update-desktop-files yast2-devtools
-License:        GNU General Public License (GPL)
-Group:          System/Management
+License:        GPL v2 or later
+Group:          System/YaST
 Autoreqprov:    on
 Version:        2.13.2
-Release:        25
-Summary:        GNOME control center
+Release:        73
+Summary:        YaST2 - Control Center (GNOME version)
 Source:         %{name}-%{version}.tar.gz
 prefix:         /usr
 URL:            http://en.opensuse.org/YaST2-GTK
@@ -75,19 +75,12 @@
 %{prefix}/lib/YaST2/bin/y2controlcenter-gnome
 %{_datadir}/desktop-directories/yast-gnome*.directory
 %doc %{_datadir}/doc/packages/yast2-control-center-gnome
-# hacks to move elsewhere ...
-%dir %{_datadir}/YaST2
-%dir %{_datadir}/YaST2/theme
-%dir %{_datadir}/YaST2/theme/NLD
-%dir %{_datadir}/YaST2/theme/NLD/icons
-%dir %{_datadir}/YaST2/theme/SuSELinux
-%dir %{_datadir}/YaST2/theme/SuSELinux/icons
-%{_datadir}/YaST2/theme/NLD/icons/index.theme
-%{_datadir}/YaST2/theme/NLD/hicolor
-%{_datadir}/YaST2/theme/SuSELinux/icons/index.theme
-%{_datadir}/YaST2/theme/SuSELinux/hicolor
 
 %changelog
+* Sat Aug 25 2007 - sreeves@suse.de
+- Fix for 247684 - remove empty icon hierarchy
+  Fix for 8097 - use new yast window icon
+  Fix for 297243 - change app armor icon name
 * Wed May 23 2007 - sreeves@suse.de
 - Remove existing X-SuSE-translate from .directory files so
   suse_update_desktop_file wont error out

++++++ yast2-control-center-gnome-2.13.2.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/configure new/yast2-control-center-gnome-2.13.2/configure
--- old/yast2-control-center-gnome-2.13.2/configure	2007-05-23 00:46:03.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/configure	2007-08-24 23:21:22.000000000 +0200
@@ -466,7 +466,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG CONTROL_CFLAGS CONTROL_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG CONTROL_CFLAGS CONTROL_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -2389,6 +2389,8 @@
    { (exit 1); exit 1; }; }
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
@@ -4879,7 +4881,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4882 "configure"' > conftest.$ac_ext
+  echo '#line 4884 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5780,7 +5782,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:5783:" \
+echo "$as_me:5785:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6843,11 +6845,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6848: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6850: \$? = $ac_status" >&5
+   echo "$as_me:6852: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7111,11 +7113,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7114: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7116: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7118: \$? = $ac_status" >&5
+   echo "$as_me:7120: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7215,11 +7217,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7218: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7220: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7222: \$? = $ac_status" >&5
+   echo "$as_me:7224: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9560,7 +9562,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9563 "configure"
+#line 9565 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9660,7 +9662,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9663 "configure"
+#line 9665 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12000,11 +12002,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12003: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12005: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12007: \$? = $ac_status" >&5
+   echo "$as_me:12009: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12104,11 +12106,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12107: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12109: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12111: \$? = $ac_status" >&5
+   echo "$as_me:12113: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13674,11 +13676,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13677: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13679: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13681: \$? = $ac_status" >&5
+   echo "$as_me:13683: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13778,11 +13780,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13781: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13783: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13785: \$? = $ac_status" >&5
+   echo "$as_me:13787: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15981,11 +15983,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15984: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15986: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15988: \$? = $ac_status" >&5
+   echo "$as_me:15990: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16249,11 +16251,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16252: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16254: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16256: \$? = $ac_status" >&5
+   echo "$as_me:16258: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16353,11 +16355,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16356: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16358: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16360: \$? = $ac_status" >&5
+   echo "$as_me:16362: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20923,6 +20925,7 @@
 s,@LN_S@,$LN_S,;t t
 s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t
 s,@XGETTEXT@,$XGETTEXT,;t t
+s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t
 s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t
 s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t
 s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/configure.in new/yast2-control-center-gnome-2.13.2/configure.in
--- old/yast2-control-center-gnome-2.13.2/configure.in	2007-05-23 00:45:37.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/configure.in	2007-08-24 23:21:10.000000000 +0200
@@ -1,6 +1,6 @@
 dnl configure.in for yast2-control-center-gnome
 dnl
-dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
 AC_INIT(yast2-control-center-gnome, 2.13.2, http://bugs.opensuse.org/, yast2-control-center-gnome)
@@ -110,6 +110,8 @@
     AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
 fi
 
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
 devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
 devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/index.theme new/yast2-control-center-gnome-2.13.2/etc/index.theme
--- old/yast2-control-center-gnome-2.13.2/etc/index.theme	2007-05-23 00:34:10.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/etc/index.theme	1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-[Icon Theme]
-Name=SLED
-Comment=SLED YaST theme
-Directories=32x32/apps,48x48/apps,scaleable/apps
-
-[scaleable/apps]
-Size=48
-Context=Actions
-Type=Scalable
-MinSize=25
-MaxSize=256
-
-[48x48/apps]
-Size=48
-Context=Applications
-Type=Fixed
-
-[32x32/apps]
-Size=24
-Context=Applications
-Type=Fixed
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/Makefile.am new/yast2-control-center-gnome-2.13.2/etc/Makefile.am
--- old/yast2-control-center-gnome-2.13.2/etc/Makefile.am	2007-05-23 00:34:10.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/etc/Makefile.am	2007-08-24 23:19:20.000000000 +0200
@@ -9,33 +9,16 @@
 directorydir = $(datadir)/desktop-directories
 directory_DATA = $(wildcard yast-gnome-*.directory)
 
-NLD_YAST_THEME_DIR = /usr/share/YaST2/theme/NLD
-SL_YAST_THEME_DIR = /usr/share/YaST2/theme/SuSELinux
-
 $(schemas_DATA): $(schemas_DATA).in
 	sed -e "s|\@DATADIR\@|$(datadir)|g" $< > $@
 
-# -----------------------------------------------------
-# clobber the NLD yast2 theme to make it an icon theme
-# this hack should be in the themes themselves.
-# -----------------------------------------------------
-indexdir = $(NLD_YAST_THEME_DIR)/icons
-index_DATA = index.theme
-index2dir = $(SL_YAST_THEME_DIR)/icons
-index2_DATA = index.theme
-# we also require a symlink to make it look like a theme
-link-hicolor:
-	mkdir -p $(DESTDIR)$(NLD_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(NLD_YAST_THEME_DIR)/hicolor
-	mkdir -p $(DESTDIR)$(SL_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(SL_YAST_THEME_DIR)/hicolor
-# -----------------------------------------------------
-
-install-data-local: link-hicolor
+install-data-local:
 	if test -z "$(DESTDIR)" ; then \
 		for p in $(schemas_DATA) ; do \
 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
 		done \
 	fi
 
-EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) $(index_DATA)
+EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA)
 
 CLEANFILES = $(schemas_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/Makefile.in new/yast2-control-center-gnome-2.13.2/etc/Makefile.in
--- old/yast2-control-center-gnome-2.13.2/etc/Makefile.in	2007-05-23 00:46:14.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/etc/Makefile.in	2007-08-24 23:21:25.000000000 +0200
@@ -54,16 +54,12 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(indexdir)" \
-	"$(DESTDIR)$(index2dir)" "$(DESTDIR)$(menudir)" \
+am__installdirs = "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(menudir)" \
 	"$(DESTDIR)$(schemasdir)"
 directoryDATA_INSTALL = $(INSTALL_DATA)
-indexDATA_INSTALL = $(INSTALL_DATA)
-index2DATA_INSTALL = $(INSTALL_DATA)
 menuDATA_INSTALL = $(INSTALL_DATA)
 schemasDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(directory_DATA) $(index_DATA) $(index2_DATA) $(menu_DATA) \
-	$(schemas_DATA)
+DATA = $(directory_DATA) $(menu_DATA) $(schemas_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AGENT_LIBADD = @AGENT_LIBADD@
@@ -146,6 +142,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YDOXYGEN = @YDOXYGEN@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
@@ -226,18 +223,7 @@
 # built from yast2 groups/ desktop files
 directorydir = $(datadir)/desktop-directories
 directory_DATA = $(wildcard yast-gnome-*.directory)
-NLD_YAST_THEME_DIR = /usr/share/YaST2/theme/NLD
-SL_YAST_THEME_DIR = /usr/share/YaST2/theme/SuSELinux
-
-# -----------------------------------------------------
-# clobber the NLD yast2 theme to make it an icon theme
-# this hack should be in the themes themselves.
-# -----------------------------------------------------
-indexdir = $(NLD_YAST_THEME_DIR)/icons
-index_DATA = index.theme
-index2dir = $(SL_YAST_THEME_DIR)/icons
-index2_DATA = index.theme
-EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) $(index_DATA)
+EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA)
 CLEANFILES = $(schemas_DATA)
 all: all-am
 
@@ -298,40 +284,6 @@
 	  echo " rm -f '$(DESTDIR)$(directorydir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(directorydir)/$$f"; \
 	done
-install-indexDATA: $(index_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(indexdir)" || $(mkdir_p) "$(DESTDIR)$(indexdir)"
-	@list='$(index_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(indexDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(indexdir)/$$f'"; \
-	  $(indexDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(indexdir)/$$f"; \
-	done
-
-uninstall-indexDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(index_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(indexdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(indexdir)/$$f"; \
-	done
-install-index2DATA: $(index2_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(index2dir)" || $(mkdir_p) "$(DESTDIR)$(index2dir)"
-	@list='$(index2_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(index2DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(index2dir)/$$f'"; \
-	  $(index2DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(index2dir)/$$f"; \
-	done
-
-uninstall-index2DATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(index2_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(index2dir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(index2dir)/$$f"; \
-	done
 install-menuDATA: $(menu_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(menudir)" || $(mkdir_p) "$(DESTDIR)$(menudir)"
@@ -404,7 +356,7 @@
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(indexdir)" "$(DESTDIR)$(index2dir)" "$(DESTDIR)$(menudir)" "$(DESTDIR)$(schemasdir)"; do \
+	for dir in "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(menudir)" "$(DESTDIR)$(schemasdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -451,8 +403,7 @@
 info-am:
 
 install-data-am: install-data-local install-directoryDATA \
-	install-index2DATA install-indexDATA install-menuDATA \
-	install-schemasDATA
+	install-menuDATA install-schemasDATA
 
 install-exec-am:
 
@@ -478,34 +429,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-directoryDATA uninstall-index2DATA \
-	uninstall-indexDATA uninstall-info-am uninstall-menuDATA \
-	uninstall-schemasDATA
+uninstall-am: uninstall-directoryDATA uninstall-info-am \
+	uninstall-menuDATA uninstall-schemasDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-data-local \
 	install-directoryDATA install-exec install-exec-am \
-	install-index2DATA install-indexDATA install-info \
-	install-info-am install-man install-menuDATA \
+	install-info install-info-am install-man install-menuDATA \
 	install-schemasDATA install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am uninstall-directoryDATA \
-	uninstall-index2DATA uninstall-indexDATA uninstall-info-am \
-	uninstall-menuDATA uninstall-schemasDATA
+	uninstall-info-am uninstall-menuDATA uninstall-schemasDATA
 
 
 $(schemas_DATA): $(schemas_DATA).in
 	sed -e "s|\@DATADIR\@|$(datadir)|g" $< > $@
-# we also require a symlink to make it look like a theme
-link-hicolor:
-	mkdir -p $(DESTDIR)$(NLD_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(NLD_YAST_THEME_DIR)/hicolor
-	mkdir -p $(DESTDIR)$(SL_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(SL_YAST_THEME_DIR)/hicolor
-# -----------------------------------------------------
 
-install-data-local: link-hicolor
+install-data-local:
 	if test -z "$(DESTDIR)" ; then \
 		for p in $(schemas_DATA) ; do \
 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory
--- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory	2007-05-23 00:58:37.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory	2007-08-24 22:09:00.000000000 +0200
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Directory
-Icon=apparmor/app_armor
+Icon=apparmor_app_armor
 
 X-SuSE-DocTeamID=ycc_apparmor
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/Makefile.am new/yast2-control-center-gnome-2.13.2/Makefile.am
--- old/yast2-control-center-gnome-2.13.2/Makefile.am	2007-05-23 00:45:38.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/Makefile.am	2007-08-24 23:21:11.000000000 +0200
@@ -7,8 +7,7 @@
 #
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 
 VERSION			= $(shell cat $(srcdir)/VERSION)
 RPMNAME 		= $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS		= $(findstring yast2-devtools,$(RPMNAME))
 
-DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR 		= $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
 ALL_PACKAGES		= $(DEVTOOLS_DIR)/admin/all-packages
 LEGALESE_DIR		= $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
 
@@ -34,7 +33,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 
 Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
 # because the prerequisite is made here (not anymore!)
 # and we don't want any paths in y2autoconf
 # info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
 	./config.status --file=$@:$<
 
 if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/Makefile.in new/yast2-control-center-gnome-2.13.2/Makefile.in
--- old/yast2-control-center-gnome-2.13.2/Makefile.in	2007-05-23 00:46:15.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/Makefile.in	2007-08-24 23:21:26.000000000 +0200
@@ -175,6 +175,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = $(shell cat $(srcdir)/VERSION)
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YDOXYGEN = @YDOXYGEN@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
@@ -247,15 +248,14 @@
 ystartupdir = @ystartupdir@
 
 #where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
 SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS      && echo SUBDIRS)
 ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
 HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
 
 # do we do Makefile.am for devtools? It is a little special...
 IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
 ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
 LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
 COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
@@ -266,7 +266,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 # where devtools instal m4 snippets
 # argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
 ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
 CLEANFILES = 
 MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
@@ -784,7 +784,7 @@
 # because the prerequisite is made here (not anymore!)
 # and we don't want any paths in y2autoconf
 # info '(autoconf)config.status Invocation'
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
+@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status
 @CREATE_PKGCONFIG_TRUE@	./config.status --file=$@:$<
 
 dist-hook:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/src/control-center.c new/yast2-control-center-gnome-2.13.2/src/control-center.c
--- old/yast2-control-center-gnome-2.13.2/src/control-center.c	2007-05-23 00:34:10.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/src/control-center.c	2007-08-31 23:24:34.000000000 +0200
@@ -161,7 +161,7 @@
 	g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data);
 	textdomain (YAST_CC_PACKAGE);
 	create_main_window (app_data, widget_theming_name, _("YaST2 Control Center"),
-		"gnome-control-center", 975, 600, hidden);
+		"yast", 975, 600, hidden);
 	textdomain (GNOME_MAIN_MENU_PACKAGE);
 
 	if (bonobo_app)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/src/Makefile.in new/yast2-control-center-gnome-2.13.2/src/Makefile.in
--- old/yast2-control-center-gnome-2.13.2/src/Makefile.in	2007-05-23 00:46:15.000000000 +0200
+++ new/yast2-control-center-gnome-2.13.2/src/Makefile.in	2007-08-24 23:21:26.000000000 +0200
@@ -151,6 +151,7 @@
 STYLESHEET_YDOC = @STYLESHEET_YDOC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
 YDOXYGEN = @YDOXYGEN@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)