Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package cups-pk-helper for openSUSE:Factory
checked in at Sat Jan 15 01:36:14 CET 2011.



--------
--- cups-pk-helper/cups-pk-helper.changes       2010-03-22 15:28:51.000000000 
+0100
+++ cups-pk-helper/cups-pk-helper.changes       2011-01-13 13:20:47.000000000 
+0100
@@ -1,0 +2,16 @@
+Thu Jan 13 13:17:05 CET 2011 - vuntz@xxxxxxxxxxxx
+
+- Update to version 0.1.1:
+  + Make the include/exclude schemes work when getting devices with
+    cups 1.4
+  + Fix confusion between IPP and HTTP status when getting/putting
+    a file
+  + Clarify a string.
+  + Add some basic documentation.
+  + Build system improvements.
+  + First translations.
+- Drop cups-pk-helper-buildfix.patch: fixed upstream.
+- Create a lang subpackage, that is recommended by the main
+  package.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  cups-pk-helper-0.1.0.tar.bz2
  cups-pk-helper-buildfix.patch

New:
----
  cups-pk-helper-0.1.1.tar.bz2

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

Other differences:
------------------
++++++ cups-pk-helper.spec ++++++
--- /var/tmp/diff_new_pack.6GNpbk/_old  2011-01-15 01:33:07.000000000 +0100
+++ /var/tmp/diff_new_pack.6GNpbk/_new  2011-01-15 01:33:07.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package cups-pk-helper (Version 0.1.0)
+# spec file for package cups-pk-helper
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,13 +21,11 @@
 Name:           cups-pk-helper
 License:        GPLv2+
 Group:          Hardware/Printing
-Version:        0.1.0
-Release:        2
+Version:        0.1.1
+Release:        1
 Summary:        PolicyKit helper to configure cups with fine-grained privileges
 Url:            http://www.vuntz.net/download/cups-pk-helper/
 Source0:        
http://www.vuntz.net/download/cups-pk-helper/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM cups-pk-helper-buildfix.patch fdo#27235 
dimstar@xxxxxxxxxxxx -- Fix build: Patch from upstream commit df2b6a4.
-Patch0:         cups-pk-helper-buildfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cups-devel
 # For directory ownership
@@ -36,6 +34,7 @@
 BuildRequires:  glib2-devel
 BuildRequires:  intltool
 BuildRequires:  polkit-devel
+Recommends:     %{name}-lang
 
 %description
 This package provides a PolicyKit helper to configure cups with
@@ -43,9 +42,9 @@
 enable/disable printers without requiring a password, while still
 requiring a password for editing printer settings.
 
+%lang_package
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --libexecdir=%{_libdir}/cups-pk-helper
@@ -53,16 +52,19 @@
 
 %install
 %makeinstall
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS
+%doc AUTHORS COPYING NEWS README
 %{_sysconfdir}/dbus-1/system.d/org.opensuse.CupsPkHelper.Mechanism.conf
 %{_libdir}/cups-pk-helper
 %{_datadir}/dbus-1/system-services/org.opensuse.CupsPkHelper.Mechanism.service
 %{_datadir}/polkit-1/actions/org.opensuse.cupspkhelper.mechanism.policy
 
+%files lang -f %{name}.lang
+
 %changelog

++++++ cups-pk-helper-0.1.0.tar.bz2 -> cups-pk-helper-0.1.1.tar.bz2 ++++++
++++ 17752 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-pk-helper-0.1.0/COPYING new/cups-pk-helper-0.1.1/COPYING
--- old/cups-pk-helper-0.1.0/COPYING    2008-09-18 13:46:30.000000000 +0200
+++ new/cups-pk-helper-0.1.1/COPYING    2010-09-08 17:52:15.000000000 +0200
@@ -1,12 +1,12 @@
-                   GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                           Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                   GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                           NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                    END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -291,7 +291,7 @@
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,17 +303,16 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    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.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
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-pk-helper-0.1.0/ChangeLog new/cups-pk-helper-0.1.1/ChangeLog
--- old/cups-pk-helper-0.1.0/ChangeLog  2010-02-16 21:10:03.000000000 +0100
+++ new/cups-pk-helper-0.1.1/ChangeLog  2010-09-20 14:38:10.000000000 +0200
@@ -7,7 +7,7 @@
  Below is a copy of this format:
 
 === begin example commit ===
-[tag] Short explanation of the commit
+tag: Short explanation of the commit
 
 Longer explanation explaining exactly what's changed, whether any
 external or private interfaces changed, what bugs were fixed (with bug
@@ -27,13 +27,14 @@
 
   - You can prefix the first line with one tag, to make it easier to know to
     which part of the module the commit applies. For example, a commit with
-    "[fish] Make it work with newer fortune" in the gnome-panel module clearly
+    "fish: Make it work with newer fortune" in the gnome-panel module clearly
     applies to the fish applet.
 
   - The main description (the body) is normal prose and should use normal
     punctuation and capital letters where appropriate. Normally, for patches
-    sent to a mailing list it's copied from there. This main description can be
-    empty if the change is self-explanatory (eg: "Add DOAP file").
+    sent to a mailing list, the body is copied from there. This main
+    description can be empty if the change is self-explanatory (eg: "Add DOAP
+    file").
 
   - When committing code on behalf of others use the --author option, e.g. git
     commit -a --author "Joe Coder <joe@xxxxxxxxx>".
@@ -41,7 +42,9 @@
   - When referring to a bug, you can use this form: bgo#12345. Use bgo for
     bugzilla.gnome.org, but you can also reference bugs in other bug trackers:
     rh means bugzilla.redhat.com, bnc means bugzilla.novell.com, lp means
-    launchpad.net, etc.
+    launchpad.net, etc. Whenever possible, use the full URL of the bug, though.
 
   - When a commit closes a bug, the commit message should contain a line like:
     Closes: http://bugzilla.gnome.org/show_bug.cgi?id=12345
+    or simply:
+    http://bugzilla.gnome.org/show_bug.cgi?id=12345
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-pk-helper-0.1.0/HACKING new/cups-pk-helper-0.1.1/HACKING
--- old/cups-pk-helper-0.1.0/HACKING    1970-01-01 01:00:00.000000000 +0100
+++ new/cups-pk-helper-0.1.1/HACKING    2010-09-08 18:15:24.000000000 +0200
@@ -0,0 +1,31 @@
+Hacking on cups-pk-helper
+=========================
+
+ + The development occurs in git:
+
+     http://cgit.freedesktop.org/cups-pk-helper/
+
+   For information on how to access freedesktop.org git please read:
+
+     http://www.freedesktop.org/wiki/Infrastructure/git
+
+ + Please send patches as bug reports in freedesktop.org Bugzilla:
+
+     https://bugs.freedesktop.org/ (product cups-pk-helper)
+
+   Your patch should be in unified diff form (the -u option to GNU
+   diff). See also:
+
+     http://live.gnome.org/GnomeLove/SubmittingPatches
+
+ + Please try and send a patch against a recent version of this package.
+   Patches against git master are most preferable.
+
+ + Don't commit any but the most trivial patches without approval.
+
+ + Exceptions to this are:
+
+   - Translators may commit basic i18n related patches to the build
+     setup.
+   - Build sheriff are welcome - in accordance with the relevant build
+     sheriff constraints.
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-pk-helper-0.1.0/INSTALL new/cups-pk-helper-0.1.1/INSTALL
--- old/cups-pk-helper-0.1.0/INSTALL    2008-09-19 11:58:55.000000000 +0200
+++ new/cups-pk-helper-0.1.1/INSTALL    2011-01-13 13:11:54.000000000 +0100
@@ -2,18 +2,24 @@
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-Briefly, the shell commands `./configure; make; make install' should
+   Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
 
-  5. You can remove the program binaries and object files from the
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,12 +83,22 @@
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -85,25 +111,41 @@
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -114,16 +156,47 @@
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -135,14 +208,53 @@
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -150,7 +262,8 @@
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -168,9 +281,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -179,7 +292,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -198,11 +311,19 @@
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -229,6 +350,16 @@
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
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-pk-helper-0.1.0/Makefile.am new/cups-pk-helper-0.1.1/Makefile.am
--- old/cups-pk-helper-0.1.0/Makefile.am        2008-09-18 13:45:33.000000000 
+0200
+++ new/cups-pk-helper-0.1.1/Makefile.am        2010-12-20 18:49:01.000000000 
+0100
@@ -1 +1,3 @@
 SUBDIRS = src po
+
+EXTRA_DIST = HACKING
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-pk-helper-0.1.0/NEWS new/cups-pk-helper-0.1.1/NEWS
--- old/cups-pk-helper-0.1.0/NEWS       2010-02-19 16:59:04.000000000 +0100
+++ new/cups-pk-helper-0.1.1/NEWS       2011-01-13 13:11:06.000000000 +0100
@@ -1,4 +1,17 @@
 =============
+Version 0.1.1
+=============
+
++ Make the include/exclude schemes work when getting devices with cups 1.4
+  (Dominique Leuenberger)
++ Fix confusion between IPP and HTTP status when getting/putting a file
+  (Vincent)
++ Clarify a string. (Vincent)
++ Add some basic documentation. (Vincent)
++ Build system improvements. (Vincent)
++ First translations: cz (Mrs Jenkins), de (Andre Klapper), fr (Vincent).
+
+=============
 Version 0.1.0
 =============
 
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-pk-helper-0.1.0/README new/cups-pk-helper-0.1.1/README
--- old/cups-pk-helper-0.1.0/README     2008-09-18 13:40:09.000000000 +0200
+++ new/cups-pk-helper-0.1.1/README     2010-09-08 18:59:43.000000000 +0200
@@ -0,0 +1,39 @@
+cups-pk-helper
+==============
+
+cups-pk-helper is a PolicyKit helper to configure cups with fine-grained
+privileges.
+
+For example, it's possible to let users enable/disable printers without
+requiring a password, while still requiring a password for editing printer
+settings. The full list of policies is described in
+src/org.opensuse.cupspkhelper.mechanism.policy.in.
+
+You may download updates to the package from:
+
+   http://www.freedesktop.org/software/cups-pk-helper/releases/
+
+
+Installation
+============
+
+See the file 'INSTALL'. If you are not using a released version of
+cups-pk-helper (for example, if you checked out the code from git), you
+first need to run './autogen.sh'.
+
+
+How to report bugs
+==================
+
+Bugs should be reported to the freedesktop.org bug tracking system:
+
+   https://bugs.freedesktop.org/ (product cups-pk-helper)
+
+You will need to create an account for yourself.
+
+Please read the following page on how to prepare a useful bug report:
+
+   https://bugs.freedesktop.org/page.cgi?id=bug-writing.html
+
+Please read the HACKING file for information on where to send changes or
+bugfixes for this package.
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-pk-helper-0.1.0/TODO new/cups-pk-helper-0.1.1/TODO
--- old/cups-pk-helper-0.1.0/TODO       2010-02-19 01:53:06.000000000 +0100
+++ new/cups-pk-helper-0.1.1/TODO       1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-Connection.restartJob now takes optional job_hold_until arg
-movejob
-cancelAllJobs
-authenticateJob ?
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-pk-helper-0.1.0/compile new/cups-pk-helper-0.1.1/compile
--- old/cups-pk-helper-0.1.0/compile    2010-02-19 17:03:07.000000000 +0100
+++ new/cups-pk-helper-0.1.1/compile    2011-01-13 13:11:53.000000000 +0100
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2009-10-06.20; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
 # Foundation, Inc.
@@ -124,9 +124,9 @@
 ret=$?
 
 if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
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-pk-helper-0.1.0/config.h.in new/cups-pk-helper-0.1.1/config.h.in
--- old/cups-pk-helper-0.1.0/config.h.in        2010-02-19 17:03:06.000000000 
+0100
+++ new/cups-pk-helper-0.1.1/config.h.in        2011-01-13 13:11:53.000000000 
+0100
@@ -82,6 +82,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_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/cups-pk-helper-0.1.0/configure.ac new/cups-pk-helper-0.1.1/configure.ac
--- old/cups-pk-helper-0.1.0/configure.ac       2010-02-17 12:21:36.000000000 
+0100
+++ new/cups-pk-helper-0.1.1/configure.ac       2010-09-27 12:36:59.000000000 
+0200
@@ -1,5 +1,5 @@
-AC_INIT([cups-pk-helper], [0.1.0],
-        [mailto:vuntz@xxxxxxxxxx])
+AC_INIT([cups-pk-helper], [0.1.1],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=cups-pk-helper])
 AC_CONFIG_SRCDIR(src/cups-pk-helper-mechanism.c)
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -28,12 +28,12 @@
 # Compiler Warnings
 GNOME_COMPILE_WARNINGS(maximum)
 
-AC_ARG_ENABLE(deprecations,
-              [AC_HELP_STRING([--enable-deprecations],
-                              [warn about deprecated usages [default=no]])],,
-              [enable_deprecations=no])
+AC_ARG_ENABLE(deprecation_flags,
+              [AC_HELP_STRING([--enable-deprecation-flags],
+                              [use *_DISABLE_DEPRECATED flags 
@<:@default=no@:>@])],,
+              [enable_deprecation_flags=no])
 
-if test "x$enable_deprecations" = "xyes"; then
+if test "x$enable_deprecation_flags" = "xyes"; then
    DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED
    AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 fi
@@ -70,3 +70,27 @@
 src/Makefile
 po/Makefile.in
 ])
+
+dnl ---------------------------------------------------------------------------
+dnl - Show summary
+dnl ---------------------------------------------------------------------------
+
+echo "
+              cups-pk-helper $VERSION
+              `echo cups-pk-helper $VERSION | sed "s/./=/g"`
+
+        prefix:                        ${prefix}
+        exec_prefix:                   ${exec_prefix}
+        libdir:                        ${libdir}
+        bindir:                        ${bindir}
+        sbindir:                       ${sbindir}
+        sysconfdir:                    ${sysconfdir}
+        localstatedir:                 ${localstatedir}
+        datadir:                       ${datadir}
+        source code location:          ${srcdir}
+        compiler:                      ${CC}
+        cflags:                        ${CFLAGS}
+        Maintainer mode:               ${USE_MAINTAINER_MODE}
+        Use *_DISABLE_DEPRECATED:      ${enable_deprecation_flags}
+
+"
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-pk-helper-0.1.0/po/LINGUAS new/cups-pk-helper-0.1.1/po/LINGUAS
--- old/cups-pk-helper-0.1.0/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100
+++ new/cups-pk-helper-0.1.1/po/LINGUAS 2010-12-20 17:50:56.000000000 +0100
@@ -0,0 +1,4 @@
+# please keep this list sorted alphabetically
+cs
+de
+fr
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-pk-helper-0.1.0/po/Makefile.in.in 
new/cups-pk-helper-0.1.1/po/Makefile.in.in
--- old/cups-pk-helper-0.1.0/po/Makefile.in.in  2010-02-19 17:03:02.000000000 
+0100
+++ new/cups-pk-helper-0.1.1/po/Makefile.in.in  2011-01-13 13:11:48.000000000 
+0100
@@ -56,7 +56,7 @@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" 
$(srcdir)/LINGUAS; else echo "$(ALL_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 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' 
'\n'|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)" -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)
 
@@ -129,7 +129,7 @@
        done
 
 # Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
 
 # Define this as empty until I found a useful application.
 install-exec installcheck:
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-pk-helper-0.1.0/po/cs.po new/cups-pk-helper-0.1.1/po/cs.po
--- old/cups-pk-helper-0.1.0/po/cs.po   1970-01-01 01:00:00.000000000 +0100
+++ new/cups-pk-helper-0.1.1/po/cs.po   2010-12-20 17:50:06.000000000 +0100
@@ -0,0 +1,100 @@
+# Czech translation of cups-pk-helper.
+# Copyright (C) 2010 cups-pk-helper'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the cups-pk-helper 
package.
+# Mrs Jenkins <mrs.jenkins.oh.yeah@xxxxxxxxx>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cups-pk-helper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-27 22:36+0200\n"
+"PO-Revision-Date: 2010-05-27 22:36+0200\n"
+"Last-Translator: Mrs Jenkins <mrs.jenkins.oh.yeah@xxxxxxxxx>\n"
+"Language-Team: Czech <cs@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:1
+msgid "Add/Remove/Edit a class"
+msgstr "Přidat/Odstranit/Upravit třídu"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:2
+msgid "Add/Remove/Edit a local printer"
+msgstr "Přidat/Odstranit/Upravit místní tiskárnu"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:3
+msgid "Add/Remove/Edit a printer"
+msgstr "Přidat/Odstranit/Upravit tiskárnu"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:4
+msgid "Add/Remove/Edit a remote printer"
+msgstr "Přidat/Odstranit/Upravit vzdálenou tiskárnu"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:5
+msgid "Enable/Disable a printer"
+msgstr "Povolit/Zakázat tiskárnu"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:6
+msgid "Get devices"
+msgstr "Získat zařízení"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:7
+msgid "Get/Set server settings"
+msgstr "Získat/Upravit nastavení serveru"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:8
+msgid "Privileges are required to add/remove/edit a class."
+msgstr "K přidání/odebrání/úpravě třídy jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:9
+msgid "Privileges are required to add/remove/edit a local printer."
+msgstr "K přidání/odebrání/úpravě místní tiskárny jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:10
+msgid "Privileges are required to add/remove/edit a printer."
+msgstr "K přidání/odebrání/úpravě tiskárny jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:11
+msgid "Privileges are required to add/remove/edit a remote printer."
+msgstr "K přidání/odebrání/úpravě vzdálené tiskárny jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:12
+msgid "Privileges are required to enable/disable a printer, or a class."
+msgstr "K povolení/zakázání tiskárny nebo třídy jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:13
+msgid "Privileges are required to get devices."
+msgstr "K získání zařízení jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:14
+msgid "Privileges are required to get/set server settings."
+msgstr "K získání/úpravě nastavení serveru jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:15
+msgid ""
+"Privileges are required to restart/cancel/edit a job owned by another user."
+msgstr ""
+"K restartu/zrušení/úpravě úlohy spuštěné pod jiným uživatelem jsou vyžadována 
oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:16
+msgid "Privileges are required to restart/cancel/edit a job."
+msgstr "K restartu/zrušení/úpravě úlohy jsou vyžadována oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:17
+msgid ""
+"Privileges are required to set a printer, or a class, as default printer."
+msgstr ""
+"K nastavení tiskárny nebo třídy jako výchozí tiskárny jsou vyžadována 
oprávnění."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:18
+msgid "Restart/Cancel/Edit a job"
+msgstr "Restartuj/Zruš/Uprav úlohu"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:19
+msgid "Restart/Cancel/Edit a job owned by another user"
+msgstr "Restartovat/Zrušit/Upravit úlohu spuštěnou pod jiným uživatelem"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:20
+msgid "Set a printer as default printer"
+msgstr "Nastavit tiskárnu jako výchozí"
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-pk-helper-0.1.0/po/de.po new/cups-pk-helper-0.1.1/po/de.po
--- old/cups-pk-helper-0.1.0/po/de.po   1970-01-01 01:00:00.000000000 +0100
+++ new/cups-pk-helper-0.1.1/po/de.po   2010-12-20 17:49:55.000000000 +0100
@@ -0,0 +1,98 @@
+# German translation of cups-pk-helper.
+# Copyright (C) 2010 cups-pk-helper's copyright holder
+# This file is distributed under the same license as the cups-pk-helper 
package.
+# Andre Klapper <ak-47@xxxxxxx>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cups-pk-helper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-27 22:36+0200\n"
+"PO-Revision-Date: 2010-06-04 22:18+0200\n"
+"Last-Translator: Andre Klapper <ak-47@xxxxxxx>\n"
+"Language-Team: German <de@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:1
+msgid "Add/Remove/Edit a class"
+msgstr "Eine Klasse hinzufügen/entfernen/bearbeiten"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:2
+msgid "Add/Remove/Edit a local printer"
+msgstr "Einen lokalen Drucker hinzufügen/entfernen/bearbeiten"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:3
+msgid "Add/Remove/Edit a printer"
+msgstr "Einen Drucker hinzufügen/entfernen/bearbeiten"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:4
+msgid "Add/Remove/Edit a remote printer"
+msgstr "Einen Netzwerkdrucker hinzufügen/entfernen/bearbeiten"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:5
+msgid "Enable/Disable a printer"
+msgstr "Einen Drucker aktivieren/deaktivieren"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:6
+msgid "Get devices"
+msgstr "Geräte erhalten"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:7
+msgid "Get/Set server settings"
+msgstr "Servereinstellungen erhalten/setzen"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:8
+msgid "Privileges are required to add/remove/edit a class."
+msgstr "Rechte werden benötigt um eine Klasse hinzuzufügen/zu entfernen/zu 
bearbeiten."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:9
+msgid "Privileges are required to add/remove/edit a local printer."
+msgstr "Rechte werden benötigt um einen lokalen Drucker hinzuzufügen/zu 
entfernen/zu bearbeiten."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:10
+msgid "Privileges are required to add/remove/edit a printer."
+msgstr "Rechte werden benötigt um einen Drucker hinzuzufügen/zu entfernen/zu 
bearbeiten."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:11
+msgid "Privileges are required to add/remove/edit a remote printer."
+msgstr "Rechte werden benötigt um einen Netzwerkdrucker hinzuzufügen/zu 
entfernen/zu bearbeiten."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:12
+msgid "Privileges are required to enable/disable a printer, or a class."
+msgstr "Rechte werden benötigt um einen Drucker zu aktivieren/deaktivieren, 
oder eine Klasse."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:13
+msgid "Privileges are required to get devices."
+msgstr "Rechte werden benötigt um Geräte zu erhalten."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:14
+msgid "Privileges are required to get/set server settings."
+msgstr "Rechte werden benötigt um Servereinstellungen zu erhalten/zu setzen."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:15
+msgid ""
+"Privileges are required to restart/cancel/edit a job owned by another user."
+msgstr "Rechte werden benötigt um einen Auftrag neuzustarten/abzubrechen/zu 
bearbeiten, der einem anderen Benutzer gehört."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:16
+msgid "Privileges are required to restart/cancel/edit a job."
+msgstr "Rechte werden benötigt um einen Auftrag neuzustarten/abzubrechen/zu 
bearbeiten."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:17
+msgid ""
+"Privileges are required to set a printer, or a class, as default printer."
+msgstr "Rechte werden benötigt um einen Drucker oder eine Klasse als 
Vorgabedrucker zu setzen."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:18
+msgid "Restart/Cancel/Edit a job"
+msgstr "Einen Auftrag neustarten/abbrechen/bearbeiten"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:19
+msgid "Restart/Cancel/Edit a job owned by another user"
+msgstr "Einen Auftrag neustarten/abbrechen/bearbeiten, der einem anderen 
Benutzer gehört."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:20
+msgid "Set a printer as default printer"
+msgstr "Einen Drucker als Vorgabedrucker setzen"
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-pk-helper-0.1.0/po/fr.po new/cups-pk-helper-0.1.1/po/fr.po
--- old/cups-pk-helper-0.1.0/po/fr.po   1970-01-01 01:00:00.000000000 +0100
+++ new/cups-pk-helper-0.1.1/po/fr.po   2010-09-13 05:54:03.000000000 +0200
@@ -0,0 +1,98 @@
+# French translation of cups-pk-helper.
+# Copyright (C) 2010
+# This file is distributed under the same license as the cups-pk-helper 
package.
+# Vincent Untz <vuntz@xxxxxxxxx>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cups-pk-helper.master.fr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-08 09:22+0000\n"
+"PO-Revision-Date: 2010-09-08 11:23+0200\n"
+"Last-Translator: Vincent Untz <vuntz@xxxxxxxxx>\n"
+"Language-Team: GNOME French Team <gnomefr@xxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:1
+msgid "Add/Remove/Edit a class"
+msgstr "Ajouter/Supprimer/Modifier une classe"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:2
+msgid "Add/Remove/Edit a local printer"
+msgstr "Ajouter/Supprimer/Modifier une imprimante locale"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:3
+msgid "Add/Remove/Edit a printer"
+msgstr "Ajouter/Supprimer/Modifier une imprimante"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:4
+msgid "Add/Remove/Edit a remote printer"
+msgstr "Ajouter/Supprimer/Modifier une imprimante réseau"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:5
+msgid "Enable/Disable a printer"
+msgstr "Activer/Désactiver une imprimante"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:6
+msgid "Get list of available devices"
+msgstr "Obtenir la liste des périphériques disponibles"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:7
+msgid "Get/Set server settings"
+msgstr "Obtenir/Modifier les paramètres du serveur"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:8
+msgid "Privileges are required to add/remove/edit a class."
+msgstr "Des privilèges sont requis pour ajouter/supprimer/modifier une classe."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:9
+msgid "Privileges are required to add/remove/edit a local printer."
+msgstr "Des privilèges sont requis pour ajouter/supprimer/modifier une 
imprimante locale."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:10
+msgid "Privileges are required to add/remove/edit a printer."
+msgstr "Des privilèges sont requis pour ajouter/supprimer/modifier une 
imprimante."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:11
+msgid "Privileges are required to add/remove/edit a remote printer."
+msgstr "Des privilèges sont requis pour ajouter/supprimer/modifier une 
imprimante réseau"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:12
+msgid "Privileges are required to enable/disable a printer, or a class."
+msgstr "Des privilèges sont requis pour activer/désactiver une imprimante ou 
une classe."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:13
+msgid "Privileges are required to get list of available devices."
+msgstr "Des privilèges sont requis pour obtenir la liste des périphériques 
disponibles."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:14
+msgid "Privileges are required to get/set server settings."
+msgstr "Des privilèges sont requis pour obtenir/modifier les paramètres du 
serveur."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:15
+msgid ""
+"Privileges are required to restart/cancel/edit a job owned by another user."
+msgstr "Des privilèges sont requis pour redémarrer/annuler/modifier une tâche 
d'un autre utilisateur."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:16
+msgid "Privileges are required to restart/cancel/edit a job."
+msgstr "Des privilèges sont requis pour redémarrer/annuler/modifier une tâche."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:17
+msgid ""
+"Privileges are required to set a printer, or a class, as default printer."
+msgstr "Des privilèges sont requis pour définir une imprimante ou une classe 
par défaut."
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:18
+msgid "Restart/Cancel/Edit a job"
+msgstr "Redémarrer/Annuler/Modifier une tâche"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:19
+msgid "Restart/Cancel/Edit a job owned by another user"
+msgstr "Redémarrer/Annuler/Modifier une tâche d'un autre utilisateur"
+
+#: ../src/org.opensuse.cupspkhelper.mechanism.policy.in.h:20
+msgid "Set a printer as default printer"
+msgstr "Définir une imprimante par défaut"
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-pk-helper-0.1.0/src/Makefile.am 
new/cups-pk-helper-0.1.1/src/Makefile.am
--- old/cups-pk-helper-0.1.0/src/Makefile.am    2010-02-17 12:21:36.000000000 
+0100
+++ new/cups-pk-helper-0.1.1/src/Makefile.am    2010-09-20 17:11:35.000000000 
+0200
@@ -1,18 +1,13 @@
-INCLUDES =                             \
-       $(WARN_CFLAGS)                  \
-       $(DISABLE_DEPRECATED_CFLAGS)    \
-       $(CUPS_PK_CFLAGS)
-
 libexec_PROGRAMS = cups-pk-helper-mechanism
-
 noinst_PROGRAMS =      \
        test-cups       \
        test-cups-pk
 
-cups-pk-helper-mechanism-glue.h: $(srcdir)/cups-pk-helper-mechanism.xml
-       $(AM_V_GEN)dbus-binding-tool --prefix=cph_mechanism --mode=glib-server  
\
-                         --output=cups-pk-helper-mechanism-glue.h      \
-                         $(srcdir)/cups-pk-helper-mechanism.xml
+AM_CPPFLAGS =                          \
+       $(CUPS_PK_CFLAGS)               \
+       $(DISABLE_DEPRECATED_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
 
 cups_pk_helper_mechanism_SOURCES =     \
        cups.c                          \
@@ -35,31 +30,35 @@
 test_cups_pk_SOURCES = \
        test-cups-pk.c
 test_cups_pk_CFLAGS =  \
+       $(AM_CFLAGS)    \
        $(CUPS_PK_GNOME_CFLAGS)
 test_cups_pk_LDADD =           \
        $(CUPS_PK_GNOME_LIBS)   \
        $(CUPS_PK_LIBS)         \
        $(CUPS_LIBS)
 
-BUILT_SOURCES = cups-pk-helper-mechanism-glue.h
+cups-pk-helper-mechanism-glue.h: $(srcdir)/cups-pk-helper-mechanism.xml
+       $(AM_V_GEN)dbus-binding-tool --prefix=cph_mechanism --mode=glib-server  
\
+                       --output=cups-pk-helper-mechanism-glue.h        \
+                       $(srcdir)/cups-pk-helper-mechanism.xml
 
+BUILT_SOURCES = cups-pk-helper-mechanism-glue.h
 
-dbus_servicesdir = $(datadir)/dbus-1/system-services
 dbus_confdir = $(sysconfdir)/dbus-1/system.d
-polkitdir = $(datadir)/polkit-1/actions
+dbus_conf_DATA = org.opensuse.CupsPkHelper.Mechanism.conf
 
+dbus_servicesdir = $(datadir)/dbus-1/system-services
 dbus_services_in_files = org.opensuse.CupsPkHelper.Mechanism.service.in
-polkit_in_files = org.opensuse.cupspkhelper.mechanism.policy.in
-
 dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
 
 $(dbus_services_DATA): $(dbus_services_in_files)
        $(AM_V_GEN)sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
-dbus_conf_DATA = org.opensuse.CupsPkHelper.Mechanism.conf
+polkitdir = $(datadir)/polkit-1/actions
+polkit_in_files = org.opensuse.cupspkhelper.mechanism.policy.in
+polkit_DATA = $(polkit_in_files:.policy.in=.policy)
 
 @INTLTOOL_POLICY_RULE@
-polkit_DATA = $(polkit_in_files:.policy.in=.policy)
 
 EXTRA_DIST =                                           \
        $(dbus_services_in_files)                       \
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-pk-helper-0.1.0/src/cups.c new/cups-pk-helper-0.1.1/src/cups.c
--- old/cups-pk-helper-0.1.0/src/cups.c 2010-02-19 16:55:39.000000000 +0100
+++ new/cups-pk-helper-0.1.1/src/cups.c 2010-09-02 15:13:04.000000000 +0200
@@ -518,6 +518,20 @@
 }
 
 static void
+_cph_cups_set_internal_status_from_http (CphCups       *cups,
+                                         http_status_t  status)
+{
+        if (cups->priv->internal_status)
+                g_free (cups->priv->internal_status);
+
+        /* Only 2xx answers are okay */
+        if (status < HTTP_OK ||
+            status >= HTTP_MULTIPLE_CHOICES)
+                cups->priv->internal_status = g_strdup (httpStatus (status));
+        else
+                cups->priv->internal_status = NULL;
+}
+static void
 _cph_cups_set_error_from_reply (CphCups *cups,
                                 ipp_t   *reply)
 {
@@ -997,9 +1011,10 @@
                    const char *resource,
                    const char *filename)
 {
-        struct stat file_stat;
-        uid_t       uid;
-        gid_t       gid;
+        http_status_t status;
+        struct stat   file_stat;
+        uid_t         uid;
+        gid_t         gid;
 
         g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE);
 
@@ -1012,15 +1027,14 @@
         uid = file_stat.st_uid;
         gid = file_stat.st_gid;
 
-        /* reset the internal status: we'll use the cups status */
+        /* reset the internal status: we'll use the http status */
         _cph_cups_set_internal_status (cups, NULL);
 
-        cups->priv->last_status = cupsGetFile (cups->priv->connection,
-                                               resource, filename);
+        status = cupsGetFile (cups->priv->connection, resource, filename);
 
         /* FIXME: There's a bug where the cups connection can fail with EPIPE.
          * We're work-arounding it here until it's fixed in cups. */
-        if (cups->priv->last_status != HTTP_OK) {
+        if (status != HTTP_OK) {
                 if (cph_cups_reconnect (cups)) {
                         int fd;
 
@@ -1031,13 +1045,14 @@
 
                         _cph_cups_set_internal_status (cups, NULL);
 
-                        cups->priv->last_status = cupsGetFile 
(cups->priv->connection,
-                                                               resource,
-                                                               filename);
+                        status = cupsGetFile (cups->priv->connection,
+                                              resource, filename);
                 }
         }
 
-        return cups->priv->last_status == HTTP_OK;
+        _cph_cups_set_internal_status_from_http (cups, status);
+
+        return (status == HTTP_OK);
 }
 
 gboolean
@@ -1045,6 +1060,8 @@
                    const char *resource,
                    const char *filename)
 {
+        http_status_t status;
+
         g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE);
 
         if (!_cph_cups_is_resource_valid (cups, resource))
@@ -1052,17 +1069,18 @@
         if (!_cph_cups_is_filename_valid (cups, filename))
                 return FALSE;
 
-        /* reset the internal status: we'll use the cups status */
+        /* reset the internal status: we'll use the http status */
         _cph_cups_set_internal_status (cups, NULL);
 
-        cups->priv->last_status = cupsPutFile (cups->priv->connection,
-                                               resource, filename);
+        status = cupsPutFile (cups->priv->connection, resource, filename);
+
+        _cph_cups_set_internal_status_from_http (cups, status);
 
         /* CUPS is being restarted, so we need to reconnect */
         cph_cups_reconnect (cups);
 
-        return (cups->priv->last_status == HTTP_OK ||
-                cups->priv->last_status == HTTP_CREATED);
+        return (status == HTTP_OK ||
+                status == HTTP_CREATED);
 }
 
 /* Functions that are for the server in general */
@@ -1227,12 +1245,12 @@
                 timeout_param = timeout;
 
         if (include_schemes && len_include > 0)
-                include_schemes_param = g_strjoin (",", include_schemes);
+                include_schemes_param = g_strjoinv (",", (char **) 
include_schemes);
         else
                 include_schemes_param = g_strdup (CUPS_INCLUDE_ALL);
 
         if (exclude_schemes && len_exclude > 0)
-                exclude_schemes_param = g_strjoin (",", exclude_schemes);
+                exclude_schemes_param = g_strjoinv (",", (char **) 
exclude_schemes);
         else
                 exclude_schemes_param = g_strdup (CUPS_EXCLUDE_NONE);
 
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-pk-helper-0.1.0/src/org.opensuse.cupspkhelper.mechanism.policy.in 
new/cups-pk-helper-0.1.1/src/org.opensuse.cupspkhelper.mechanism.policy.in
--- old/cups-pk-helper-0.1.0/src/org.opensuse.cupspkhelper.mechanism.policy.in  
2010-02-16 21:06:34.000000000 +0100
+++ new/cups-pk-helper-0.1.1/src/org.opensuse.cupspkhelper.mechanism.policy.in  
2010-09-08 11:19:43.000000000 +0200
@@ -18,8 +18,8 @@
   </action>
 
   <action id="org.opensuse.cupspkhelper.mechanism.devices-get">
-    <_description>Get devices</_description>
-    <_message>Privileges are required to get devices.</_message>
+    <_description>Get list of available devices</_description>
+    <_message>Privileges are required to get list of available 
devices.</_message>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep</allow_active>


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



Remember to have fun...

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