Hello community,
here is the log from the commit of package cups-autoconfig
checked in at Mon Oct 6 19:20:26 CEST 2008.
--------
--- cups-autoconfig/cups-autoconfig.changes 2008-04-17 20:45:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/cups-autoconfig/cups-autoconfig.changes 2008-10-06 19:16:38.008533000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 6 19:27:40 CEST 2008 - crivera@suse.de
+
+- Fix a parsing error when loading our config file. This fixes
+ bnc#414177.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cups-autoconfig.spec ++++++
--- /var/tmp/diff_new_pack.t19700/_old 2008-10-06 19:20:17.000000000 +0200
+++ /var/tmp/diff_new_pack.t19700/_new 2008-10-06 19:20:17.000000000 +0200
@@ -2,9 +2,16 @@
# spec file for package cups-autoconfig (Version 0.1.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -13,7 +20,7 @@
Name: cups-autoconfig
Url: http://code.google.com/p/cups-autoconfig
Version: 0.1.0
-Release: 97
+Release: 158
Group: System/Base
License: GPL v2 only
Summary: A Utility to Auto-configure Printers
@@ -55,6 +62,9 @@
%{_datadir}/locale/en_US/LC_MESSAGES/cups-autoconfig.mo
%changelog
+* Mon Oct 06 2008 crivera@suse.de
+- Fix a parsing error when loading our config file. This fixes
+ bnc#414177.
* Thu Apr 17 2008 crivera@suse.de
- Check the IEEE 1284 description fields for
model information. This helps us match some
++++++ cups-autoconfig-0.1.0.tar.gz ++++++
++++ 60647 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/cups-autoconfig-0.1.0/config.h.in new/cups-autoconfig-0.1.0/config.h.in
--- old/cups-autoconfig-0.1.0/config.h.in 2008-04-12 16:49:18.000000000 +0200
+++ new/cups-autoconfig-0.1.0/config.h.in 2008-10-06 18:46:33.000000000 +0200
@@ -60,6 +60,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
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/cups-autoconfig-0.1.0/po/Makefile.in.in new/cups-autoconfig-0.1.0/po/Makefile.in.in
--- old/cups-autoconfig-0.1.0/po/Makefile.in.in 2008-04-12 16:49:11.000000000 +0200
+++ new/cups-autoconfig-0.1.0/po/Makefile.in.in 2008-10-06 18:51:21.000000000 +0200
@@ -56,9 +56,9 @@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
@@ -101,7 +101,6 @@
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(itlocaledir)
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
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/cups-autoconfig-0.1.0/src/cups-autoconfig.c new/cups-autoconfig-0.1.0/src/cups-autoconfig.c
--- old/cups-autoconfig-0.1.0/src/cups-autoconfig.c 2008-04-17 20:36:42.000000000 +0200
+++ new/cups-autoconfig-0.1.0/src/cups-autoconfig.c 2008-10-06 17:20:20.000000000 +0200
@@ -111,14 +111,12 @@
config->add = value && (!strcmp (value, "yes") || !strcmp (value, "y")) ? TRUE : FALSE;
g_free (value);
- /*value = g_key_file_get_value (kf, "CUPS", "DisablePrintersOnRemoval", NULL);
- config->remove = value && (!strcmp (value, "yes") || !strcmp (value, "y")) ? TRUE : FALSE;
- g_free (value);*/
-
config->remove = FALSE;
value = g_key_file_get_value (kf, "CUPS", "DefaultCUPSPolicy", NULL);
- if (!strcmp ("", value)) {
+ if (!value) {
+ config->default_policy = NULL;
+ } else if (!strcmp ("", value)) {
g_free (value);
config->default_policy = NULL;
} else {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org