Hello community,
here is the log from the commit of package yast2-printer for openSUSE:Factory
checked in at Thu Oct 28 13:28:09 CEST 2010.
--------
--- yast2-printer/yast2-printer.changes 2010-09-23 17:57:59.000000000 +0200
+++ yast2-printer/yast2-printer.changes 2010-10-26 14:20:29.000000000 +0200
@@ -1,0 +2,11 @@
+Tue Oct 26 12:06:13 UTC 2010 - jsmeix@suse.de
+
+- Adapted "Driver Packages" dialog for current RPMs:
+ Removed CheckBoxes for cups-drivers and ghostscript-omni.
+ Added CheckBoxes for OpenPrintingPPDs-ghostscript,
+ OpenPrintingPPDs-hpijs, OpenPrintingPPDs-postscript,
+ cups-drivers-splix, and m2300w
+ (see Novell/openSUSE Bugzilla bnc#642510).
+- 2.20.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-printer-2.20.2.tar.bz2
New:
----
yast2-printer-2.20.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.lysIw8/_old 2010-10-28 13:27:38.000000000 +0200
+++ /var/tmp/diff_new_pack.lysIw8/_new 2010-10-28 13:27:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.20.2)
+# spec file for package yast2-printer (Version 2.20.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-printer
-Version: 2.20.2
+Version: 2.20.3
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.20.2.tar.bz2
+Source0: yast2-printer-2.20.3.tar.bz2
Prefix: /usr
@@ -54,7 +54,7 @@
Developer documentation for yast2-printer.
%prep
-%setup -n yast2-printer-2.20.2
+%setup -n yast2-printer-2.20.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -66,7 +66,9 @@
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-printer-2.20.2.tar.bz2 -> yast2-printer-2.20.3.tar.bz2 ++++++
++++ 10004 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-printer-2.20.2/Makefile.am new/yast2-printer-2.20.3/Makefile.am
--- old/yast2-printer-2.20.2/Makefile.am 2010-09-23 17:50:47.000000000 +0200
+++ new/yast2-printer-2.20.3/Makefile.am 2010-10-26 14:12:22.000000000 +0200
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#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
+ACLOCAL_AMFLAGS = -I . -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
cmp -s $< $@ || cp -f $< $@
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-printer-2.20.2/VERSION new/yast2-printer-2.20.3/VERSION
--- old/yast2-printer-2.20.2/VERSION 2010-09-23 17:41:11.000000000 +0200
+++ new/yast2-printer-2.20.3/VERSION 2010-10-26 13:51:26.000000000 +0200
@@ -1 +1 @@
-2.20.2
+2.20.3
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-printer-2.20.2/autodocs-ycp.ami new/yast2-printer-2.20.3/autodocs-ycp.ami
--- old/yast2-printer-2.20.2/autodocs-ycp.ami 2010-09-23 17:50:47.000000000 +0200
+++ new/yast2-printer-2.20.3/autodocs-ycp.ami 2010-10-26 14:12:22.000000000 +0200
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
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-printer-2.20.2/configure.in new/yast2-printer-2.20.3/configure.in
--- old/yast2-printer-2.20.2/configure.in 2010-09-23 17:50:47.000000000 +0200
+++ new/yast2-printer-2.20.3/configure.in 2010-10-26 14:12:22.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-printer
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.20.2, http://bugs.opensuse.org/, yast2-printer)
+AC_INIT(yast2-printer, 2.20.3, http://bugs.opensuse.org/, yast2-printer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.2"
+VERSION="2.20.3"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec "
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-printer-2.20.2/missing new/yast2-printer-2.20.3/missing
--- old/yast2-printer-2.20.2/missing 2010-09-23 17:50:52.000000000 +0200
+++ new/yast2-printer-2.20.3/missing 2010-10-26 14:12:25.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# 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).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# 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/yast2-printer-2.20.2/src/driveradd.ycp new/yast2-printer-2.20.3/src/driveradd.ycp
--- old/yast2-printer-2.20.2/src/driveradd.ycp 2010-01-20 14:29:51.000000000 +0100
+++ new/yast2-printer-2.20.3/src/driveradd.ycp 2010-10-26 13:43:25.000000000 +0200
@@ -46,13 +46,15 @@
any AddDriverDialog()
{ // Title of the Add Driver Dialog:
string caption = _("Driver Packages");
- boolean cups_drivers_installed = Printerlib::TestAndInstallPackage( "cups-drivers", "installed" );
+ boolean OpenPrintingPPDs_ghostscript_installed = Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "installed" );
+ boolean OpenPrintingPPDs_hpijs_installed = Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-hpijs", "installed" );
+ boolean OpenPrintingPPDs_postscript_installed = Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-postscript", "installed" );
boolean gutenprint_installed = Printerlib::TestAndInstallPackage( "gutenprint", "installed" );
boolean hplip_installed = Printerlib::TestAndInstallPackage( "hplip", "installed" );
boolean manufacturer_PPDs_installed = Printerlib::TestAndInstallPackage( "manufacturer-PPDs", "installed" );
- boolean ghostscript_omni_installed = Printerlib::TestAndInstallPackage( "ghostscript-omni", "installed" );
- boolean filters_installed = Printerlib::TestAndInstallPackage( "filters", "installed" );
- y2milestone( "entering AddDriverDialog with cups_drivers_installed:'%1' gutenprint_installed:'%2' hplip_installed:'%3' manufacturer_PPDs_installed:'%4' ghostscript_omni_installed:'%5' filters_installed:'%6'", cups_drivers_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, ghostscript_omni_installed, filters_installed );
+ boolean cups_drivers_splix_installed = Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" );
+ boolean m2300w_installed = Printerlib::TestAndInstallPackage( "m2300w", "installed" );
+ y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' cups_drivers_splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, cups_drivers_splix_installed, m2300w_installed );
term contents = `VBox
( `VStretch(),
`Left
@@ -68,12 +70,32 @@
`VBox
( `Left
( `CheckBox
- ( `id("cups-drivers"),
- // CheckBox to select or un-select the printer driver package cups-drivers.
- // There is no need to have the package name "cups-drivers" in this text
+ ( `id("OpenPrintingPPDs-ghostscript"),
+ // CheckBox to select or un-select the printer driver package OpenPrintingPPDs-ghostscript.
+ // There is no need to have the package name "OpenPrintingPPDs-ghostscript" in this text
// because it is shown in a separated column to the left of this text.
- "&cups-drivers : " + _("Various Standard Drivers"),
- cups_drivers_installed
+ "&OpenPrintingPPDs-ghostscript : " + _("Printer Description Files for Ghostscript Drivers"),
+ OpenPrintingPPDs_ghostscript_installed
+ )
+ ),
+ `Left
+ ( `CheckBox
+ ( `id("OpenPrintingPPDs-hpijs"),
+ // CheckBox to select or un-select the printer driver package OpenPrintingPPDs-hpijs.
+ // There is no need to have the package name "OpenPrintingPPDs-hpijs" in this text
+ // because it is shown in a separated column to the left of this text.
+ "OpenPrintingPPDs-hp&ijs : " + _("Printer Description Files for some PCL Printers"),
+ OpenPrintingPPDs_hpijs_installed
+ )
+ ),
+ `Left
+ ( `CheckBox
+ ( `id("OpenPrintingPPDs-postscript"),
+ // CheckBox to select or un-select the printer driver package OpenPrintingPPDs-postscript.
+ // There is no need to have the package name "OpenPrintingPPDs-postscript" in this text
+ // because it is shown in a separated column to the left of this text.
+ "OpenPrintingPPDs-&postscript : " + _("Printer Description Files for PostScript Printers"),
+ OpenPrintingPPDs_postscript_installed
)
),
`Left
@@ -94,7 +116,7 @@
// CheckBox to select or un-select the printer driver packages hplip and hplip-hpijs.
// There is no need to have the package names "hplip" and "hplip-hpijs" in this text
// because they are shown in a separated column to the left of this text.
- "&hplip + hplip-hpijs : " + _("Driver for HP Printers and All-in-One Devices"),
+ "&hplip + hplip-hpijs : " + _("Driver for HP Printers and HP All-in-One Devices"),
hplip_installed
)
),
@@ -104,18 +126,28 @@
// CheckBox to select or un-select the printer driver package manufacturer-PPDs.
// There is no need to have the package name "manufacturer-PPDs" in this text
// because it is shown in a separated column to the left of this text.
- "&manufacturer-PPDs : " + _("Printer Description Files for PostScript Printers"),
+ "&manufacturer-PPDs : " + _("Manufacturer's PostScript Printer Description Files"),
manufacturer_PPDs_installed
)
),
`Left
( `CheckBox
- ( `id("ghostscript-omni"),
- // CheckBox to select or un-select the printer driver package ghostscript-omni.
- // There is no need to have the package name "ghostscript-omni" in this text
+ ( `id("cups-drivers-splix"),
+ // CheckBox to select or un-select the printer driver package cups-drivers-splix.
+ // There is no need to have the package name "cups-drivers-splix" in this text
// because it is shown in a separated column to the left of this text.
- "ghostscript-&omni : " + _("The Omni Printer Driver (Unmaintained)"),
- ghostscript_omni_installed
+ "cups-drivers-&splix : " + _("SpliX Driver for SPL Printers without JBIG"),
+ cups_drivers_splix_installed
+ )
+ ),
+ `Left
+ ( `CheckBox
+ ( `id("m2300w"),
+ // CheckBox to select or un-select the printer driver package manufacturer-PPDs.
+ // There is no need to have the package name "m2300w" in this text
+ // because it is shown in a separated column to the left of this text.
+ "m2300&w : " + _("Driver for Konica Minolta 2300W and 2400W (unmaintained)"),
+ m2300w_installed
)
)
)
@@ -137,7 +169,7 @@
( `TextEntry
( `id("ppd_path_input"),
// TextEntry to specify the full path of a PPD file:
- _("&Printer description file name with full path where it is located")
+ _("Printer description &file name with full path where it is located")
),
`VBox(
`Label(""),
@@ -191,18 +223,24 @@
}
if( ret == `next )
{ // Get the actual settings and values from the dialog:
- boolean cups_drivers_install = (boolean)UI::QueryWidget( `id("cups-drivers"), `Value );
+ boolean OpenPrintingPPDs_ghostscript_install = (boolean)UI::QueryWidget( `id("OpenPrintingPPDs-ghostscript"), `Value );
+ boolean OpenPrintingPPDs_hpijs_install = (boolean)UI::QueryWidget( `id("OpenPrintingPPDs-hpijs"), `Value );
+ boolean OpenPrintingPPDs_postscript_install = (boolean)UI::QueryWidget( `id("OpenPrintingPPDs-postscript"), `Value );
boolean gutenprint_install = (boolean)UI::QueryWidget( `id("gutenprint"), `Value );
boolean hplip_install = (boolean)UI::QueryWidget( `id("hplip"), `Value );
boolean manufacturer_PPDs_install = (boolean)UI::QueryWidget( `id("manufacturer-PPDs"), `Value );
- boolean ghostscript_omni_install = (boolean)UI::QueryWidget( `id("ghostscript-omni"), `Value );
+ boolean cups_drivers_splix_install = (boolean)UI::QueryWidget( `id("cups-drivers-splix"), `Value );
+ boolean m2300w_install = (boolean)UI::QueryWidget( `id("m2300w"), `Value );
string ppd_path_input_value = (string)UI::QueryWidget( `id("ppd_path_input"), `Value );
// Ignore an effectively empty ppd_path_input_value:
- if( cups_drivers_install == cups_drivers_installed
+ if( OpenPrintingPPDs_ghostscript_install == OpenPrintingPPDs_ghostscript_installed
+ && OpenPrintingPPDs_hpijs_install == OpenPrintingPPDs_hpijs_installed
+ && OpenPrintingPPDs_postscript_install == OpenPrintingPPDs_postscript_installed
&& gutenprint_install == gutenprint_installed
&& hplip_install == hplip_installed
&& manufacturer_PPDs_install == manufacturer_PPDs_installed
- && ghostscript_omni_install == ghostscript_omni_installed
+ && cups_drivers_splix_install == cups_drivers_splix_installed
+ && m2300w_install == m2300w_installed
&& "" == filterchars( ppd_path_input_value, Printer::alnum_chars )
)
{ y2milestone( "Nothing changed in AddDriverDialog." );
@@ -228,18 +266,41 @@
// when I would let the package manager install several packages at once
// but one package is not avaialble in the repository to be installed.
// For example on a host without Internet access when whatever rarely used
- // drivers (e.g. ghostscript-omni) or too-big drivers (e.g. hplip)
- // are not provided on whatever media for whatever product
- // (e.g. our Live CD or a stripped DVD/CD in whatever magazine).
+ // drivers or too-big drivers are not provided on whatever media
+ // for whatever product (e.g. a Live CD or a stripped DVD/CD in whatever magazine).
boolean package_changed = false;
- if( cups_drivers_install != cups_drivers_installed )
- { if( cups_drivers_install )
- { if( Printerlib::TestAndInstallPackage( "cups-drivers", "install" ) )
+ if( OpenPrintingPPDs_ghostscript_install != OpenPrintingPPDs_ghostscript_installed )
+ { if( OpenPrintingPPDs_ghostscript_install )
+ { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "install" ) )
+ { package_changed = true;
+ }
+ }
+ else
+ { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-ghostscript", "remove" ) )
+ { package_changed = true;
+ }
+ }
+ }
+ if( OpenPrintingPPDs_hpijs_install != OpenPrintingPPDs_hpijs_installed )
+ { if( OpenPrintingPPDs_hpijs_install )
+ { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-hpijs", "install" ) )
+ { package_changed = true;
+ }
+ }
+ else
+ { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-hpijs", "remove" ) )
+ { package_changed = true;
+ }
+ }
+ }
+ if( OpenPrintingPPDs_postscript_install != OpenPrintingPPDs_postscript_installed )
+ { if( OpenPrintingPPDs_postscript_install )
+ { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-postscript", "install" ) )
{ package_changed = true;
}
}
else
- { if( Printerlib::TestAndInstallPackage( "cups-drivers", "remove" ) )
+ { if( Printerlib::TestAndInstallPackage( "OpenPrintingPPDs-postscript", "remove" ) )
{ package_changed = true;
}
}
@@ -346,14 +407,26 @@
}
}
}
- if( ghostscript_omni_install != ghostscript_omni_installed )
- { if( ghostscript_omni_install )
- { if( Printerlib::TestAndInstallPackage( "ghostscript-omni", "install" ) )
+ if( cups_drivers_splix_install != cups_drivers_splix_installed )
+ { if( cups_drivers_splix_install )
+ { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "install" ) )
+ { package_changed = true;
+ }
+ }
+ else
+ { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "remove" ) )
+ { package_changed = true;
+ }
+ }
+ }
+ if( m2300w_install != m2300w_installed )
+ { if( m2300w_install )
+ { if( Printerlib::TestAndInstallPackage( "m2300w", "install" ) )
{ package_changed = true;
}
}
else
- { if( Printerlib::TestAndInstallPackage( "ghostscript-omni", "remove" ) )
+ { if( Printerlib::TestAndInstallPackage( "m2300w", "remove" ) )
{ package_changed = true;
}
}
@@ -416,7 +489,7 @@
}
if( ! Printerlib::ExecuteBashCommand( "test -d /usr/share/cups/model/downloaded || mkdir /usr/share/cups/model/downloaded ; cp '" + ppd_path_input_value + "' /usr/share/cups/model/downloaded" ) )
{ Popup::ErrorDetails( // Popup::ErrorDetails message:
- _("Failed make the printer description file available"),
+ _("Failed to make the printer description file available"),
Printerlib::result["stderr"]:""
);
// Simply exit this dialog because it does not make sense to proceed here
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org