openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
December 2006
- 1 participants
- 554 discussions
Hello community,
here is the log from the commit of package bbtools
checked in at Thu Dec 14 02:42:48 CET 2006.
--------
--- bbtools/bbtools.changes 2006-05-26 12:54:19.000000000 +0200
+++ /mounts/work_users/ro/STABLE/bbtools/bbtools.changes 2006-12-14 02:32:21.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Dec 14 02:32:13 CET 2006 - ro(a)suse.de
+
+- move from usr/X11R6 to usr
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bbtools.spec ++++++
--- /var/tmp/diff_new_pack.oanQZ5/_old 2006-12-14 02:42:39.000000000 +0100
+++ /var/tmp/diff_new_pack.oanQZ5/_new 2006-12-14 02:42:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package bbtools (Version 2006.5.26)
+# spec file for package bbtools (Version 2006.12.14)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,11 +12,11 @@
Name: bbtools
BuildRequires: blackbox blackbox-devel freetype2-devel gcc-c++ pkgconfig xorg-x11-devel
-License: GPL
+License: GNU General Public License (GPL)
Group: System/GUI/Other
Autoreqprov: on
Requires: blackbox
-Version: 2006.5.26
+Version: 2006.12.14
Release: 1
Summary: Tools for the Blackbox Window Manager
URL: http://bbtools.sourceforge.net/
@@ -107,8 +107,8 @@
./configure \
--prefix=/usr \
--libdir=%_libdir \
- --exec-prefix=/usr/X11R6 \
- --x-libraries=/usr/X11R6/%_lib \
+ --exec-prefix=/usr \
+ --x-libraries=/usr/%_lib \
--mandir=%{_mandir} \
--infodir=%{_infodir}
make
@@ -140,11 +140,13 @@
%doc doc/*
%doc %_mandir/man*/*
%docdir %_mandir/*
-/usr/X11R6/bin/*
+/usr/bin/*
/usr/share/bbtools
/usr/share/bbkeys
%changelog -n bbtools
+* Thu Dec 14 2006 - ro(a)suse.de
+- move from usr/X11R6 to usr
* Fri May 26 2006 - schwab(a)suse.de
- Don't strip binaries.
* Wed Jan 25 2006 - mls(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-tune
checked in at Thu Dec 14 02:08:51 CET 2006.
--------
--- yast2-tune/yast2-tune.changes 2006-11-13 13:58:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-tune/yast2-tune.changes 2006-12-13 16:51:45.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Dec 13 15:27:51 CET 2006 - lslezak(a)suse.cz
+
+- append /dev name to device name (#164823)
+- translate more keys
+- display better progress popup when probing devices
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-tune-2.14.0.tar.bz2
New:
----
yast2-tune-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-tune.spec ++++++
--- /var/tmp/diff_new_pack.mam2BN/_old 2006-12-14 02:07:44.000000000 +0100
+++ /var/tmp/diff_new_pack.mam2BN/_new 2006-12-14 02:07:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-tune (Version 2.14.0)
+# spec file for package yast2-tune (Version 2.15.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-tune
-Version: 2.14.0
+Version: 2.15.0
Release: 1
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-tune-2.14.0.tar.bz2
+Source0: yast2-tune-2.15.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite
Requires: yast2 hdparm yast2-bootloader
@@ -32,7 +32,7 @@
%prep
-%setup -n yast2-tune-2.14.0
+%setup -n yast2-tune-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,11 @@
%doc %{prefix}/share/doc/packages/yast2-tune
%changelog -n yast2-tune
+* Wed Dec 13 2006 - lslezak(a)suse.cz
+- append /dev name to device name (#164823)
+- translate more keys
+- display better progress popup when probing devices
+- 2.15.0
* Mon Nov 13 2006 - lslezak(a)suse.cz
- 2.14.0
* Fri Oct 20 2006 - lslezak(a)suse.cz
++++++ yast2-tune-2.14.0.tar.bz2 -> yast2-tune-2.15.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/Makefile.am new/yast2-tune-2.15.0/Makefile.am
--- old/yast2-tune-2.14.0/Makefile.am 2006-11-13 13:54:51.000000000 +0100
+++ new/yast2-tune-2.15.0/Makefile.am 2006-12-13 16:48:28.000000000 +0100
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/Makefile.in new/yast2-tune-2.15.0/Makefile.in
--- old/yast2-tune-2.14.0/Makefile.in 2006-11-13 13:55:00.000000000 +0100
+++ new/yast2-tune-2.15.0/Makefile.in 2006-12-13 16:48:36.000000000 +0100
@@ -137,6 +137,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
@@ -203,15 +204,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
@@ -222,7 +222,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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/VERSION new/yast2-tune-2.15.0/VERSION
--- old/yast2-tune-2.14.0/VERSION 2006-11-13 13:53:54.000000000 +0100
+++ new/yast2-tune-2.15.0/VERSION 2006-12-13 16:46:54.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/configure new/yast2-tune-2.15.0/configure
--- old/yast2-tune-2.14.0/configure 2006-11-13 13:54:56.000000000 +0100
+++ new/yast2-tune-2.15.0/configure 2006-12-13 16:48:32.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-tune 2.14.0.
+# Generated by GNU Autoconf 2.60 for yast2-tune 2.15.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-tune'
PACKAGE_TARNAME='yast2-tune'
-PACKAGE_VERSION='2.14.0'
-PACKAGE_STRING='yast2-tune 2.14.0'
+PACKAGE_VERSION='2.15.0'
+PACKAGE_STRING='yast2-tune 2.15.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -661,6 +661,7 @@
LN_S
PKG_CONFIG_PATH
XGETTEXT
+Y2DEVTOOLS_PREFIX
CREATE_PKGCONFIG_TRUE
CREATE_PKGCONFIG_FALSE
CREATE_PKGCONFIG_NOARCH_TRUE
@@ -1182,7 +1183,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-tune 2.14.0 to adapt to many kinds of systems.
+\`configure' configures yast2-tune 2.15.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1253,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-tune 2.14.0:";;
+ short | recursive ) echo "Configuration of yast2-tune 2.15.0:";;
esac
cat <<\_ACEOF
@@ -1331,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-tune configure 2.14.0
+yast2-tune configure 2.15.0
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1345,7 +1346,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-tune $as_me 2.14.0, which was
+It was created by yast2-tune $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2146,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2-tune'
- VERSION='2.14.0'
+ VERSION='2.15.0'
cat >>confdefs.h <<_ACEOF
@@ -2373,7 +2374,7 @@
-VERSION="2.14.0"
+VERSION="2.15.0"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -2631,6 +2632,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`
@@ -2809,6 +2812,34 @@
echo "$as_me: error: ycpc is not installed" >&2;}
{ (exit 1); exit 1; }; }
fi
+as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
+echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+
+ { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5
+echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;}
+
+fi
+
ac_config_files="$ac_config_files Makefile hwinfo/doc/autodocs/Makefile hwinfo/doc/Makefile hwinfo/src/Makefile hwinfo/scrconf/Makefile hwinfo/Makefile idedma/doc/autodocs/Makefile idedma/doc/Makefile idedma/src/Makefile idedma/testsuite/Makefile idedma/scrconf/Makefile idedma/Makefile"
@@ -3247,7 +3278,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-tune $as_me 2.14.0, which was
+This file was extended by yast2-tune $as_me 2.15.0, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3290,7 +3321,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-tune config.status 2.14.0
+yast2-tune config.status 2.15.0
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -3557,7 +3588,7 @@
LN_S!$LN_S$ac_delim
PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
-CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim
+Y2DEVTOOLS_PREFIX!$Y2DEVTOOLS_PREFIX$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -3599,6 +3630,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim
CREATE_PKGCONFIG_FALSE!$CREATE_PKGCONFIG_FALSE$ac_delim
CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim
CREATE_PKGCONFIG_NOARCH_FALSE!$CREATE_PKGCONFIG_NOARCH_FALSE$ac_delim
@@ -3614,7 +3646,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/configure.in new/yast2-tune-2.15.0/configure.in
--- old/yast2-tune-2.14.0/configure.in 2006-11-13 13:54:51.000000000 +0100
+++ new/yast2-tune-2.15.0/configure.in 2006-12-13 16:48:27.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-tune
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-tune, 2.14.0, http://bugs.opensuse.org/, yast2-tune)
+AC_INIT(yast2-tune, 2.15.0, http://bugs.opensuse.org/, yast2-tune)
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="2.14.0"
+VERSION="2.15.0"
RPMNAME="yast2-tune"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -112,6 +112,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`
@@ -144,6 +146,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile hwinfo/doc/autodocs/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/Makefile.in new/yast2-tune-2.15.0/hwinfo/Makefile.in
--- old/yast2-tune-2.14.0/hwinfo/Makefile.in 2006-11-13 13:54:57.000000000 +0100
+++ new/yast2-tune-2.15.0/hwinfo/Makefile.in 2006-12-13 16:48:34.000000000 +0100
@@ -105,6 +105,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/doc/Makefile.in new/yast2-tune-2.15.0/hwinfo/doc/Makefile.in
--- old/yast2-tune-2.14.0/hwinfo/doc/Makefile.in 2006-11-13 13:54:57.000000000 +0100
+++ new/yast2-tune-2.15.0/hwinfo/doc/Makefile.in 2006-12-13 16:48:34.000000000 +0100
@@ -106,6 +106,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/doc/autodocs/Makefile.in new/yast2-tune-2.15.0/hwinfo/doc/autodocs/Makefile.in
--- old/yast2-tune-2.14.0/hwinfo/doc/autodocs/Makefile.in 2006-11-13 13:54:57.000000000 +0100
+++ new/yast2-tune-2.15.0/hwinfo/doc/autodocs/Makefile.in 2006-12-13 16:48:34.000000000 +0100
@@ -105,6 +105,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/scrconf/Makefile.in new/yast2-tune-2.15.0/hwinfo/scrconf/Makefile.in
--- old/yast2-tune-2.14.0/hwinfo/scrconf/Makefile.in 2006-11-13 13:54:58.000000000 +0100
+++ new/yast2-tune-2.15.0/hwinfo/scrconf/Makefile.in 2006-12-13 16:48:34.000000000 +0100
@@ -107,6 +107,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/src/Makefile.in new/yast2-tune-2.15.0/hwinfo/src/Makefile.in
--- old/yast2-tune-2.14.0/hwinfo/src/Makefile.in 2006-11-13 13:54:58.000000000 +0100
+++ new/yast2-tune-2.15.0/hwinfo/src/Makefile.in 2006-12-13 16:48:34.000000000 +0100
@@ -118,6 +118,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/src/hwinfo.ycp new/yast2-tune-2.15.0/hwinfo/src/hwinfo.ycp
--- old/yast2-tune-2.14.0/hwinfo/src/hwinfo.ycp 2006-09-21 15:48:33.000000000 +0200
+++ new/yast2-tune-2.15.0/hwinfo/src/hwinfo.ycp 2006-12-13 16:48:17.000000000 +0100
@@ -6,7 +6,7 @@
* Ladislav Slezak <lslezak(a)suse.cz>
* Michal Svec <msvec(a)suse.cz>
*
- * $Id: hwinfo.ycp 24252 2005-07-22 10:06:54Z lslezak $
+ * $Id: hwinfo.ycp 34944 2006-12-13 15:48:12Z lslezak $
*/
{
@@ -15,6 +15,7 @@
import "Wizard";
import "Label";
import "Arch";
+import "Directory";
//include "hwinfo/classnames.ycp";
include "hwinfo/routines.ycp";
@@ -24,6 +25,20 @@
*/
boolean abortPressed = false;
+term Icon (string icon_name) {
+ map ui_info = UI::GetDisplayInfo();
+ if ((boolean) ui_info["HasLocalImageSupport"]:false == false) return `Empty();
+
+ return `Image (
+ sformat (
+ "%1/current/icons/22x22/apps/%2.png",
+ Directory::themedir,
+ icon_name
+ ),
+ "[x]"
+ );
+}
+
/*
* open progress bar window
*/
@@ -32,10 +47,10 @@
`VSpacing(7),
`VBox(
`HSpacing(40),
- // popup dialog header
- `Label(_("Probing")),
`HBox(
- `HWeight(1, `Label(`id(`initLab), ""))
+ `HSquash (`MarginBox (0.5, 0.2, Icon("yast-hwinfo"))),
+ // translators: popup heading
+ `Left (`Heading(`id(`heading), _("Probing Hardware...")))
),
// progress bar label
`ProgressBar(`id(`initProg), _("Progress"), 1000, 0),
@@ -142,7 +157,7 @@
string node = afterLast(p);
string node_translated = trans_str(node);
- UI::ChangeWidget(`id(`initLab), `Value, node_translated);
+ UI::ChangeWidget(`id(`initProg), `Label, node_translated);
y2milestone("Probing %1 (%2)...", node, node_translated);
path pat = topath(p);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/hwinfo/src/routines.ycp new/yast2-tune-2.15.0/hwinfo/src/routines.ycp
--- old/yast2-tune-2.14.0/hwinfo/src/routines.ycp 2006-10-12 10:32:54.000000000 +0200
+++ new/yast2-tune-2.15.0/hwinfo/src/routines.ycp 2006-12-13 16:48:17.000000000 +0100
@@ -2,7 +2,7 @@
* File: routines.ycp
*
* Author: Ladislav Slezak <lslezak(a)suse.cz>
- * $Id: routines.ycp 33338 2006-10-12 08:32:52Z lslezak $
+ * $Id: routines.ycp 34944 2006-12-13 15:48:12Z lslezak $
*
* Functions used in hwinfo and in init_hwinfo modules.
*/
@@ -72,6 +72,66 @@
// tree node string - location of hardware in the machine
"slot_id" : _("Slot ID"),
// tree node string
+ "length" : _("Length"),
+ // tree node string
+ "width" : _("Width"),
+ // tree node string
+ "height" : _("Height"),
+ // tree node string
+ "active" : _("Active"),
+ // tree node string
+ "dev_names" : _("Device Names"),
+ // tree node string (number of colors)
+ "color" : _("Colors"),
+ // tree node string (harddisk parameter)
+ "disk_log_geo" : _("Logical Geometry"),
+ // tree node string
+ "count" : _("Count"),
+ // tree node string
+ "mode" : _("Mode"),
+ // tree node string (interrupt request)
+ "irq" : _("IRQ"),
+ // tree node string
+ "io" : _("IO Port"),
+ // tree node string
+ "mem" : _("Memory"),
+ // tree node string (direct memory access)
+ "dma" : _("DMA"),
+ // tree node string
+ "bus_hwcfg" : _("Hwcfg Bus"),
+ // tree node string
+ "sysfs_bus_id" : _("Sysfs ID"),
+ // tree node string
+ "parent_unique_key" : _("Parent Unique ID"),
+ // tree node string
+ "udi" : _("UDI"),
+ // tree node string
+ "uniqueid" : _("Unique ID"),
+ // tree node string (monitor parameter)
+ "vfreq" : _("Vertical Frequency"),
+ // tree node string (monitor parameter)
+ "max_hsync" : _("Max. Horizontal Frequency"),
+ // tree node string (monitor parameter)
+ "max_vsync" : _("Max. Vertical Frequency"),
+ // tree node string (monitor parameter)
+ "min_hsync" : _("Min. Horizontal Frequency"),
+ // tree node string (monitor parameter)
+ "min_vsync" : _("Min. Vertical Frequency"),
+ // tree node string
+ "dvd" : _("DVD"),
+ // tree node string
+ "driver_module" : _("Kernel Driver"),
+ // tree node string
+ "hwaddr" : _("HW Address"),
+ // tree node string
+ "bios_id" : _("BIOS ID"),
+ // tree node string
+ "enabled" : _("Enabled"),
+ // tree node string (monitor resolution e.g. 1280x1024)
+ "monitor_resol" : _("Resolution"),
+ // tree node string
+ "size" : _("Size"),
+ // tree node string
"old_unique_key" : _("Old Unique Key"),
// tree node string
"sub_class_id" : _("Class (spec)"),
@@ -434,6 +494,20 @@
{
out = classtostring("dummy", m);
}
+ else if (key_name == "device")
+ {
+ out = m[key_name]:"";
+ if (haskey(m, "dev_name"))
+ {
+ string device = m["dev_name"]:"";
+
+ if (device != "")
+ {
+ // tree node string - %1 is device name, %2 is /dev file
+ out = sformat(_("%1 (%2)"), out, device);
+ }
+ }
+ }
else
{
out = trans_str(sformat("%1", m[key_name]:nil));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/Makefile.in new/yast2-tune-2.15.0/idedma/Makefile.in
--- old/yast2-tune-2.14.0/idedma/Makefile.in 2006-11-13 13:54:58.000000000 +0100
+++ new/yast2-tune-2.15.0/idedma/Makefile.in 2006-12-13 16:48:35.000000000 +0100
@@ -106,6 +106,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/doc/Makefile.in new/yast2-tune-2.15.0/idedma/doc/Makefile.in
--- old/yast2-tune-2.14.0/idedma/doc/Makefile.in 2006-11-13 13:54:58.000000000 +0100
+++ new/yast2-tune-2.15.0/idedma/doc/Makefile.in 2006-12-13 16:48:35.000000000 +0100
@@ -118,6 +118,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/doc/autodocs/Makefile.in new/yast2-tune-2.15.0/idedma/doc/autodocs/Makefile.in
--- old/yast2-tune-2.14.0/idedma/doc/autodocs/Makefile.in 2006-11-13 13:54:58.000000000 +0100
+++ new/yast2-tune-2.15.0/idedma/doc/autodocs/Makefile.in 2006-12-13 16:48:35.000000000 +0100
@@ -105,6 +105,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/scrconf/Makefile.in new/yast2-tune-2.15.0/idedma/scrconf/Makefile.in
--- old/yast2-tune-2.14.0/idedma/scrconf/Makefile.in 2006-11-13 13:54:59.000000000 +0100
+++ new/yast2-tune-2.15.0/idedma/scrconf/Makefile.in 2006-12-13 16:48:35.000000000 +0100
@@ -107,6 +107,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/src/Makefile.in new/yast2-tune-2.15.0/idedma/src/Makefile.in
--- old/yast2-tune-2.14.0/idedma/src/Makefile.in 2006-11-13 13:54:59.000000000 +0100
+++ new/yast2-tune-2.15.0/idedma/src/Makefile.in 2006-12-13 16:48:35.000000000 +0100
@@ -118,6 +118,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-tune-2.14.0/idedma/testsuite/Makefile.in new/yast2-tune-2.15.0/idedma/testsuite/Makefile.in
--- old/yast2-tune-2.14.0/idedma/testsuite/Makefile.in 2006-11-13 13:54:59.000000000 +0100
+++ new/yast2-tune-2.15.0/idedma/testsuite/Makefile.in 2006-12-13 16:48:36.000000000 +0100
@@ -103,6 +103,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Dec 14 02:07:43 CET 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-12-06 15:30:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2006-12-13 14:46:28.000000000 +0100
@@ -1,0 +2,19 @@
+Wed Dec 13 14:19:27 CET 2006 - lslezak(a)suse.cz
+
+- display the correct error description in the error popup when
+ a download fails (#228178)
+- 2.15.2
+
+-------------------------------------------------------------------
+Tue Dec 12 12:40:49 CET 2006 - locilka(a)suse.cz
+
+- Desktop selection dialog doesn't use [Select] button anymore.
+ Other options are solved by another hidden radio-buttons
+ (#202132).
+
+-------------------------------------------------------------------
+Thu Dec 7 15:32:49 CET 2006 - lslezak(a)suse.cz
+
+- inst_source: `restart_menu is not needed anymore (#148683)
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.15.1.tar.bz2
New:
----
yast2-packager-2.15.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.wXjVa3/_old 2006-12-14 02:07:16.000000000 +0100
+++ /var/tmp/diff_new_pack.wXjVa3/_new 2006-12-14 02:07:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.15.1)
+# spec file for package yast2-packager (Version 2.15.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,19 @@
# norootforbuild
Name: yast2-packager
-Version: 2.15.1
+Version: 2.15.2
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.15.1.tar.bz2
+Source0: yast2-packager-2.15.2.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml
Requires: checkmedia yast2-country
# Pkg::TargetStoreRemove(), bug #210552; Pkg::SourceCreateType(), bug #168358
Requires: yast2-pkg-bindings >= 2.14.0
-# Linuxrc::display_ip
-Requires: yast2 >= 2.13.67
+# separate processes in ncurses control center
+Requires: yast2 >= 2.15.0
Requires: yast2-storage
Provides: yast2-config-package-manager
Obsoletes: yast2-config-package-manager
@@ -46,7 +46,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.15.1
+%setup -n yast2-packager-2.15.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -84,6 +84,16 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Wed Dec 13 2006 - lslezak(a)suse.cz
+- display the correct error description in the error popup when
+ a download fails (#228178)
+- 2.15.2
+* Tue Dec 12 2006 - locilka(a)suse.cz
+- Desktop selection dialog doesn't use [Select] button anymore.
+ Other options are solved by another hidden radio-buttons
+ (#202132).
+* Thu Dec 07 2006 - lslezak(a)suse.cz
+- inst_source: `restart_menu is not needed anymore (#148683)
* Wed Dec 06 2006 - lslezak(a)suse.cz
- inst_source: removed extra UI::CloseDialog() call (#224944),
check number of arguments
++++++ yast2-packager-2.15.1.tar.bz2 -> yast2-packager-2.15.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/Makefile.am new/yast2-packager-2.15.2/Makefile.am
--- old/yast2-packager-2.15.1/Makefile.am 2006-12-06 15:23:42.000000000 +0100
+++ new/yast2-packager-2.15.2/Makefile.am 2006-12-13 14:43:07.000000000 +0100
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/Makefile.in new/yast2-packager-2.15.2/Makefile.in
--- old/yast2-packager-2.15.1/Makefile.in 2006-12-06 15:23:49.000000000 +0100
+++ new/yast2-packager-2.15.2/Makefile.in 2006-12-13 14:43:15.000000000 +0100
@@ -135,6 +135,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
@@ -201,15 +202,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
@@ -220,7 +220,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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/VERSION new/yast2-packager-2.15.2/VERSION
--- old/yast2-packager-2.15.1/VERSION 2006-12-06 15:23:33.000000000 +0100
+++ new/yast2-packager-2.15.2/VERSION 2006-12-13 14:40:51.000000000 +0100
@@ -1 +1 @@
-2.15.1
+2.15.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/configure new/yast2-packager-2.15.2/configure
--- old/yast2-packager-2.15.1/configure 2006-12-06 15:23:46.000000000 +0100
+++ new/yast2-packager-2.15.2/configure 2006-12-13 14:43:12.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.1.
+# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.15.1'
-PACKAGE_STRING='yast2-packager 2.15.1'
+PACKAGE_VERSION='2.15.2'
+PACKAGE_STRING='yast2-packager 2.15.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -659,6 +659,7 @@
LN_S
PKG_CONFIG_PATH
XGETTEXT
+Y2DEVTOOLS_PREFIX
CREATE_PKGCONFIG_TRUE
CREATE_PKGCONFIG_FALSE
CREATE_PKGCONFIG_NOARCH_TRUE
@@ -1180,7 +1181,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-packager 2.15.1 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.15.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.15.1:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.15.2:";;
esac
cat <<\_ACEOF
@@ -1329,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.15.1
+yast2-packager configure 2.15.2
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1343,7 +1344,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-packager $as_me 2.15.1, which was
+It was created by yast2-packager $as_me 2.15.2, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2144,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.15.1'
+ VERSION='2.15.2'
cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2372,7 @@
-VERSION="2.15.1"
+VERSION="2.15.2"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -2618,6 +2619,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`
@@ -2796,6 +2799,34 @@
echo "$as_me: error: ycpc is not installed" >&2;}
{ (exit 1); exit 1; }; }
fi
+as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
+echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6; }
+if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+ac_res=`eval echo '${'$as_ac_File'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+
+ { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5
+echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;}
+
+fi
+
( cd src/config; ln -sf dirinstall.xml dirinstall.glade )
@@ -3229,7 +3260,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-packager $as_me 2.15.1, which was
+This file was extended by yast2-packager $as_me 2.15.2, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3272,7 +3303,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.15.1
+yast2-packager config.status 2.15.2
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -3534,9 +3565,9 @@
LN_S!$LN_S$ac_delim
PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
+Y2DEVTOOLS_PREFIX!$Y2DEVTOOLS_PREFIX$ac_delim
CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim
CREATE_PKGCONFIG_FALSE!$CREATE_PKGCONFIG_FALSE$ac_delim
-CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -3578,6 +3609,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim
CREATE_PKGCONFIG_NOARCH_FALSE!$CREATE_PKGCONFIG_NOARCH_FALSE$ac_delim
STYLESHEET_HTML!$STYLESHEET_HTML$ac_delim
STYLESHEET_PDF!$STYLESHEET_PDF$ac_delim
@@ -3591,7 +3623,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/configure.in new/yast2-packager-2.15.2/configure.in
--- old/yast2-packager-2.15.1/configure.in 2006-12-06 15:23:42.000000000 +0100
+++ new/yast2-packager-2.15.2/configure.in 2006-12-13 14:43:07.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.15.1, http://bugs.opensuse.org/, yast2-packager)
+AC_INIT(yast2-packager, 2.15.2, http://bugs.opensuse.org/, yast2-packager)
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="2.15.1"
+VERSION="2.15.2"
RPMNAME="yast2-packager"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -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`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
( cd src/config; ln -sf dirinstall.xml dirinstall.glade )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/Makefile.in new/yast2-packager-2.15.2/src/Makefile.in
--- old/yast2-packager-2.15.1/src/Makefile.in 2006-12-06 15:23:47.000000000 +0100
+++ new/yast2-packager-2.15.2/src/Makefile.in 2006-12-13 14:43:13.000000000 +0100
@@ -104,6 +104,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/clients/Makefile.in new/yast2-packager-2.15.2/src/clients/Makefile.in
--- old/yast2-packager-2.15.1/src/clients/Makefile.in 2006-12-06 15:23:47.000000000 +0100
+++ new/yast2-packager-2.15.2/src/clients/Makefile.in 2006-12-13 14:43:13.000000000 +0100
@@ -110,6 +110,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/clients/inst_desktop.ycp new/yast2-packager-2.15.2/src/clients/inst_desktop.ycp
--- old/yast2-packager-2.15.1/src/clients/inst_desktop.ycp 2006-10-13 11:12:08.000000000 +0200
+++ new/yast2-packager-2.15.2/src/clients/inst_desktop.ycp 2006-12-13 14:37:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Desktop Selection
* Authors: Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: inst_desktop.ycp 33383 2006-10-13 09:12:02Z lslezak $
+ * $Id: inst_desktop.ycp 34914 2006-12-12 11:45:39Z locilka $
*
*/
@@ -38,7 +38,6 @@
{
if (alt_desktop != "kde" && alt_desktop != "gnome")
{
- other_desktop = alt_desktop;
alt_desktop = "other";
}
}
@@ -78,7 +77,7 @@
system.</p>")
+
// help text 3/3
-_("<p>Choose <b>Other</b> then press <b>Select</b> to select
+_("<p>Choose <b>Other</b> then select from
an alternative, such as a text-only system or a minimal graphical
system with a basic window manager.</p>");
@@ -106,7 +105,7 @@
`HSpacing (3),
`Top (`Label (gnome_blurb)),
`HSpacing (1),
- `Right (`Top (`Image (
+ `Right (`Top ( `Image (
Directory::themedir + "/current/icons/48x48/apps/gnome.png",
"")))
)
@@ -114,15 +113,14 @@
term contents = `RadioButtonGroup (`id (`desktop), `HBox (
`HWeight(1, `Empty()), // Distribute excess space 1:2 (left:right)
- `VBox(
+ `VBox (
`VStretch (),
// label (in bold font)
-// `Left (`Label (`opt (`boldFont), _("Graphical Desktop Environment"))),
-// `VSpacing (1.4),
`VWeight (10, gnome),
`VSpacing (0.4),
`VWeight (10, kde),
`VSpacing (0.4),
+
`VWeight (10, `HBox (
`Left (`RadioButton (`id ("other"), `opt(`notify, `boldFont),
// radio button
@@ -130,42 +128,37 @@
alt_desktop != "gnome" && alt_desktop != "kde"
&& alt_desktop != nil)),
`HBox (
- `HSpacing (3),
+ `HSpacing (2),
// push button
- `PushButton (`id (`select), _("&Select..."))
+ `RadioButtonGroup (`id(`other_rb), `ReplacePoint (`id(`other_options), `VBox(`VSpacing(4))))
)
)),
`VStretch ()
-// `VWeight (5, `Empty())
),
`HWeight (2, `Empty ())
));
-term expert_dialog = `VBox (
- // frame
- `MarginBox(2, 0.7, `Frame (_("Alternate Desktops"),
- `MarginBox (1, 0.5, `RadioButtonGroup (`id (`desktop), `VBox (
- `Left (`RadioButton (`id ("min_x11"),
- // radio button
- _("Minimal &Graphical System"))),
- `Left (`RadioButton (`id ("text"),
- // radio button
- _("&Text Mode")))
- ))
- ))),
- `Right (`HBox (
- `PushButton ( `id (`ok), `opt (`default), Label::OKButton ()),
- `PushButton ( `id (`cancel), Label::CancelButton ())
- ))
-);
+void EnableOtherOptions () {
+ UI::ReplaceWidget (`id (`other_options), `VBox (
+ `VSpacing (2),
+ `Left (`RadioButton (`id ("min_x11"), `opt(`notify),
+ // radio button
+ _("&Minimal Graphical System"), (other_desktop == "min_x11"))),
+ `Left (`RadioButton (`id ("text"), `opt(`notify),
+ // radio button
+ _("&Text Mode"), (other_desktop == "text")))
+ ));
+}
+
+void DisableOtherOptions () {
+ UI::ReplaceWidget (`id(`other_options), `VBox(`VSpacing(4)));
+}
// dialog caption
Wizard::SetContents (_("Desktop Selection"), contents, help,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
Wizard::SetTitleIcon ("yast-desktop-select");
Wizard::SetFocusToNextButton();
-UI::ChangeWidget(`select, `Enabled, alt_desktop != "gnome"
- && alt_desktop != "kde" && alt_desktop != nil);
any ret = nil;
@@ -173,55 +166,37 @@
map event = UI::WaitForEvent();
ret = event["ID"]:nil;
- if (event["WidgetClass"]:nil == `RadioButton)
- {
+ // by default, nothing is selected, enabling next
+ // handling [Next] button
+ if (ret == "gnome" || ret == "kde" || ret == "min_x11" || ret == "text") {
+ Wizard::EnableNextButton();
+ } else if (ret == "other" && (other_desktop == "min_x11" || other_desktop == "text")) {
Wizard::EnableNextButton();
- UI::ChangeWidget (`select, `Enabled,
- UI::QueryWidget (`id ("other"), `Value));
+ } else {
+ Wizard::DisableNextButton();
}
- else if (ret == `next)
- {
- alt_desktop = (string)UI::QueryWidget (`id (`desktop), `CurrentButton);
- if (alt_desktop == "other")
- {
- if (other_desktop == nil)
- ret = `select_next;
- else
- alt_desktop = other_desktop;
- }
- if (alt_desktop == nil)
- {
- // popup message
+
+ if (ret == `next) {
+ if (alt_desktop == nil || alt_desktop == "") {
Popup::Message (_("No desktop was selected. Select the
desktop to install."));
ret = nil;
+ // alt_desktop is also neither 'nil' nor ""
+ } else if (alt_desktop == "other") {
+ alt_desktop = other_desktop;
}
- }
- if (ret == `select || ret == `select_next)
- {
- UI::OpenDialog (expert_dialog);
- string selected = other_desktop;
- if (selected != "text")
- selected = "min_x11";
- UI::ChangeWidget (`id (`desktop), `CurrentButton, selected);
- any popup_ret = UI::UserInput ();
- selected = (string)UI::QueryWidget (`id (`desktop), `CurrentButton);
- UI::CloseDialog ();
- if (popup_ret == `ok)
- {
- other_desktop = selected;
- if (ret == `select_next)
- {
- alt_desktop = other_desktop;
- ret = `next;
- }
- }
- }
- else if (ret == `abort)
- {
+ } else if (ret == `abort) {
if (Popup::ConfirmAbort (Stage::initial () ? `painless : `incomplete))
return `abort;
continue;
+ } else if (ret == "other") {
+ EnableOtherOptions();
+ } else if (ret == "gnome" || ret == "kde") {
+ alt_desktop = tostring (ret);
+ DisableOtherOptions();
+ } else if (ret == "min_x11" || ret == "text") {
+ alt_desktop = "other";
+ other_desktop = tostring (ret);
}
} until (ret == `back || ret == `next);
@@ -235,7 +210,7 @@
{
if (DefaultDesktop::Desktop () != alt_desktop)
{
- y2milestone ("Setting defualt desktop to %1", alt_desktop);
+ y2milestone ("Setting default desktop to %1", alt_desktop);
DefaultDesktop::SetDesktop (alt_desktop);
Packages::ForceFullRepropose ();
Packages::Reset ([`product]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/clients/inst_source.ycp new/yast2-packager-2.15.2/src/clients/inst_source.ycp
--- old/yast2-packager-2.15.1/src/clients/inst_source.ycp 2006-12-06 10:57:32.000000000 +0100
+++ new/yast2-packager-2.15.2/src/clients/inst_source.ycp 2006-12-13 14:10:20.000000000 +0100
@@ -649,8 +649,6 @@
y2milestone ("Starting source sequence");
symbol ret = Sequencer::Run (aliases, sequence);
-if (ret == `next && Mode::normal ())
- ret = `restart_menu;
UI::CloseDialog ();
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/config/Makefile.in new/yast2-packager-2.15.2/src/config/Makefile.in
--- old/yast2-packager-2.15.1/src/config/Makefile.in 2006-12-06 15:23:47.000000000 +0100
+++ new/yast2-packager-2.15.2/src/config/Makefile.in 2006-12-13 14:43:13.000000000 +0100
@@ -104,6 +104,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/include/Makefile.in new/yast2-packager-2.15.2/src/include/Makefile.in
--- old/yast2-packager-2.15.1/src/include/Makefile.in 2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/include/Makefile.in 2006-12-13 14:43:14.000000000 +0100
@@ -114,6 +114,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/include/checkmedia/Makefile.in new/yast2-packager-2.15.2/src/include/checkmedia/Makefile.in
--- old/yast2-packager-2.15.1/src/include/checkmedia/Makefile.in 2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/include/checkmedia/Makefile.in 2006-12-13 14:43:14.000000000 +0100
@@ -105,6 +105,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/include/dirinstall/Makefile.in new/yast2-packager-2.15.2/src/include/dirinstall/Makefile.in
--- old/yast2-packager-2.15.1/src/include/dirinstall/Makefile.in 2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/include/dirinstall/Makefile.in 2006-12-13 14:43:14.000000000 +0100
@@ -105,6 +105,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/modules/Makefile.in new/yast2-packager-2.15.2/src/modules/Makefile.in
--- old/yast2-packager-2.15.1/src/modules/Makefile.in 2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/src/modules/Makefile.in 2006-12-13 14:43:14.000000000 +0100
@@ -108,6 +108,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.2/src/modules/PackageCallbacks.ycp
--- old/yast2-packager-2.15.1/src/modules/PackageCallbacks.ycp 2006-12-06 09:29:49.000000000 +0100
+++ new/yast2-packager-2.15.2/src/modules/PackageCallbacks.ycp 2006-12-13 14:18:12.000000000 +0100
@@ -192,8 +192,23 @@
if (error != 0)
{
+ // this is for error code 1 ("NOT_FOUND"), %1 is name of a package
string message = sformat (_("Package %1 was not found on the medium."), name);
+ // "IO"
+ if (error == 2)
+ {
+ // error message, %1 is a package name
+ message = sformat(_("Package %1 could not be downloaded (input/output error)."), name);
+ }
+ // "INVALID"
+ else if (error == 3)
+ {
+ // error message, %1 is a package name
+ message = sformat(_("Package %1 is broken, integrity check has failed."), name);
+ }
+
+
if (Mode::commandline()) {
CommandLine::Print(message);
@@ -251,9 +266,26 @@
showLongInfo = ShowLogInfo (message, button_box);
if (showLongInfo)
{
+ string error_symbol = "ERROR";
+
+ if (error == 1)
+ {
+ error_symbol = "NOT_FOUND";
+ }
+ else if (error == 2)
+ {
+ error_symbol = "IO";
+ }
+ else if (error == 3)
+ {
+ error_symbol = "INVALID";
+ }
+
UI::ReplaceWidget(`id(`info),
`RichText (`opt(`plainText),
- sformat (_("Error: %1:"), error) + reason) );
+ // error message, %1 is code of the error,
+ // detail string is appended to the end
+ sformat (_("Error: %1:"), error_symbol) + reason) );
}
else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/src/modules/test.ycp new/yast2-packager-2.15.2/src/modules/test.ycp
--- old/yast2-packager-2.15.1/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100
+++ new/yast2-packager-2.15.2/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-
-{
- import "Package";
- import "CommandLine";
-
- textdomain "test";
-
- boolean startHandler(map<string,string> opts) {
- Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
-// Package::InstallAll(["sambadocdfdfdf"]);
-
- return true;
- }
-
- symbol GUIhandler() {
- y2milestone("GUIhandler");
- return `next;
- }
-
- boolean Read() {
- return true;
- }
-
- boolean Write() {
- return true;
- }
-
- map cmdline = $[
- // help text
- "help" : _("Start installation in a virtual machine"),
- "id" : "vm",
- "guihandler": GUIhandler,
- "initialize": Read,
- "finish" : Write,
- "actions" : $[
- "start" : $[
- // command description
- "help" : _("Start installation"),
- "handler" : startHandler
- ]
- ],
- "options" : $[
- "configured" : $[
- // option description
- "help" : _("List only configured devices")
- ],
- "all" : $[
- // option description
- "help" : _("List all detected IDE devices")
- ]
- ],
- "mappings" : $[
- "start" : ["configured", "all"],
- ]
- ];
-
- any ret = CommandLine::Run(cmdline);
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/test.pot new/yast2-packager-2.15.2/test.pot
--- old/yast2-packager-2.15.1/test.pot 2006-11-08 10:20:30.000000000 +0100
+++ new/yast2-packager-2.15.2/test.pot 2006-12-13 09:58:56.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-08 10:20+0100\n"
+"POT-Creation-Date: 2006-12-13 09:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.1/testsuite/Makefile.in new/yast2-packager-2.15.2/testsuite/Makefile.in
--- old/yast2-packager-2.15.1/testsuite/Makefile.in 2006-12-06 15:23:48.000000000 +0100
+++ new/yast2-packager-2.15.2/testsuite/Makefile.in 2006-12-13 14:43:14.000000000 +0100
@@ -101,6 +101,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11
checked in at Thu Dec 14 02:07:38 CET 2006.
--------
--- xorg-x11/xorg-x11.changes 2006-12-08 18:41:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-12-13 06:58:53.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Dec 13 06:56:51 CET 2006 - sndirsch(a)suse.de
+
+- updated xauth to release 1.0.2
+ * Sun bug 6494972: "is is" is a typo in xauth(1) man page
+ * Replace static ChangeLog with disthook to generate from git log
+ * Add hooks for checking source code with lint/sparse/etc.
+ * Fix sparse warning: non-ANSI definition of function 'get_hostname'
+ * Replace platform #ifdefs with AC_CHECK_HEADERS([net/errno.h])
+ * Remove Imake compatibility #ifdefs - require configure's AC_TYPE_SIGNAL
+
+-------------------------------------------------------------------
Old:
----
xauth-X11R7.0-1.0.1.tar.bz2
New:
----
xauth-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.daivpA/_old 2006-12-14 02:06:41.000000000 +0100
+++ /var/tmp/diff_new_pack.daivpA/_new 2006-12-14 02:06:41.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 27
+Release: 30
License: X11/MIT, Other License(s), see package
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -49,7 +49,7 @@
Source25: twm-1.0.3.tar.bz2
Source26: viewres-X11R7.0-1.0.1.tar.bz2
Source27: x11perf-X11R7.1-1.4.1.tar.bz2
-Source28: xauth-X11R7.0-1.0.1.tar.bz2
+Source28: xauth-1.0.2.tar.bz2
Source29: xbiff-X11R7.0-1.0.1.tar.bz2
Source30: xcalc-X11R7.0-1.0.1.tar.bz2
Source31: xclipboard-X11R7.0-1.0.1.tar.bz2
@@ -440,6 +440,14 @@
/var/lib/xdm/authdir/
%changelog -n xorg-x11
+* Wed Dec 13 2006 - sndirsch(a)suse.de
+- updated xauth to release 1.0.2
+ * Sun bug 6494972: "is is" is a typo in xauth(1) man page
+ * Replace static ChangeLog with disthook to generate from git log
+ * Add hooks for checking source code with lint/sparse/etc.
+ * Fix sparse warning: non-ANSI definition of function 'get_hostname'
+ * Replace platform #ifdefs with AC_CHECK_HEADERS([net/errno.h])
+ * Remove Imake compatibility #ifdefs - require configure's AC_TYPE_SIGNAL
* Fri Dec 08 2006 - sndirsch(a)suse.de
- fixed warning in xedit
* Wed Dec 06 2006 - sndirsch(a)suse.de
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.daivpA/_old 2006-12-14 02:06:45.000000000 +0100
+++ /var/tmp/diff_new_pack.daivpA/_new 2006-12-14 02:06:45.000000000 +0100
@@ -19,7 +19,7 @@
retrieving revision 1.1.1.7
diff -w -u -r1.1.1.7 gethost.c
--- programs/xauth/gethost.c 8 Sep 2003 09:32:24 -0000 1.1.1.7
-+++ xauth-X11R7.0-1.0.1/gethost.c 26 Jul 2005 14:48:29 -0000
++++ xauth-1.0.2/gethost.c 26 Jul 2005 14:48:29 -0000
@@ -249,7 +249,8 @@
int family,
char *fulldpyname,
@@ -45,7 +45,7 @@
retrieving revision 1.1.1.6
diff -w -u -r1.1.1.6 parsedpy.c
--- programs/xauth/parsedpy.c 8 Sep 2003 09:32:24 -0000 1.1.1.6
-+++ xauth-X11R7.0-1.0.1/parsedpy.c 26 Jul 2005 14:48:29 -0000
++++ xauth-1.0.2/parsedpy.c 26 Jul 2005 14:48:29 -0000
@@ -69,20 +69,24 @@
@@ -97,7 +97,7 @@
retrieving revision 1.1.1.17
diff -w -u -r1.1.1.17 process.c
--- programs/xauth/process.c 6 Jul 2004 15:11:16 -0000 1.1.1.17
-+++ xauth-X11R7.0-1.0.1/process.c 26 Jul 2005 14:48:29 -0000
++++ xauth-1.0.2/process.c 26 Jul 2005 14:48:29 -0000
@@ -462,7 +462,7 @@
}
@@ -158,7 +158,7 @@
retrieving revision 1.1.1.6
diff -w -u -r1.1.1.6 xauth.h
--- programs/xauth/xauth.h 8 Sep 2003 09:32:24 -0000 1.1.1.6
-+++ xauth-X11R7.0-1.0.1/xauth.h 26 Jul 2005 14:48:29 -0000
++++ xauth-1.0.2/xauth.h 26 Jul 2005 14:48:29 -0000
@@ -51,10 +51,10 @@
};
++++++ xauth-X11R7.0-1.0.1.tar.bz2 -> xauth-1.0.2.tar.bz2 ++++++
++++ 14631 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/ChangeLog new/xauth-1.0.2/ChangeLog
--- old/xauth-X11R7.0-1.0.1/ChangeLog 2005-12-21 03:29:48.000000000 +0100
+++ new/xauth-1.0.2/ChangeLog 2006-12-13 00:18:08.000000000 +0100
@@ -1,40 +1,261 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit a1602ecd22a800a6c5348c00fece3287cdcf00ce
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Tue Dec 12 15:00:29 2006 -0800
- * configure.ac:
- Update package version for X11R7 release.
+ Version bump: 1.0.2
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 140965e6a565e338e07cf6fcc0dd5313acd67716
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 19:31:37 2006 -0800
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Remove Imake compatibility #ifdefs - require configure's AC_TYPE_SIGNAL
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit cfb36499790b764d87af7d6f4713f4fe8d3d88f7
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 19:25:48 2006 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Replace platform #ifdefs with AC_CHECK_HEADERS([net/errno.h])
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 42815405686498bb464fa20621bbcde00096a42d
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 18:59:14 2006 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ sparse warning: non-ANSI definition of function 'get_hostname'
-2005-11-20 Alan Coopersmith <alan.coopersmith(a)sun.com>
+commit a527e14d16de2955dcdd6d14141f51987af7af2c
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 18:54:51 2006 -0800
- * configure.ac:
- Change dependency from xmu to xmuu since the full xmu
- (with all its baggage like Xt) is not needed here.
+ Add hooks for checking source code with lint/sparse/etc.
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit fa9b494baacab74d354ee4d5e0f6a1342b2bc723
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 18:48:54 2006 -0800
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Replace static ChangeLog with disthook to generate from git log
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2c2900cef3722580fa7b32721809365fad77348a
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 14:53:38 2006 -0800
- * configure.ac:
- Update package version number for RC1 release.
+ Add *~ to .gitignore to skip emacs/patch droppings
-2005-06-30 Alexander Gottwald <ago at freedesktop dot org>
+commit 1c42ae4c711b646fff5aae562f43047b0c4e9d81
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 14:53:13 2006 -0800
- * configure.ac:
- Check for xau.pc
+ renamed: .cvsignore -> .gitignore
+
+commit df9747b1706b0f35dd24484da05a8221369508a1
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Dec 11 14:50:29 2006 -0800
+
+ Sun bug 6494972: "is is" is a typo in xauth(1) man page
+
+ <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6494972>
+
+commit 900f18b99fcdd1e404bea3e25c5f52f3fdb4a8c5
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Wed Dec 21 02:29:48 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit a147a93a8469bc6c53e644f304f022e5c4b21083
+Author: Adam Jackson <ajax(a)nwnk.net>
+Date: Mon Dec 19 16:22:42 2005 +0000
+
+ Stub COPYING files
+
+commit 80dae7f47a96a58ec1b008eb6a44c6b990d69d2f
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Thu Dec 15 00:24:04 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 2b0af47b8252e239fe0201802ef5b71c4732949a
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Tue Dec 6 22:48:19 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit da2726e8d0cab3dd0e5e8653572d3c91bfd10bd4
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Sat Dec 3 05:49:18 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 31daf53e50be410f581f7b05d579136a8e1fd04a
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Mon Nov 28 22:01:39 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 653fe719513d43e3ad42bb086f91fc00d8f79228
+Author: Eric Anholt <anholt(a)freebsd.org>
+Date: Mon Nov 21 10:34:58 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit e4cb9726562b4acea76a683ed411e38845d91265
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Mon Nov 21 03:14:16 2005 +0000
+
+ Change dependency from xmu to xmuu since the full xmu (with all its baggage
+ like Xt) is not needed here.
+
+commit 32ee4696ea37c04562229dccacffe7dc8341eca0
+Author: Eric Anholt <anholt(a)freebsd.org>
+Date: Sun Nov 20 22:08:50 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit ccbf3e05dad84647b62fa3fd8f5730c5dd094977
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Wed Nov 9 21:09:20 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit 0f59380f98d7fdae7ce32b67ba8f2c3798e71502
+Author: Kean Johnson <kean(a)armory.com>
+Date: Tue Nov 8 06:33:31 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit bb5b65a587478663bd50f083bc8c17213c5c5ab7
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Wed Oct 19 02:47:51 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 00fdcaca12f7b8f17d23a90bab864ec538987d3e
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Mon Oct 17 23:56:21 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 2c0557cea41fab82bf8d8d5b8f65d18705999513
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Fri Oct 14 00:25:43 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 429ec4dfe91ea5aa803295c3d3bd18a091a78572
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Fri Jul 29 21:22:30 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit 6d58b9aac2e339f1caa30882d6cb5c3bd3cd53e1
+Author: Daniel Stone <daniel(a)fooishbar.org>
+Date: Wed Jul 27 01:54:17 2005 +0000
+
+ Move manpages to section 1 instead of section m.
+
+commit 7e7777e930bd2b25df25edfc26bbbab026d41827
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Tue Jul 26 17:15:43 2005 +0000
+
+ Add XTRANS_CONNECTION_FLAGS & AC_TYPE_SIGNAL to replace Imake's
+ CONN_DEFINES & SIGNAL_DEFINES
+
+commit d3ef3afdb8242590ed289d0c512289c51b6f3240
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Tue Jul 26 16:58:27 2005 +0000
+
+ Add config.h includes for modularization Use RETSIGTYPE if defined by
+ autoconf in addition to Imake's SIGNALRETURNSINT.
+
+commit aea947181d0185bf9512d71ea58bf8192b42c478
+Author: Adam Jackson <ajax(a)nwnk.net>
+Date: Wed Jul 20 19:31:51 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit d26b6760781675316ccf755cd39b295aa88dcaab
+Author: Alexander Gottwald <alexander.gottwald(a)s1999.tu-chemnitz.de>
+Date: Thu Jun 30 14:14:02 2005 +0000
+
+ Check for xau.pc
+
+commit 9ec316349f351f654a6bf9ac2492a5c7bfa87492
+Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk>
+Date: Wed Jun 29 23:04:46 2005 +0000
+
+ Add xauth build system
+
+commit 4449eae1558daf1618ae9bcc2f53278bfc3e1fe2
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Sat Apr 24 23:26:55 2004 +0000
+
+ Bugzilla #550: xauth doesn't unlock .Xauthority on SIGPIPE
+
+commit a6249acfcb65447dcb9759cd4acefdf22263cc7d
+Author: Egbert Eich <eich(a)suse.de>
+Date: Fri Apr 23 19:54:38 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit b27f9af9997bcc99fe4c9ce2d6b24c065e36be0a
+Author: Egbert Eich <eich(a)suse.de>
+Date: Sun Mar 14 08:35:00 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 28ec313e66802039788199d807a3cd923634d0af
+Author: Egbert Eich <eich(a)suse.de>
+Date: Wed Mar 3 12:12:55 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit ec7585272a7b7791c30a52e372ee3ae485744875
+Author: Egbert Eich <eich(a)suse.de>
+Date: Thu Feb 26 13:36:16 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit a682e3bf548a271d97cecd5c616ef84555a1b54c
+Author: Egbert Eich <eich(a)suse.de>
+Date: Thu Feb 26 09:23:58 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 740c103a2711826b40bd838b1fe14e47f03544ca
+Author: Egbert Eich <eich(a)suse.de>
+Date: Thu Jan 29 08:09:02 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 48a153ab92b7ebde3483408993f08c208e67079c
+Author: Kaleb Keithley <kaleb(a)freedesktop.org>
+Date: Thu Dec 4 22:03:46 2003 +0000
+
+ XFree86 4.3.99.901 (RC 1)
+
+commit 09cf02b0457f774bd10574c0facf1df29fb83b53
+Author: Kaleb Keithley <kaleb(a)freedesktop.org>
+Date: Tue Nov 25 19:29:03 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit d013d0b3ecb18ae2f1c162c6a1db89c6b4f063d3
+Author: Kaleb Keithley <kaleb(a)freedesktop.org>
+Date: Fri Nov 14 16:48:58 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 2f9dac1bee2aa9d396899f42c10e84a432ac31ff
+Author: Kaleb Keithley <kaleb(a)freedesktop.org>
+Date: Fri Nov 14 15:54:53 2003 +0000
+
+ R6.6 is the Xorg base-line
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/Makefile.am new/xauth-1.0.2/Makefile.am
--- old/xauth-X11R7.0-1.0.1/Makefile.am 2005-12-06 23:48:19.000000000 +0100
+++ new/xauth-1.0.2/Makefile.am 2006-12-12 03:53:19.000000000 +0100
@@ -38,9 +38,18 @@
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(xauth_CFLAGS)
+
+lint:
+ $(LINT) $(ALL_LINT_FLAGS) $(xauth_SOURCES) $(xauth_LDADD)
+endif LINT
+
+
SED = sed
# Strings to replace in man pages
@@ -64,3 +73,12 @@
.man.$(APP_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/compile new/xauth-1.0.2/compile
--- old/xauth-X11R7.0-1.0.1/compile 2005-12-21 08:24:06.000000000 +0100
+++ new/xauth-1.0.2/compile 2006-12-12 22:36:53.000000000 +0100
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey(a)cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,83 +18,125 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
+# This file is maintained in Automake, please report
+# bugs to <bug-automake(a)gnu.org> or send patches to
+# <automake-patches(a)gnu.org>.
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake(a)gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+esac
ofile=
cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
- shift
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
done
if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$prog" $args
+ # If no `-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
fi
# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/config.h.in new/xauth-1.0.2/config.h.in
--- old/xauth-X11R7.0-1.0.1/config.h.in 2005-12-21 08:24:05.000000000 +0100
+++ new/xauth-1.0.2/config.h.in 2006-12-12 22:36:51.000000000 +0100
@@ -3,9 +3,42 @@
/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
#undef BSD44SOCKETS
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <net/errno.h> header file. */
+#undef HAVE_NET_ERRNO_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
/* Support IPv6 for TCP connections */
#undef IPv6
+/* Support os-specific local connections */
+#undef LOCALCONN
+
/* Name of package */
#undef PACKAGE
@@ -27,6 +60,9 @@
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Support TCP socket connections */
#undef TCPCONN
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/configure.ac new/xauth-1.0.2/configure.ac
--- old/xauth-X11R7.0-1.0.1/configure.ac 2005-12-21 03:29:48.000000000 +0100
+++ new/xauth-1.0.2/configure.ac 2006-12-12 22:30:03.000000000 +0100
@@ -22,17 +22,23 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(xauth,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
+AC_INIT(xauth,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.1)
+
AC_PROG_CC
AC_PROG_INSTALL
AC_TYPE_SIGNAL
+AC_CHECK_HEADERS([net/errno.h])
+
# Checks for pkg-config packages
PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu)
AC_SUBST(XAUTH_CFLAGS)
@@ -42,6 +48,7 @@
# Needed to set *CONN defines for gethost.c & parsedpy.c
XTRANS_CONNECTION_FLAGS
+XORG_WITH_LINT
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/gethost.c new/xauth-1.0.2/gethost.c
--- old/xauth-X11R7.0-1.0.1/gethost.c 2005-11-08 07:33:31.000000000 +0100
+++ new/xauth-1.0.2/gethost.c 2006-12-12 22:29:26.000000000 +0100
@@ -61,13 +61,9 @@
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#ifdef SYSV
-#ifdef i386
-#if !defined(SCO325) && !defined(sun)
+#ifdef HAVE_NET_ERRNO_H
#include <net/errno.h>
-#endif /* !SCO325 && !sun */
-#endif /* i386 */
-#endif /* SYSV */
+#endif /* HAVE_NET_ERRNO_H */
#endif /* !STREAMSCONN */
#endif /* !WIN32 */
#include <errno.h>
@@ -92,15 +88,6 @@
* be found. Stolen from xhost.
*/
-/* defined by autoconf AC_TYPE_SIGNAL, need to define for Imake */
-#ifndef RETSIGTYPE
-# ifdef SIGNALRETURNSINT
-# define RETSIGTYPE int
-# else
-# define RETSIGTYPE void
-# endif
-#endif
-
static jmp_buf env;
static RETSIGTYPE
nameserver_lost(int sig)
@@ -115,8 +102,7 @@
#endif
char *
-get_hostname (auth)
- Xauth *auth;
+get_hostname (Xauth *auth)
{
static struct hostent *hp;
int af;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/missing new/xauth-1.0.2/missing
--- old/xauth-X11R7.0-1.0.1/missing 2005-12-21 08:24:06.000000000 +0100
+++ new/xauth-1.0.2/missing 2006-12-12 22:36:53.000000000 +0100
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
+msg="missing on your system"
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake(a)gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +101,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +146,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +155,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -140,13 +174,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,14 +185,9 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
@@ -237,13 +261,8 @@
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
@@ -262,32 +281,30 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -323,8 +340,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +351,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/process.c new/xauth-1.0.2/process.c
--- old/xauth-X11R7.0-1.0.1/process.c 2005-07-26 18:58:27.000000000 +0200
+++ new/xauth-1.0.2/process.c 2006-12-12 22:29:26.000000000 +0100
@@ -630,21 +630,12 @@
static char *xauth_filename = NULL;
static volatile Bool dieing = False;
-#ifdef RETSIGTYPE /* autoconf AC_TYPE_SIGNAL */
-# define _signal_t RETSIGTYPE
-#else /* Imake */
-#ifdef SIGNALRETURNSINT
-#define _signal_t int
-#else
-#define _signal_t void
-#endif
-#endif /* RETSIGTYPE */
/* poor man's puts(), for under signal handlers */
#define WRITES(fd, S) (void)write((fd), (S), strlen((S)))
/* ARGSUSED */
-static _signal_t
+static RETSIGTYPE
die(int sig)
{
dieing = True;
@@ -655,7 +646,7 @@
#endif
}
-static _signal_t
+static RETSIGTYPE
catchsig(int sig)
{
#ifdef SYSV
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xauth-X11R7.0-1.0.1/xauth.man new/xauth-1.0.2/xauth.man
--- old/xauth-X11R7.0-1.0.1/xauth.man 2004-04-23 21:54:38.000000000 +0200
+++ new/xauth-1.0.2/xauth.man 2006-12-11 23:48:19.000000000 +0100
@@ -53,7 +53,7 @@
.TP 8
.B \-q
This option indicates that \fIxauth\fP should operate quietly and not print
-unsolicited status messages. This is the default if an \fIxauth\fP command is
+unsolicited status messages. This is the default if an \fIxauth\fP command
is given on the command line or if the standard output is not directed to a
terminal.
.TP 8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package yast2
checked in at Thu Dec 14 02:07:09 CET 2006.
--------
--- yast2/yast2.changes 2006-12-06 16:31:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2006-12-13 09:27:30.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Dec 13 09:11:24 CET 2006 - lslezak(a)suse.cz
+
+- URL.ycp: fixed url building and checking in Estonian locale
+ (use [[:alpha:]] instead of [a-z] in regexps) (#227256)
+- 2.15.1
+
+-------------------------------------------------------------------
+Thu Dec 7 15:30:30 CET 2006 - lslezak(a)suse.cz
+
+- menu.ycp: `restart_menu is not needed anymore (#148683)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.15.0.tar.bz2
New:
----
yast2-2.15.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.GxIECw/_old 2006-12-14 02:06:55.000000000 +0100
+++ /var/tmp/diff_new_pack.GxIECw/_new 2006-12-14 02:06:55.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.0)
+# spec file for package yast2 (Version 2.15.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2
-Version: 2.15.0
+Version: 2.15.1
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.0.tar.bz2
+Source0: yast2-2.15.1.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# UI::RunInTerminal builtin
@@ -97,7 +97,7 @@
Steffen Winterfeldt <snwint(a)suse.de>
%prep
-%setup -n yast2-2.15.0
+%setup -n yast2-2.15.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,12 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Wed Dec 13 2006 - lslezak(a)suse.cz
+- URL.ycp: fixed url building and checking in Estonian locale
+ (use [[:alpha:]] instead of [a-z] in regexps) (#227256)
+- 2.15.1
+* Thu Dec 07 2006 - lslezak(a)suse.cz
+- menu.ycp: `restart_menu is not needed anymore (#148683)
* Tue Dec 05 2006 - kmachalkova(a)suse.cz
- Adapt ncurses menu.ycp for running yast modules as separate
processes (#148683, #221254, #222547)
++++++ yast2-2.15.0.tar.bz2 -> yast2-2.15.1.tar.bz2 ++++++
++++ 2290 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.0/VERSION new/yast2-2.15.1/VERSION
--- old/yast2-2.15.0/VERSION 2006-12-05 11:19:58.000000000 +0100
+++ new/yast2-2.15.1/VERSION 2006-12-13 09:21:31.000000000 +0100
@@ -1 +1 @@
-2.15.0
+2.15.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.0/configure.in new/yast2-2.15.1/configure.in
--- old/yast2-2.15.0/configure.in 2006-12-06 16:00:49.000000000 +0100
+++ new/yast2-2.15.1/configure.in 2006-12-13 09:22:41.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.15.0, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.1, http://bugs.opensuse.org/, yast2)
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="2.15.0"
+VERSION="2.15.1"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.0/library/desktop/src/menu.ycp new/yast2-2.15.1/library/desktop/src/menu.ycp
--- old/yast2-2.15.0/library/desktop/src/menu.ycp 2006-12-06 16:26:40.000000000 +0100
+++ new/yast2-2.15.1/library/desktop/src/menu.ycp 2006-12-07 15:32:21.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: NCurses Control Center
* Authors: Michal Svec <msvec(a)suse.cz>
*
- * $Id: menu.ycp 34812 2006-12-06 15:26:38Z kmachalkova $
+ * $Id: menu.ycp 34853 2006-12-07 14:32:19Z lslezak $
*
* Provides a list of available yast2 modules. This module is inteded for use
* with ncurses, for X the yast2 control center should be used.
@@ -93,7 +93,7 @@
any ret = UI::RunInTerminal(cmd);
y2milestone ("Got %1 from %2", ret, cmd);
- if ((function == "online_update" && ret == -42) || ret == `restart_menu)
+ if (function == "online_update" && ret == -42)
{
y2milestone ("yast needs to be restarted - exiting...");
SCR::Execute (.target.bash, sformat ("touch %1", restart_file));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.0/library/modules/Version.ycp new/yast2-2.15.1/library/modules/Version.ycp
--- old/yast2-2.15.0/library/modules/Version.ycp 2006-12-06 16:01:08.000000000 +0100
+++ new/yast2-2.15.1/library/modules/Version.ycp 2006-12-13 09:23:04.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.0";
+global string yast2 = "2.15.1";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.0/library/types/src/URL.ycp new/yast2-2.15.1/library/types/src/URL.ycp
--- old/yast2-2.15.0/library/types/src/URL.ycp 2006-08-18 13:15:44.000000000 +0200
+++ new/yast2-2.15.1/library/types/src/URL.ycp 2006-12-13 09:21:44.000000000 +0100
@@ -6,7 +6,7 @@
* Anas Nashif <nashif(a)suse.cz>
* Flags: Stable
*
- * $Id: URL.ycp 31472 2006-06-13 11:31:49Z jsrain $
+ * $Id: URL.ycp 34930 2006-12-13 08:21:40Z lslezak $
*/
{
@@ -237,7 +237,7 @@
map tokens = Parse(url);
/* Check "scheme" : "http" */
- if(!regexpmatch(tokens["scheme"]:"", "^[a-z]*$"))
+ if(!regexpmatch(tokens["scheme"]:"", "^[[:alpha:]]*$"))
return false;
/* Check "host" : "www.suse.cz" */
@@ -275,7 +275,7 @@
string url = "";
string userpass = "";
- if(regexpmatch(tokens["scheme"]:"", "^[a-z]*$"))
+ if(regexpmatch(tokens["scheme"]:"", "^[[:alpha:]]*$"))
{
url = tokens["scheme"]:"";
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package unrar
checked in at Thu Dec 14 02:06:41 CET 2006.
--------
--- unrar/unrar.changes 2006-08-29 13:37:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/unrar/unrar.changes 2006-12-13 19:12:47.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Dec 13 19:12:05 CET 2006 - lmichnovic(a)suse.cz
+
+- fixed string comparing (*strcmp.patch)
+
+-------------------------------------------------------------------
New:
----
unrarsrc-3.6.8-strcmp.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unrar.spec ++++++
--- /var/tmp/diff_new_pack.b52c2x/_old 2006-12-14 02:06:02.000000000 +0100
+++ /var/tmp/diff_new_pack.b52c2x/_new 2006-12-14 02:06:02.000000000 +0100
@@ -13,15 +13,16 @@
Name: unrar
BuildRequires: gcc-c++
Version: 3.60.8
-Release: 1
+Release: 20
Autoreqprov: on
Group: Productivity/Archiving/Compression
-License: FSR, Other License(s), see package
+License: Freely Redistributable Software (FSR), Other License(s), see package
URL: http://www.rarlab.com
Summary: A program to extract, test, and view RAR archives
Source: %{name}src-3.6.8.tar.bz2
Patch: %{name}src-3.6.8-types.patch
Patch1: %{name}src-3.6.8-gcc.patch
+Patch2: %{name}src-3.6.8-strcmp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -39,6 +40,7 @@
%setup -q -n %{name}
%patch0
%patch1
+%patch2
%build
make -f makefile.unix CXXFLAGS="$RPM_OPT_FLAGS -Wall -fmessage-length=0 -fno-strict-aliasing -fstack-protector" STRIP=true
@@ -56,20 +58,22 @@
%{_bindir}/*
%changelog -n unrar
+* Wed Dec 13 2006 - lmichnovic(a)suse.cz
+- fixed string comparing (*strcmp.patch)
* Fri Jul 14 2006 - lmichnovic(a)suse.cz
- update to version 3.60
-- non beta version
+ - non beta version
- update to version 3.60 beta 7
-- in unrar changed only version, version changed due to fix in rar
+ - in unrar changed only version, version changed due to fix in rar
* Mon Jul 10 2006 - lmichnovic(a)suse.cz
- upgrade to version 3.60 beta 6
-- no changelog available
+ - no changelog available
* Wed Jun 21 2006 - lmichnovic(a)suse.cz
- upgrade to version 3.60 beta 5
-- no changelog available
+ - no changelog available
* Tue Jun 13 2006 - lmichnovic(a)suse.cz
- upgrade to version 3.6.4
-- no changelog available
+ - no changelog available
- change the numbering to 3.6.0.4 because it is 3.60 beta 4
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
++++++ unrarsrc-3.6.8-strcmp.patch ++++++
--- cmddata.cpp
+++ cmddata.cpp
@@ -1,3 +1,4 @@
+#include <string.h>
#include "rar.hpp"
CommandData::CommandData()
@@ -911,15 +912,15 @@
continue;
#endif
#ifndef _WIN_32
- if (Help[I]==MCHelpSwRI)
+ if (strncmp(Help[I],"MCHelpSwRI", 10))
continue;
#endif
#ifndef PACK_SMP
- if (Help[I]==MCHelpSwMT)
+ if (strncmp(Help[I],"MCHelpSwMT", 10))
continue;
#endif
#ifndef _BEOS
- if (Help[I]==MCHelpSwEE)
+ if (strncmp(Help[I],"MCHelpSwEE", 10))
{
#if defined(_EMX) && !defined(_DJGPP)
if (_osmode != OS2_MODE)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package wxGTK
checked in at Thu Dec 14 02:06:33 CET 2006.
--------
--- wxGTK/wxGTK.changes 2006-09-05 16:56:54.000000000 +0200
+++ /mounts/work_src_done/STABLE/wxGTK/wxGTK.changes 2006-12-11 15:37:59.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Dec 11 15:37:59 CET 2006 - sbrabec(a)suse.cz
+
+- Source code cleanup (#226403).
+
+-------------------------------------------------------------------
Old:
----
wxPython-src-2.6.3.3-applet-replaced.tar.bz2
New:
----
wxPython-src-2.6.3.3-applet-replaced-clean.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wxGTK.spec ++++++
--- /var/tmp/diff_new_pack.PQSy8U/_old 2006-12-14 02:06:13.000000000 +0100
+++ /var/tmp/diff_new_pack.PQSy8U/_new 2006-12-14 02:06:13.000000000 +0100
@@ -12,17 +12,17 @@
Name: wxGTK
BuildRequires: SDL-devel cppunit-devel esound-devel gcc-c++ gtk2-devel libgnomeprintui-devel libmspack-devel libtiff-devel python-devel python-xml unixODBC-devel
-License: GPL
+License: GNU General Public License (GPL)
Group: System/Libraries
Autoreqprov: on
Version: 2.6.3.3
-Release: 5
+Release: 32
%define srcname wxPython-src
Summary: C++ Framework for Cross-Platform Development
# http://www.wxpython.org/
# contrib/samples/applet replaces by one from wxWidgets-2.7.0-1.tar.bz2
# to prevent unauthorized distribution of monitors.c (#203607)
-Source0: %{srcname}-%{version}-applet-replaced.tar.bz2
+Source0: %{srcname}-%{version}-applet-replaced-clean.tar.bz2
Source1: README.unicode
URL: http://www.wxwidgets.org/
Provides: wxgtk
@@ -315,6 +315,8 @@
%{py_sitedir}/*
%changelog -n wxGTK
+* Mon Dec 11 2006 - sbrabec(a)suse.cz
+- Source code cleanup (#226403).
* Tue Sep 05 2006 - sbrabec(a)suse.cz
- Repackaged without undistributable monitors.c (#203607).
* Mon Aug 07 2006 - sbrabec(a)suse.cz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package unison
checked in at Thu Dec 14 02:06:06 CET 2006.
--------
--- unison/unison.changes 2006-12-06 22:56:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/unison/unison.changes 2006-12-13 16:02:33.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 13 16:01:52 CET 2006 - mhopf(a)suse.de
+
+- added patch for no longer closing main window if subwindows open
+- removed unison-gtk1 again
+
+-------------------------------------------------------------------
Old:
----
unison-gtk1.changes
unison-gtk1.desktop
unison-gtk1.spec
New:
----
unison-windowout.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unison.spec ++++++
--- /var/tmp/diff_new_pack.ijyDGw/_old 2006-12-14 02:05:55.000000000 +0100
+++ /var/tmp/diff_new_pack.ijyDGw/_new 2006-12-14 02:05:55.000000000 +0100
@@ -16,10 +16,11 @@
Group: Productivity/Networking/Other
Autoreqprov: on
Version: 2.17.1
-Release: 20
+Release: 23
Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%…
Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%…
Source2: %name.desktop
+Patch0: unison-windowout.diff
URL: http://www.cis.upenn.edu/~bcpierce/unison
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: A file synchronization tool
@@ -39,6 +40,7 @@
%prep
%setup -q
+%patch0
%build
%ifarch s390 s390x
@@ -68,6 +70,9 @@
%{_bindir}/%{name}
%changelog -n unison
+* Wed Dec 13 2006 - mhopf(a)suse.de
+- added patch for no longer closing main window if subwindows open
+- removed unison-gtk1 again
* Wed Dec 06 2006 - seife(a)suse.de
- add unison-gtk1, a binary compiled against lablgtk
* Mon Sep 25 2006 - mhopf(a)suse.de
++++++ unison-windowout.diff ++++++
Index: uigtk2.ml
===================================================================
--- uigtk2.ml (revision 184)
+++ uigtk2.ml (revision 185)
@@ -1118,10 +1118,9 @@
(* ------ *)
-let messageBox ~title ~parent ?(action = fun t -> t#destroy)
- ?(modal = false) message =
+let messageBox ~title ?(action = fun t -> t#destroy) ?(modal = false) message =
let utitle = transcode title in
- let t = GWindow.dialog ~title:utitle ~parent ~modal ~position:`CENTER () in
+ let t = GWindow.dialog ~title:utitle ~modal ~position:`CENTER () in
let t_dismiss = GButton.button ~stock:`CLOSE ~packing:t#action_area#add () in
t_dismiss#grab_default ();
ignore (t_dismiss#connect#clicked ~callback:(action t));
@@ -1156,7 +1155,7 @@
~selectable:true ~yalign:0. ~packing:v1#add ());
t#add_button_stock `CANCEL `NO;
let cmd () =
- messageBox ~title:"Details" ~parent:t ~modal:false longtext
+ messageBox ~title:"Details" ~modal:false longtext
in
t#add_button advLabel `HELP;
t#add_button_stock `APPLY `YES;
@@ -1381,10 +1380,11 @@
GBin.frame ~packing:(toplevelVBox#pack ~expand:false)
~shadow_type:`IN (*~hpolicy:`AUTOMATIC ~vpolicy:`NEVER*) () in
let hb =GPack.hbox ~packing:sw#add () in
- (GButton.button ~label:"View details..." ~packing:hb#add (),
+ (GButton.button ~label:"View details..." ~packing:(hb#pack ~expand:false) (),
GText.view ~editable:false ~wrap_mode:`NONE ~packing:hb#add ())
in
+ showDetailsButton#misc#set_sensitive false;
detailsWindow#misc#modify_font (Lazy.force fontMonospaceMediumPango);
detailsWindow#misc#set_size_chars ~height:3 ~width:104 ();
detailsWindow#misc#set_can_focus false;
@@ -1396,7 +1396,7 @@
(match !theState.(row).whatHappened with
Some (Util.Failed _, Some det) -> det
| _ -> "[No details available]") in
- messageBox ~title:"Merge execution details" ~parent:(getMyWindow ()) details
+ messageBox ~title:"Merge execution details" details
in
ignore (showDetailsButton#connect#clicked ~callback:showDetCommand);
@@ -2075,7 +2075,7 @@
Some i ->
getLock (fun () ->
Uicommon.showDiffs !theState.(i).ri
- (fun title text -> messageBox ~title ~parent:(getMyWindow ()) (transcode text))
+ (fun title text -> messageBox ~title (transcode text))
Trace.status (Uutil.File.ofLine i);
displayGlobalProgress 0.)
| None ->
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package psqlODBC
checked in at Thu Dec 14 02:05:55 CET 2006.
--------
--- psqlODBC/psqlODBC.changes 2006-01-25 21:40:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/psqlODBC/psqlODBC.changes 2006-12-13 15:55:08.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Dec 13 15:34:15 CET 2006 - max(a)suse.de
+
+- Avoid literal string comparison (#228225)
+- New version: 08.02.0200
+ - Added support for SSL and Kerberos
+ - Reduce compiler warnings on x86_64
+ - Many more improvements
+
+-------------------------------------------------------------------
Old:
----
psqlodbc-08.01.0102.tar.bz2
New:
----
psqlODBC-literal.patch
psqlodbc-08.02.0200.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ psqlODBC.spec ++++++
--- /var/tmp/diff_new_pack.0UXEC5/_old 2006-12-14 02:05:42.000000000 +0100
+++ /var/tmp/diff_new_pack.0UXEC5/_new 2006-12-14 02:05:42.000000000 +0100
@@ -1,25 +1,26 @@
#
-# spec file for package psqlODBC (Version 08.01.0102)
+# spec file for package psqlODBC (Version 08.02.0200)
#
# Copyright (c) 2006 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.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: psqlODBC
-BuildRequires: postgresql-devel unixODBC-devel
+BuildRequires: openssl-devel postgresql-devel unixODBC-devel
URL: http://pgfoundry.org/projects/psqlodbc
%define tarname psqlodbc
Summary: ODBC Driver for PostgreSQL
-Version: 08.01.0102
+Version: 08.02.0200
Release: 1
-License: LGPL
+License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: Productivity/Databases/Clients
Source0: %tarname-%{version}.tar.bz2
+Patch1: psqlODBC-literal.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: pg_odbc postgresql-odbc
Provides: pg_odbc postgresql-odbc pg_iface:/usr/lib/pgsql/odbcinst.ini
@@ -42,11 +43,13 @@
%prep
%setup -q -n %tarname-%version
+%patch1
%build
+# they don't ship configure.in, so we have to patch configure :(
+sed -i '/LDFLAGS=/s/\$pg_libs//' configure
export CFLAGS="%optflags -fno-strict-aliasing -I/usr/include/pgsql"
%configure --with-unixodbc
-make
%install
make DESTDIR=%buildroot install
@@ -67,6 +70,12 @@
%_libdir/psql*
%changelog -n psqlODBC
+* Wed Dec 13 2006 - max(a)suse.de
+- Avoid literal string comparison (#228225)
+- New version: 08.02.0200
+ - Added support for SSL and Kerberos
+ - Reduce compiler warnings on x86_64
+ - Many more improvements
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Fri Jan 13 2006 - max(a)suse.de
++++++ psqlODBC-literal.patch ++++++
--- dlg_specific.c
+++ dlg_specific.c
@@ -876,7 +876,7 @@
{
char tmp[128];
- if (ODBCINST_INI == fileName && NULL == sectionName)
+ if ((strcmp( ODBCINST_INI, fileName) == 0) && NULL == sectionName)
sectionName = DBMS_NAME;
sprintf(tmp, "%d", comval->fetch_max);
++++++ psqlodbc-08.01.0102.tar.bz2 -> psqlodbc-08.02.0200.tar.bz2 ++++++
++++ 55455 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package rfb
checked in at Thu Dec 14 02:05:49 CET 2006.
--------
--- rfb/rfb.changes 2006-01-25 21:41:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/rfb/rfb.changes 2006-12-13 09:04:47.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Dec 13 08:54:25 CET 2006 - anosek(a)suse.cz
+
+- changed prefix /usr/X11R6/bin -> /usr/bin
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rfb.spec ++++++
--- /var/tmp/diff_new_pack.Uyn4TN/_old 2006-12-14 02:05:43.000000000 +0100
+++ /var/tmp/diff_new_pack.Uyn4TN/_new 2006-12-14 02:05:43.000000000 +0100
@@ -5,19 +5,19 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: rfb
BuildRequires: gcc-c++ xclass xorg-x11 xorg-x11-devel
-License: GPL
+License: GNU General Public License (GPL)
Group: System/X11/Utilities
Autoreqprov: on
Requires: xclass
Version: 0.6.1
-Release: 472
+Release: 509
URL: http://www.hexonet.de/software/rfb/
#Original source: http://www.hexonet.de/download/rfb-0.6.1.tar.gz
Source0: http://www.hexonet.de/download/rfb-0.6.1.tar.bz2
@@ -52,12 +52,12 @@
make
%install
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT/usr/X11R6/bin
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT/usr/bin
install -m 644 man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 755 x0rfbserver/x0rfbserver $RPM_BUILD_ROOT/usr/X11R6/bin/
-install -m 755 xrfbviewer/{xrfbviewer,xplayfbs} $RPM_BUILD_ROOT/usr/X11R6/bin/
-install -m 755 rfbcat/rfbcat $RPM_BUILD_ROOT/usr/X11R6/bin/
-install -m 755 xvncconnect/xvncconnect $RPM_BUILD_ROOT/usr/X11R6/bin/
+install -m 755 x0rfbserver/x0rfbserver $RPM_BUILD_ROOT/usr/bin/
+install -m 755 xrfbviewer/{xrfbviewer,xplayfbs} $RPM_BUILD_ROOT/usr/bin/
+install -m 755 rfbcat/rfbcat $RPM_BUILD_ROOT/usr/bin/
+install -m 755 xvncconnect/xvncconnect $RPM_BUILD_ROOT/usr/bin/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -66,9 +66,11 @@
%defattr(-, root, root)
%doc COPYING INSTALL README rfm_fbs.1.0.html
%doc %{_mandir}/man1/*.1*
-/usr/X11R6/bin/*
+/usr/bin/*
%changelog -n rfb
+* Wed Dec 13 2006 - anosek(a)suse.cz
+- changed prefix /usr/X11R6/bin -> /usr/bin
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Sat Jan 14 2006 - schwab(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0