Hello community,
here is the log from the commit of package yast2-printer
checked in at Wed Apr 9 01:00:58 CEST 2008.
--------
--- yast2-printer/yast2-printer.changes 2008-04-01 23:02:04.000000000 +0200
+++ yast2-printer/yast2-printer.changes 2008-04-08 13:33:18.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 7 20:53:53 CEST 2008 - mzugec@suse.de
+
+- LPD protocol switching support (bnc#120086)
+- 2.16.11
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.16.10.tar.bz2
New:
----
yast2-printer-2.16.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.od1593/_old 2008-04-09 01:00:35.000000000 +0200
+++ /var/tmp/diff_new_pack.od1593/_new 2008-04-09 01:00:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.16.10)
+# spec file for package yast2-printer (Version 2.16.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://en.opensuse.org/YaST/Modules/Printer
Name: yast2-printer
-Version: 2.16.10
-Release: 4
+Version: 2.16.11
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.16.10.tar.bz2
+Source0: yast2-printer-2.16.11.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: zlib blocxx
@@ -58,7 +58,7 @@
Michal Zugec
%prep
-%setup -n yast2-printer-2.16.10
+%setup -n yast2-printer-2.16.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -139,6 +139,9 @@
%exclude %{prefix}/share/doc/packages/yast2-printer/COPYING
%exclude %{prefix}/share/doc/packages/yast2-printer/README
%changelog
+* Mon Apr 07 2008 mzugec@suse.de
+- LPD protocol switching support (bnc#120086)
+- 2.16.11
* Tue Apr 01 2008 mzugec@suse.de
- fixed list of remote/local backends
* Sat Mar 29 2008 mzugec@suse.de
++++++ yast2-printer-2.16.10.tar.bz2 -> yast2-printer-2.16.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.10/src/common/dialogs.ycp new/yast2-printer-2.16.11/src/common/dialogs.ycp
--- old/yast2-printer-2.16.10/src/common/dialogs.ycp 2008-04-01 05:21:02.000000000 +0200
+++ new/yast2-printer-2.16.11/src/common/dialogs.ycp 2008-04-07 20:55:05.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Petr Blahos
*
- * $Id: dialogs.ycp 45946 2008-04-01 20:54:42Z mzugec $
+ * $Id: dialogs.ycp 46226 2008-04-08 11:25:28Z mzugec $
* Main dialogs.
*/
{
@@ -1805,6 +1805,7 @@
else UI::ChangeWidget(`queues, `Items, [ Printer::default_queue ]);
}
if ( contains (CUPS::cups_server_settings["Browsing"]:["On"],"On") ) UI::ChangeWidget(`ipp_listen, `Value, true);
+ if (Printer::lpd_enable) UI::ChangeWidget(`lpd_enable, `Value, true);
}
list<string> getAddresses(list<string> addr_orig){
@@ -1866,6 +1867,7 @@
boolean local = (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local);
UI::ChangeWidget(`ipp_listen, `Enabled, local);
+ UI::ChangeWidget(`lpd_enable, `Enabled, local);
boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value);
UI::ChangeWidget(`select_addr, `Enabled, listen && local);
@@ -1918,6 +1920,10 @@
Popup::Warning (sformat("%1 \"%2\".", _("Select default queue or check"), _("Use Server's Default Queue")));
return false;
}
+ } else{
+ if ((boolean)UI::QueryWidget(`lpd_enable, `Value) && !Printer::lpd_enable){
+ if (!Popup::YesNo(_("To enable LPD support, you must enable also xinetd service."))) return false;
+ }
}
return true;
}
@@ -1928,6 +1934,7 @@
CUPS::cups_installation=`server;
boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value);
CUPS::cups_server_settings["Browsing"] = listen ? ["On"] : ["Off"];
+ Printer::lpd_enable = (boolean)UI::QueryWidget(`lpd_enable, `Value);
}else{
CUPS::cups_installation=`client;
CUPS::server_hostname = (string)UI::QueryWidget(`server_name, `Value);
@@ -2241,8 +2248,11 @@
`VBox(
`VBox(
`Left( `RadioButton(`id(`local), `opt(`notify), "Local CUPS Server")),
+ `VBox(
`HBox(`CheckBox(`id(`ipp_listen), `opt(`notify), _("Listen to IPP Broadcast Packets")),
`PushButton(`id(`select_addr), _("Select Addresses"))
+ ),
+ `Left(`CheckBox(`id(`lpd_enable), `opt(`notify), _("enable LPD clients")))
)
),
`VBox(
@@ -2460,134 +2470,6 @@
/**
- * Complex dialog.
- * @return symbol for ws
- */
-/*
- define symbol runComplexDialog () ``{
- Printer::confmode = `adm;
- string spoolerlabel = "";
- if (Spooler::Get () == "cups")
- {
- spoolerlabel = "CUPS";
- }
- else
- {
- // is %1 in following translation text
- // "Printer administration for %1"
- spoolerlabel = _("Any Spooler");
- }
- Wizard::SetContentsButtons (
- // Header of the dialog with all the printers
- sformat (_("Printer Administration for %1"), spoolerlabel),
- Wizard_hw::ConfiguredContent ( (Spooler::Get () == "cups") ?
- // table header
- `header (_("Default"),
- // table header
- _("Name"),
- // table header
- _("Type"),
- // table header
- `Center(_("Ready")))
- :
- // table header
- `header (_("Default"),
- // table header
- _("Name"),
- // table header
- _("Type")),
- printcapTable (),
- nil, nil,
- `HBox (
- `HStretch (),
- // push button
- `PushButton (`id (`setdefault), _("&Set as Default")),
- // push button
- `PushButton (`id (`advanced), `opt (`key_F7), _("Ad&vanced")),
-
- `HStretch ()
- ),
- nil
- ),
- getComplexHelp (),
- Label::BackButton (),
- Label::FinishButton ()
- );
- Wizard::RestoreBackButton ();
- Wizard::RestoreAbortButton ();
- UI::ChangeWidget (`id (`table), `CurrentItem, -1 == Printer::index ? 0 : Printer::index);
- symbol ret = nil;
- while (true)
- {
- ret = (symbol)UI::UserInput ();
- if (ret == `table)
- {
- ret = `edit_button;
- }
- if (ret == `cancel)
- ret = `abort;
-
- if (ret == `add_button)
- {
- Printer::selectPrinter (-1);
- Printer::conf_detected = false;
- return `add;
- }
- else if (ret == `edit_button || ret == `delete_button || ret == `setdefault)
- {
- Printer::selectPrinter ((integer)UI::QueryWidget (`id (`table), `CurrentItem));
- if (-1 != Printer::index)
- {
- if (ret == `edit_button)
- {
- return `edit;
- }
- else if (`delete_button == ret)
- {
- // message box, %1 is replaced by printer name
- if (Popup::YesNo (sformat (_("Really delete printer %1?"), Printer::printer["name"]:"")))
- Printer::deletePrinter ();
- UI::ChangeWidget (`id (`table), `Items, printcapTable ());
- UI::ChangeWidget (`id (`table), `CurrentItem, Printer::index);
- }
- else
- {
- Printer::setDefaultPrinter ();
- UI::ChangeWidget (`id (`table), `Items, printcapTable ());
- UI::ChangeWidget (`id (`table), `CurrentItem, Printer::index);
- }
- }
- else
- {
- // message box
- Popup::Message (_("Select a printer."));
- }
- }
- else if (`advanced == ret)
- {
- break;
- }
- else if (`cancel == ret || `abort == ret)
- {
- ret = `abort;
- if (reallyAbort ())
- {
- break;
- }
- }
- if (`back == ret)
- {
- break;
- }
- if (`next == ret)
- {
- break;
- }
- }
- return ret;
- }
-*/
- /**
* Detect installation type
* @return symbol `server or `client
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.16.10/src/modules/Printer.ycp new/yast2-printer-2.16.11/src/modules/Printer.ycp
--- old/yast2-printer-2.16.10/src/modules/Printer.ycp 2008-04-01 05:21:02.000000000 +0200
+++ new/yast2-printer-2.16.11/src/modules/Printer.ycp 2008-04-07 20:55:05.000000000 +0200
@@ -12,7 +12,7 @@
* Petr Blahos
* Jiri Srain
*
- * $Id: Printer.ycp 45946 2008-04-01 20:54:42Z mzugec $
+ * $Id: Printer.ycp 46226 2008-04-08 11:25:28Z mzugec $
*
* Well we all know what modules are for.
*/
@@ -45,7 +45,7 @@
import "URL";
import "PackageSystem";
import "URL";
- import "PackageSystem";
+ import "Inetd";
//////////
////////// Module data
@@ -125,6 +125,9 @@
*/
global list