Mailinglist Archive: opensuse-commit (1500 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package yast2-printer
checked in at Thu Nov 2 20:27:16 CET 2006.

--------
--- yast2-printer/yast2-printer.changes	2006-11-01 14:38:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes	2006-11-01 20:03:06.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov  1 20:00:25 CET 2006 - mzugec@xxxxxxx
+
+- #210924 - choose correct PPD file
+- 2.14.7 
+
+-------------------------------------------------------------------

Old:
----
  yast2-printer-2.14.6.tar.bz2

New:
----
  yast2-printer-2.14.7.tar.bz2

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

Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.rnazU7/_old	2006-11-02 20:27:10.000000000 +0100
+++ /var/tmp/diff_new_pack.rnazU7/_new	2006-11-02 20:27:10.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-printer (Version 2.14.6)
+# spec file for package yast2-printer (Version 2.14.7)
 #
 # 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-printer
-Version:        2.14.6
+Version:        2.14.7
 Release:        1
 License:        GNU General Public License (GPL) - all versions
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-printer-2.14.6.tar.bz2
+Source0:        yast2-printer-2.14.7.tar.bz2
 prefix:		/usr
 BuildRequires:  blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite zlib-devel
 Requires:       yast2 netcat zlib blocxx
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -n yast2-printer-2.14.6
+%setup -n yast2-printer-2.14.7
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -102,6 +102,9 @@
 %doc %{prefix}/share/doc/packages/yast2-printer
 
 %changelog -n yast2-printer
+* Wed Nov 01 2006 - mzugec@xxxxxxx
+- #210924 - choose correct PPD file
+- 2.14.7
 * Tue Oct 31 2006 - mzugec@xxxxxxx
 - #215251 - add schema (RNC) file
 - 2.14.6

++++++ yast2-printer-2.14.6.tar.bz2 -> yast2-printer-2.14.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.6/VERSION new/yast2-printer-2.14.7/VERSION
--- old/yast2-printer-2.14.6/VERSION	2006-10-31 17:31:07.000000000 +0100
+++ new/yast2-printer-2.14.7/VERSION	2006-11-01 19:59:51.000000000 +0100
@@ -1 +1 @@
-2.14.6
+2.14.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.6/src/modules/Printerdb.ycp new/yast2-printer-2.14.7/src/modules/Printerdb.ycp
--- old/yast2-printer-2.14.6/src/modules/Printerdb.ycp	2006-11-01 13:57:41.000000000 +0100
+++ new/yast2-printer-2.14.7/src/modules/Printerdb.ycp	2006-11-01 19:37:00.000000000 +0100
@@ -11,7 +11,7 @@
  * Authors:
  *  Jiri Srain <jsrain@xxxxxxx>   2002
  *
- * $Id: Printerdb.ycp 32676 2006-09-01 15:40:46Z mzugec $
+ * $Id: Printerdb.ycp 33980 2006-11-01 18:36:11Z mzugec $
  *
  */
 
@@ -638,8 +638,19 @@
 		foomatic[vendor_db, device_db, p, "filter"]:"");
 	});
     }
-    string first_nick
-	= foomatic[vendor_db, device_db, ppds[0]:"", "nickname"]:"";
+   // #210924 - choose correct PPD
+ string first_nick="";
+ foreach(string row, ppds, {
+  list<string> tmp_list = splitstring(row, "/");
+  string tmp_row = toupper(tmp_list[size(tmp_list)-1]:"");
+  integer pos = findfirstof(device_db, "0123456789");
+  string str1 = substring(device_db, 0,pos);
+  string str2 = substring(device_db, pos, (size(device_db)-pos));
+  if (issubstring(device_db, str1) && issubstring(device_db, str2)) 
+	first_nick = foomatic[vendor_db, device_db, row, "nickname"]:"";
+  });
+    if (first_nick == "") first_nick = foomatic[vendor_db, device_db, ppds[0]:"", "nickname"]:"";
+
     ppds = filter (string p, ppds, {
 	return foomatic[vendor_db, device_db, p, "nickname"]:"" == first_nick;
     });


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



Remember to have fun...

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