Hello community,
here is the log from the commit of package yast2-CASA
checked in at Tue Jun 3 00:55:41 CEST 2008.
--------
--- yast2-CASA/yast2-CASA.changes 2007-09-10 23:56:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-CASA/yast2-CASA.changes 2008-05-30 00:03:51.000000000 +0200
@@ -1,0 +2,11 @@
+Thu May 29 14:46:17 MDT 2008 - jluciani@novell.com
+
+- Removed the yast icons for packages built for SuSE versions
+ greater than 10.3 as part of the solution to BUG384744.
+
+-------------------------------------------------------------------
+Fri Apr 04 14:14:12 MDT 2008 - schoi@novell.com
+
+- BUG 259794 Fix for localizing the text in CASA.pot file for Yast module.
+
+-------------------------------------------------------------------
Old:
----
yast2-CASA-1.7.1461.tar.bz2
New:
----
yast2-CASA-1.7.1535.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-CASA.spec ++++++
--- /var/tmp/diff_new_pack.n21676/_old 2008-06-03 00:55:28.000000000 +0200
+++ /var/tmp/diff_new_pack.n21676/_new 2008-06-03 00:55:28.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-CASA (Version 1.7.1461)
+# spec file for package yast2-CASA (Version 1.7.1535)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,20 +10,21 @@
# norootforbuild
+Url: http://forge.novell.com
+
Name: yast2-CASA
-URL: http://forge.novell.com
%if %suse_version == 1030
BuildRequires: libgcc libstdc++ update-desktop-files yast2-devel-doc yast2-devtools
%else
BuildRequires: libgcc libstdc++ update-desktop-files yast2-devel yast2-devtools
%endif
-Version: 1.7.1461
+Version: 1.7.1535
Release: 1
-License: LGPL v2 or later
+License: LGPL v2.1 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-prefix: /usr
+Prefix: /usr
Requires: yast2 CASA > 1.6.400
Summary: YaST2 - Configuration for Novell CASA (Common Authentication Services Adapter)
@@ -39,7 +40,7 @@
Cameron Mashayekhi
%prep
-%setup -n yast2-CASA-1.7.1461
+%setup -n yast2-CASA-1.7.1535
%build
%{prefix}/bin/y2tool y2autoconf
@@ -58,66 +59,51 @@
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
-chmod 555 $RPM_BUILD_ROOT/usr/share/applications/install_casa_yast_icons
%clean
rm -rf "$RPM_BUILD_ROOT"
-%post
-echo "yast2-CASA post install script"
-echo "installing the Novell CASA YaST icon files"
-/usr/share/applications/install_casa_yast_icons install rpm
-exit 0
-
-%preun
-if [ "$1" = 0 ]; then
- echo "yast2-CASA pre uninstall script"
- echo "removing the Novell CASA YaST icon files"
- /usr/share/applications/install_casa_yast_icons uninstall rpm
-fi
-exit 0
-
%files
%defattr(-,root,root)
%dir /usr/share/YaST2/include/CASA
-/usr/share/applications/install_casa_yast_icons
-/usr/share/pixmaps/CASA_22.png
-/usr/share/pixmaps/CASA_32.png
-/usr/share/pixmaps/CASA_48.png
/usr/share/YaST2/include/CASA/*
/usr/share/YaST2/clients/CASA.ycp
/usr/share/YaST2/clients/CASA_*.ycp
/usr/share/YaST2/modules/NovellCasa.*
%{prefix}/share/applications/YaST2/CASA.desktop
%doc %{prefix}/share/doc/packages/yast2-CASA
-
%changelog
-* Mon Sep 10 2007 - schoi@novell.com
+* Thu May 29 2008 jluciani@novell.com
+- Removed the yast icons for packages built for SuSE versions
+ greater than 10.3 as part of the solution to BUG384744.
+* Fri Apr 04 2008 schoi@novell.com
+- BUG 259794 Fix for localizing the text in CASA.pot file for Yast module.
+* Mon Sep 10 2007 schoi@novell.com
- BUG 299044 remove mo and po files to fix the conflict between yast2-CASA and yast2-trans-en_US
-* Tue Jul 31 2007 - schoi@novell.com
+* Tue Jul 31 2007 schoi@novell.com
- fix the build break in STABLE branch due to yast2-devel package name change
-* Fri Jul 06 2007 - jnorman@novell.com
+* Fri Jul 06 2007 jnorman@novell.com
- Bug 288999. Change message from Configure CASA to
Enable CASA.
-* Tue Mar 27 2007 - cmashayekhi@novell.com
+* Tue Mar 27 2007 cmashayekhi@novell.com
- Bug 257766 : Misspelled message corrected.
-* Wed Mar 07 2007 - cmashayekhi@novell.com
+* Wed Mar 07 2007 cmashayekhi@novell.com
- Bug 205355 : Changed the buttons' labels to "Enabled" & "Disabled".
-* Tue Nov 21 2006 - schoi@novell.com
+* Tue Nov 21 2006 schoi@novell.com
- FateID 301736 : Submit yast2-CASA 1.7 to sled10-sp1
-* Fri Jul 28 2006 - schoi@novell.com
+* Fri Jul 28 2006 schoi@novell.com
- Version change from 1.6 to 1.7
-* Thu May 25 2006 - cmashayekhi@novell.com
+* Thu May 25 2006 cmashayekhi@novell.com
- Buttons start in grayed out state before internal check
for insattation or not.
-* Mon May 22 2006 - cmashayekhi@novell.com
+* Mon May 22 2006 cmashayekhi@novell.com
- Bug 171136. Fixed to gray out proper button before and
after configuration in yast.
-* Mon May 08 2006 - cmashayekhi@novell.com
+* Mon May 08 2006 cmashayekhi@novell.com
- PO and POT files were added for localization.
-* Mon Apr 24 2006 - cmashayekhi@novell.com
+* Mon Apr 24 2006 cmashayekhi@novell.com
- miCASA.ycp, miCASA.pm and miCASA.ybc were renamed to
NovellCasa.* to solve a load problem.
-* Sat Apr 22 2006 - cmashayekhi@novell.com
+* Sat Apr 22 2006 cmashayekhi@novell.com
- This file has been created for yast2-CASA project for the first
time.
++++++ yast2-CASA-1.7.1461.tar.bz2 -> yast2-CASA-1.7.1535.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/CASA.pot new/yast2-CASA-1.7.1535/CASA.pot
--- old/yast2-CASA-1.7.1461/CASA.pot 2007-02-12 21:55:35.000000000 +0100
+++ new/yast2-CASA-1.7.1535/CASA.pot 2008-05-30 00:03:51.000000000 +0200
@@ -149,14 +149,37 @@
msgid " CASA Configuration Wizard Pages "
msgstr ""
+#: src/complex.ycp:67
+msgid "&Enable CASA"
+msgstr ""
+
+#: src/complex.ycp:71
+msgid "&Disable CASA"
+msgstr ""
+
+#: src/complex.ycp:71
+msgid "&Disable CASA"
+msgstr ""
+
+
#: src/complex.ycp:108
msgid "&Configure CASA"
msgstr ""
+#: src/complex.ycp:187
+msgid "&YaST Enabled CASA successfully."
+msgstr ""
+
+#: src/complex.ycp:221
+msgid "&YaST Disabled CASA successfully."
+msgstr ""
+
#: src/complex.ycp:111
msgid "&Unconfigure CASA"
msgstr ""
+
+
#. CASA overview dialog caption
#: src/complex.ycp:250
msgid "CASA Overview"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/configure new/yast2-CASA-1.7.1535/configure
--- old/yast2-CASA-1.7.1461/configure 2007-09-10 23:56:46.000000000 +0200
+++ new/yast2-CASA-1.7.1535/configure 2008-06-02 22:30:34.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-CASA 1.7.1461.
+# Generated by GNU Autoconf 2.59 for yast2-CASA 1.7.1535.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-CASA'
PACKAGE_TARNAME='yast2-CASA'
-PACKAGE_VERSION='1.7.1461'
-PACKAGE_STRING='yast2-CASA 1.7.1461'
+PACKAGE_VERSION='1.7.1535'
+PACKAGE_STRING='yast2-CASA 1.7.1535'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-CASA 1.7.1461 to adapt to many kinds of systems.
+\`configure' configures yast2-CASA 1.7.1535 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-CASA 1.7.1461:";;
+ short | recursive ) echo "Configuration of yast2-CASA 1.7.1535:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-CASA configure 1.7.1461
+yast2-CASA configure 1.7.1535
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-CASA $as_me 1.7.1461, which was
+It was created by yast2-CASA $as_me 1.7.1535, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-CASA'
- VERSION='1.7.1461'
+ VERSION='1.7.1535'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="1.7.1461"
+VERSION="1.7.1535"
RPMNAME="yast2-CASA"
MAINTAINER="casa "
@@ -2647,7 +2647,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-CASA $as_me 1.7.1461, which was
+This file was extended by yast2-CASA $as_me 1.7.1535, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2702,7 +2702,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-CASA config.status 1.7.1461
+yast2-CASA config.status 1.7.1535
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/configure.in new/yast2-CASA-1.7.1535/configure.in
--- old/yast2-CASA-1.7.1461/configure.in 2007-09-10 23:56:38.000000000 +0200
+++ new/yast2-CASA-1.7.1535/configure.in 2008-06-02 22:30:31.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-CASA, 1.7.1461, http://www.suse.de/feedback, yast2-CASA)
+AC_INIT(yast2-CASA, 1.7.1535, http://www.suse.de/feedback, yast2-CASA)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="1.7.1461"
+VERSION="1.7.1535"
RPMNAME="yast2-CASA"
MAINTAINER="casa "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/src/CASA.desktop new/yast2-CASA-1.7.1535/src/CASA.desktop
--- old/yast2-CASA-1.7.1461/src/CASA.desktop 2007-03-28 16:16:32.000000000 +0200
+++ new/yast2-CASA-1.7.1535/src/CASA.desktop 2008-06-02 18:50:14.000000000 +0200
@@ -16,7 +16,7 @@
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=CASA
-Icon=CASA
+Icon=yast-casa
Exec=/sbin/yast2 CASA
Name=CASA
Files old/yast2-CASA-1.7.1461/src/icons/CASA_22.png and new/yast2-CASA-1.7.1535/src/icons/CASA_22.png differ
Files old/yast2-CASA-1.7.1461/src/icons/CASA_32.png and new/yast2-CASA-1.7.1535/src/icons/CASA_32.png differ
Files old/yast2-CASA-1.7.1461/src/icons/CASA_48.png and new/yast2-CASA-1.7.1535/src/icons/CASA_48.png differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/src/icons/install_casa_yast_icons new/yast2-CASA-1.7.1535/src/icons/install_casa_yast_icons
--- old/yast2-CASA-1.7.1461/src/icons/install_casa_yast_icons 2007-03-28 16:16:32.000000000 +0200
+++ new/yast2-CASA-1.7.1535/src/icons/install_casa_yast_icons 1970-01-01 01:00:00.000000000 +0100
@@ -1,449 +0,0 @@
-#! /bin/bash
-#------------------------------------------------------------------------------
-#
-# install_yast_icons
-#
-#------------------------------------------------------------------------------
-# Comments to:
-# support@novell.com
-#------------------------------------------------------------------------------
-#
-# Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; version 2.1
-# of the License.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Library Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail,
-# you may find current contact information at www.novell.com.
-#
-#
-#------------------------------------------------------------------------------
-#
-# START_DIR = pwd - the current working directory
-# this is the directory where this script is executed from
-#
-#------------------------------------------------------------------------------
-
-VERSION=1.6
-SCRIPT_NAME='install_casa_yast_icons'
-START_DIR=`pwd`
-DATE=`date`
-SOURCE22_ICON=CASA_22.png
-SOURCE32_ICON=CASA_32.png
-SOURCE48_ICON=CASA_48.png
-DEST_ICON=CASA.png
-
-determineIfSourceExists ()
-{
- if [ ! -e $ICON_SOURCE/$SOURCE22_ICON ]
- then
- echo ""
- echo "[$SCRIPT_NAME] ERROR: The icon source file:"
- echo "[$SCRIPT_NAME] $ICON_SOURCE/$DIR_22/$ICON_FILE"
- echo "[$SCRIPT_NAME] was not found."
- echo ""
-# echo "ERROR: Icon source file not found: $ICON_SOURCE/$DIR_22/$ICON_FILE" 1>>$LOG_DIR_FILE
- exit 3
- fi
-
- if [ ! -e $ICON_SOURCE/$SOURCE32_ICON ]
- then
- echo ""
- echo "[$SCRIPT_NAME] ERROR: The icon source file:"
- echo "[$SCRIPT_NAME] $ICON_SOURCE/$DIR_32/$ICON_FILE"
- echo "[$SCRIPT_NAME] was not found."
- echo ""
-# echo "ERROR: Icon source file not found: $ICON_SOURCE/$DIR_32/$ICON_FILE" 1>>$LOG_DIR_FILE
- exit 3
- fi
-
- if [ ! -e $ICON_SOURCE/$SOURCE48_ICON ]
- then
- echo ""
- echo "[$SCRIPT_NAME] ERROR: The icon source file:"
- echo "[$SCRIPT_NAME] $ICON_SOURCE/$DIR_48/$ICON_FILE"
- echo "[$SCRIPT_NAME] was not found."
- echo ""
-# echo "ERROR: Icon source file not found: $ICON_SOURCE/$DIR_48/$ICON_FILE" 1>>$LOG_DIR_FILE
- exit 3
- fi
-}
-
-determineIfCopyDeleteRequired ()
-{
- for YAST_THEME_DIR in $YAST_THEME_DIRS
- do
- if [ ! -h $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR ]
- then
- if [ -d $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR ]
- then
- if [ -e $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR/$ICON_FILE ]
- then
- DELETE_ICONS="yes"
- else
- COPY_ICONS="yes"
- fi
-
- if [ -e $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR/$ICON_FILE ]
- then
- DELETE_ICONS="yes"
- else
- COPY_ICONS="yes"
- fi
-
- if [ -e $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR/$ICON_FILE ]
- then
- DELETE_ICONS="yes"
- else
- COPY_ICONS="yes"
- fi
- fi
- fi
- done
-}
-
-
-copyDeleteIcons ()
-{
- for YAST_THEME_DIR in $YAST_THEME_DIRS
- do
- if [ -z "$LAUNCHER" ]
- then
- echo ""
- fi
- if [ -h $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR ]
- then
- if [ -z "$LAUNCHER" ]
- then
- echo "[$SCRIPT_NAME] skip $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR because it is a link"
- fi
-# echo "skip $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR because it is a link" 1>>$LOG_DIR_FILE
- else
- if [ -d $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR ]
- then
- if [ -z "$LAUNCHER" ]
- then
- echo "[$SCRIPT_NAME] processing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR"
- fi
-# echo "processing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR" 1>>$LOG_DIR_FILE
-
- if [ "$MODE" = "install" ]
- then
- echo "[$SCRIPT_NAME] installing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR/$ICON_FILE"
-# echo "installing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR/$ICON_FILE" 1>>$LOG_DIR_FILE
- if [ ! -d $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR ]
- then
- mkdir -p $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR
- fi
- cp -r $ICON_SOURCE/$SOURCE22_ICON $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR/$DEST_ICON
- else
- echo "[$SCRIPT_NAME] uninstalling $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR/$ICON_FILE"
-# echo "uninstalling $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR/$ICON_FILE" 1>>$LOG_DIR_FILE
- rm -f $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_22/$APPS_DIR/$DEST_ICON
- fi
-
- if [ "$MODE" = "install" ]
- then
- echo "[$SCRIPT_NAME] installing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR/$ICON_FILE"
-# echo "installing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR/$ICON_FILE" 1>>$LOG_DIR_FILE
- if [ ! -d $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR ]
- then
- mkdir -p $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR
- fi
- cp -r $ICON_SOURCE/$SOURCE32_ICON $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR/$DEST_ICON
- else
- echo "[$SCRIPT_NAME] uninstalling $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR/$ICON_FILE"
-# echo "uninstalling $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR/$ICON_FILE" 1>>$LOG_DIR_FILE
- rm -f $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_32/$APPS_DIR/$DEST_ICON
- fi
-
- if [ "$MODE" = "install" ]
- then
- echo "[$SCRIPT_NAME] installing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR/$ICON_FILE"
-# echo "installing $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR/$ICON_FILE" 1>>$LOG_DIR_FILE
- if [ ! -d $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR ]
- then
- mkdir -p $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR
- fi
- cp -r $ICON_SOURCE/$SOURCE48_ICON $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR/$DEST_ICON
- else
- echo "[$SCRIPT_NAME] uninstalling $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR/$ICON_FILE"
-# echo "uninstalling $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR/$ICON_FILE" 1>>$LOG_DIR_FILE
- rm -f $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR/$ICONS_DIR/$DIR_48/$APPS_DIR/$DEST_ICON
- fi
- else
- if [ -z "$LAUNCHER" ]
- then
- echo "[$SCRIPT_NAME] skip $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR because it is not a directory"
- fi
-# echo "skip $YAST_THEME_DIR_PREFIX/$YAST_THEME_DIR because it is not a directory" 1>>$LOG_DIR_FILE
- fi
- fi
- done
-}
-
-
-#----------------------------------------------------------------------------
-# the MAIN routine
-#---------------------------------------------------------------------------
-
-COPY_ICONS="no"
-DELETE_ICONS="no"
-YAST_THEME_DIR_PREFIX="/usr/share/YaST2/theme"
-YAST_THEME_DIRS=`ls $YAST_THEME_DIR_PREFIX`
-#LOG_DIR="/var/opt/novell/log/ncl"
-#LOG_FILE="install_yast_icons.log"
-#LOG_DIR_FILE="$LOG_DIR/$LOG_FILE"
-DIR_22=22x22
-DIR_32=32x32
-DIR_48=48x48
-ICON_SOURCE="/usr/share/pixmaps"
-APPS_DIR="apps"
-ICONS_DIR="icons"
-ICON_FILE="CASA.png"
-
-if [ -z "$1" ]
-then
- MODE="install"
-else
- MODE=$1
- if [ -z "$2" ]
- then
- LAUNCHER=""
- else
- LAUNCHER=$2
- fi
-fi
-
-echo ""
-echo "[$SCRIPT_NAME] $SCRIPT_NAME v$VERSION"
-
-#if [ ! -d $LOG_DIR ]
-#then
-# mkdir -p $LOG_DIR
-#fi
-#echo "" 1>>$LOG_DIR_FILE
-#echo "$SCRIPT_NAME v$VERSION - $DATE" 1>>$LOG_DIR_FILE
-#echo "mode = <$MODE>" 1>>$LOG_DIR_FILE
-#echo "launcher = <$LAUNCHER>" 1>>$LOG_DIR_FILE
-
-# verify that a valid mode was entered
-case "$MODE" in
- "install" | "uninstall" )
-# echo "<$MODE> is a valid mode" 1>>$LOG_DIR_FILE
- ;;
-
- "usage" | "help" | "-?" )
- echo ""
- echo "[$SCRIPT_NAME] usage: $SCRIPT_NAME [ install | uninstall | usage | help | -? ]"
- echo ""
-# echo "usage: $SCRIPT_NAME [ install | uninstall | usage | help | -? ]" 1>>$LOG_DIR_FILE
- exit 1
- ;;
-
- * )
- echo ""
- echo "[$SCRIPT_NAME] invalid mode: <$MODE>"
- echo "[$SCRIPT_NAME] usage: $SCRIPT_NAME [ install | uninstall | usage | help | -? ]"
- echo ""
-# echo "invalid mode: <$MODE>" 1>>$LOG_DIR_FILE
- exit 1
- ;;
-esac
-
-
-# verify that a valid launcher was entered
-case "$LAUNCHER" in
- "YaST" | "rpm" )
-# echo "<$LAUNCHER> is a valid launcher" 1>>$LOG_DIR_FILE
- ;;
-
- * )
- if [ -n "$2" ]
- then
- echo ""
- echo "[$SCRIPT_NAME] invalid option: <$LAUNCHER>"
- echo "[$SCRIPT_NAME] usage: $SCRIPT_NAME [ install | uninstall | usage | help | -? ]"
- echo ""
-# echo "invalid launcher: <$LAUNCHER>" 1>>$LOG_DIR_FILE
- exit 1
- fi
- ;;
-esac
-
-
-# validate that the user running the script is root
-ROOT_UID=0
-#echo "User id = <$UID>" 1>>$LOG_DIR_FILE
-if [ "$UID" -ne "$ROOT_UID" ]
-then
- echo ""
- echo "[$SCRIPT_NAME] ERROR: You are not the root user."
- echo "[$SCRIPT_NAME] To install or uninstall the Novell Client for Linux"
- echo "[$SCRIPT_NAME] YaST icons you must login as the root user."
- echo ""
-# echo "ERROR: You are not the root user." 1>>$LOG_DIR_FILE
- exit 2
-fi
-
-# verifty that the icons can be installed
-if [ "$MODE" = "install" ]
-then
- determineIfSourceExists
-fi
-
-# verify that the icons need to be installed or uninstalled
-if [ -z "$LAUNCHER" ]
-then
- echo ""
- echo "[$SCRIPT_NAME] Determining if the Novell Client for Linux"
- if [ "$MODE" = "install" ]
- then
- echo "[$SCRIPT_NAME] YaST icons need to be installed."
- else
- echo "[$SCRIPT_NAME] YaST icons need to be uninstalled."
- fi
- echo "[$SCRIPT_NAME] Please wait..."
-fi
-
-if [ "$MODE" = "install" ]
-then
- if [ "$LAUNCHER" = "YaST" ]
- then
- determineIfCopyDeleteRequired
- else
- COPY_ICONS="yes"
- fi
-else
- determineIfCopyDeleteRequired
-fi
-
-
-# install or uninstall the icons
-if [ "$MODE" = "install" ]
-then
- if [ "$COPY_ICONS" = "yes" ]
- then
- if [ -n "$LAUNCHER" ]
- then
- CONTINUE="y"
- else
- echo ""
- echo "[$SCRIPT_NAME] This script installs the Novell Client for Linux"
- echo "[$SCRIPT_NAME] YaST icons in all of the YaST theme directories."
- echo ""
- echo "[$SCRIPT_NAME] Are you sure you want to install the YaST icons? (y/n)"
- read CONTINUE
- fi
- else
- echo ""
- echo "[$SCRIPT_NAME] The Novell Client for Linux YaST icons are already installed"
- echo ""
-# echo "The Novell Client for Linux YaST icons are already installed" 1>>$LOG_DIR_FILE
- exit
- fi
-else
- if [ "$DELETE_ICONS" = "yes" ]
- then
- if [ -n "$LAUNCHER" ]
- then
- CONTINUE="y"
- else
- echo ""
- echo "[$SCRIPT_NAME] This script uninstalls the Novell Client for Linux"
- echo "[$SCRIPT_NAME] YaST icons in all of the YaST theme directories."
- echo ""
- echo "[$SCRIPT_NAME] Are you sure you want to uninstall the YaST icons? (y/n)"
- read CONTINUE
- fi
- else
- echo ""
- echo "[$SCRIPT_NAME] The Novell Client for Linux YaST icons are already uninstalled"
- echo ""
-# echo "The Novell Client for Linux YaST icons are already uninstalled" 1>>$LOG_DIR_FILE
- exit
- fi
-fi
-
-if [ "$CONTINUE" = "y" ]
-then
- if [ "$MODE" = "install" ]
- then
- if [ -z "$LAUNCHER" ]
- then
- echo ""
- echo "[$SCRIPT_NAME] Installing Novell Client for Linux YaST icons"
- echo "[$SCRIPT_NAME] Please wait..."
- fi
-
- copyDeleteIcons
-
- if [ -z "$LAUNCHER" ]
- then
- echo ""
- echo "[$SCRIPT_NAME] Installation of the Novell Client for Linux"
- echo "[$SCRIPT_NAME] YaST icons completed"
- echo ""
- fi
-
-# echo "Installation of the Novell Client for Linux YaST icons completed" 1>>$LOG_DIR_FILE
- exit
- else
- if [ -z "$LAUNCHER" ]
- then
- echo ""
- echo "[$SCRIPT_NAME] Uninstalling Novell Client for Linux YaST icons"
- echo "[$SCRIPT_NAME] Please wait..."
- fi
-
- copyDeleteIcons
-
- if [ -z "$LAUNCHER" ]
- then
- echo ""
- echo "[$SCRIPT_NAME] Uninstallation of the Novell Client for Linux"
- echo "[$SCRIPT_NAME] YaST icons completed"
- echo ""
- fi
-
-# echo "Uninstallation of the Novell Client for Linux YaST icons completed" 1>>$LOG_DIR_FILE
- exit
- fi
-else
- if [ "$MODE" = "install" ]
- then
- if [ -z "$LAUNCHER" ]
- then
- echo ""
- echo "[$SCRIPT_NAME] Installation of the Novell Client for Linux"
- echo "[$SCRIPT_NAME] YaST icons cancelled"
- echo ""
- fi
-
-# echo "Installation of the Novell Client for Linux YaST icons cancelled" 1>>$LOG_DIR_FILE
- exit
- else
- if [ -z "$LAUNCHER" ]
- then
- echo ""
- echo "[$SCRIPT_NAME] Uninstallation of the Novell Client for Linux"
- echo "[$SCRIPT_NAME] YaST icons cancelled"
- echo ""
- fi
-
-# echo "Uninstallation of the Novell Client for Linux YaST icons cancelled" 1>>$LOG_DIR_FILE
- exit
- fi
-fi
-exit
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/src/Makefile.am new/yast2-CASA-1.7.1535/src/Makefile.am
--- old/yast2-CASA-1.7.1461/src/Makefile.am 2007-03-28 16:16:32.000000000 +0200
+++ new/yast2-CASA-1.7.1535/src/Makefile.am 2008-06-02 18:50:14.000000000 +0200
@@ -1,8 +1,8 @@
# Makefile.am for CASA/src
yncludedir = @yncludedir@/CASA
-iconsdir = /usr/share/applications
-themedir = /usr/share/pixmaps
+#iconsdir = /usr/share/applications
+#themedir = /usr/share/pixmaps
client_DATA = \
@@ -22,14 +22,15 @@
module_DATA = \
NovellCasa.ycp
-icons_DATA = \
- icons/install_casa_yast_icons
+#icons_DATA = \
+# icons/install_casa_yast_icons
-theme_DATA = \
- icons/CASA_22.png \
- icons/CASA_32.png \
- icons/CASA_48.png
+#theme_DATA = \
+# icons/CASA_22.png \
+# icons/CASA_32.png \
+# icons/CASA_48.png
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA)
+#EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA)
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
include $(top_srcdir)/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/src/Makefile.in new/yast2-CASA-1.7.1535/src/Makefile.in
--- old/yast2-CASA-1.7.1461/src/Makefile.in 2007-09-10 23:56:48.000000000 +0200
+++ new/yast2-CASA-1.7.1535/src/Makefile.in 2008-06-02 22:30:35.000000000 +0200
@@ -60,18 +60,15 @@
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \
- "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(moduledir)" \
- "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(themedir)" \
+ "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \
"$(DESTDIR)$(yncludedir)"
clientDATA_INSTALL = $(INSTALL_DATA)
desktopDATA_INSTALL = $(INSTALL_DATA)
-iconsDATA_INSTALL = $(INSTALL_DATA)
moduleDATA_INSTALL = $(INSTALL_DATA)
modulebinDATA_INSTALL = $(INSTALL_DATA)
-themeDATA_INSTALL = $(INSTALL_DATA)
yncludeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(client_DATA) $(desktop_DATA) $(icons_DATA) $(module_DATA) \
- $(modulebin_DATA) $(theme_DATA) $(ynclude_DATA)
+DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \
+ $(ynclude_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -170,13 +167,14 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-themedir = /usr/share/pixmaps
+themedir = @themedir@
yast2dir = @yast2dir@
ybindir = @ybindir@
ydatadir = @ydatadir@
yncludedir = @yncludedir@/CASA
ystartupdir = @ystartupdir@
-iconsdir = /usr/share/applications
+#iconsdir = /usr/share/applications
+#themedir = /usr/share/pixmaps
client_DATA = \
CASA.ycp \
CASA_auto.ycp \
@@ -194,15 +192,17 @@
module_DATA = \
NovellCasa.ycp
-icons_DATA = \
- icons/install_casa_yast_icons
-theme_DATA = \
- icons/CASA_22.png \
- icons/CASA_32.png \
- icons/CASA_48.png
+#icons_DATA = \
+# icons/install_casa_yast_icons
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA)
+#theme_DATA = \
+# icons/CASA_22.png \
+# icons/CASA_32.png \
+# icons/CASA_48.png
+
+#EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(icons_DATA) $(theme_DATA)
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
modulebindir = $(moduledir)
ybcfiles = $(filter %.ybc,$(modulebin_DATA))
@@ -282,23 +282,6 @@
echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
done
-install-iconsDATA: $(icons_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
- @list='$(icons_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
- $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
- done
-
-uninstall-iconsDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(icons_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
- done
install-moduleDATA: $(module_DATA)
@$(NORMAL_INSTALL)
test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
@@ -333,23 +316,6 @@
echo " rm -f '$(DESTDIR)$(modulebindir)/$$f'"; \
rm -f "$(DESTDIR)$(modulebindir)/$$f"; \
done
-install-themeDATA: $(theme_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(themedir)" || $(mkdir_p) "$(DESTDIR)$(themedir)"
- @list='$(theme_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(themeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedir)/$$f'"; \
- $(themeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedir)/$$f"; \
- done
-
-uninstall-themeDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(theme_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(themedir)/$$f'"; \
- rm -f "$(DESTDIR)$(themedir)/$$f"; \
- done
install-yncludeDATA: $(ynclude_DATA)
@$(NORMAL_INSTALL)
test -z "$(yncludedir)" || $(mkdir_p) "$(DESTDIR)$(yncludedir)"
@@ -375,7 +341,7 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/.. $(distdir)/icons
+ $(mkdir_p) $(distdir)/..
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -409,7 +375,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(themedir)" "$(DESTDIR)$(yncludedir)"; do \
+ for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -457,8 +423,7 @@
info-am:
install-data-am: install-clientDATA install-desktopDATA \
- install-iconsDATA install-moduleDATA install-modulebinDATA \
- install-themeDATA install-yncludeDATA
+ install-moduleDATA install-modulebinDATA install-yncludeDATA
install-exec-am:
@@ -485,23 +450,21 @@
ps-am:
uninstall-am: uninstall-clientDATA uninstall-desktopDATA \
- uninstall-iconsDATA uninstall-info-am uninstall-moduleDATA \
- uninstall-modulebinDATA uninstall-themeDATA \
+ uninstall-info-am uninstall-moduleDATA uninstall-modulebinDATA \
uninstall-yncludeDATA
.PHONY: all all-am check check-am clean clean-generic dist-hook \
distclean distclean-generic distdir dvi dvi-am html html-am \
info info-am install install-am install-clientDATA \
install-data install-data-am install-desktopDATA install-exec \
- install-exec-am install-iconsDATA install-info install-info-am \
- install-man install-moduleDATA install-modulebinDATA \
- install-strip install-themeDATA install-yncludeDATA \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-clientDATA \
- uninstall-desktopDATA uninstall-iconsDATA uninstall-info-am \
+ install-exec-am install-info install-info-am install-man \
+ install-moduleDATA install-modulebinDATA install-strip \
+ install-yncludeDATA installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-clientDATA uninstall-desktopDATA uninstall-info-am \
uninstall-moduleDATA uninstall-modulebinDATA \
- uninstall-themeDATA uninstall-yncludeDATA
+ uninstall-yncludeDATA
# suffix mapping: info '(make)Static Usage'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.7.1461/VERSION new/yast2-CASA-1.7.1535/VERSION
--- old/yast2-CASA-1.7.1461/VERSION 2007-09-10 23:56:37.000000000 +0200
+++ new/yast2-CASA-1.7.1535/VERSION 2008-06-02 22:30:31.000000000 +0200
@@ -1 +1 @@
-1.7.1461
+1.7.1535
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org