Hello community,
here is the log from the commit of package gnome-cups-manager
checked in at Thu Jul 6 12:00:48 CEST 2006.
--------
--- GNOME/gnome-cups-manager/gnome-cups-manager.changes 2006-06-06 01:02:45.000000000 +0200
+++ gnome-cups-manager/gnome-cups-manager.changes 2006-07-06 10:02:28.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 6 10:02:24 CEST 2006 - aj@suse.de
+
+- Fix build.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-cups-manager.spec ++++++
--- /var/tmp/diff_new_pack.66Z8nh/_old 2006-07-06 11:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.66Z8nh/_new 2006-07-06 11:59:50.000000000 +0200
@@ -13,7 +13,7 @@
Name: gnome-cups-manager
BuildRequires: cups cups-devel gcc-c++ gnome-common gnutls-devel intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeprintui-devel libgnomeui-devel libsmbclient libsmbclient-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files
Version: 0.32cvs20060120
-Release: 38
+Release: 40
URL: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPL
@@ -108,6 +108,8 @@
/opt/gnome/include/libgnomecups-1/libgnomecups/*
%changelog -n gnome-cups-manager
+* Thu Jul 06 2006 - aj@suse.de
+- Fix build.
* Tue Jun 06 2006 - lewing@suse.de
- Listen to property changes in the printer properties page.
(bnc #154299)
++++++ autodetect-usb-printers.patch ++++++
--- /var/tmp/diff_new_pack.66Z8nh/_old 2006-07-06 11:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.66Z8nh/_new 2006-07-06 11:59:50.000000000 +0200
@@ -1,6 +1,5 @@
-diff -ur gnome-cups-manager-0.32cvs20060120.orig/libgnomecups/gnome-cups-ui-connection.c gnome-cups-manager-0.32cvs20060120/libgnomecups/gnome-cups-ui-connection.c
---- gnome-cups-manager-0.32cvs20060120.orig/libgnomecups/gnome-cups-ui-connection.c 2006-04-06 12:44:23.000000000 -0400
-+++ gnome-cups-manager-0.32cvs20060120/libgnomecups/gnome-cups-ui-connection.c 2006-04-06 12:45:05.000000000 -0400
+--- gnome-cups-manager-0.32cvs20060120/libgnomecups/gnome-cups-ui-connection.c
++++ gnome-cups-manager-0.32cvs20060120/libgnomecups/gnome-cups-ui-connection.c
@@ -38,6 +38,7 @@
#include
#include
++++++ bnc-6238.patch ++++++
--- /var/tmp/diff_new_pack.66Z8nh/_old 2006-07-06 11:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.66Z8nh/_new 2006-07-06 11:59:50.000000000 +0200
@@ -1,10 +1,7 @@
Index: libgnomecups/gnome-cups-ui-driver.c
-===================================================================
-RCS file: /cvs/gnome/gnome-cups-manager/libgnomecups/gnome-cups-ui-driver.c,v
-retrieving revision 1.19
-diff -u -r1.19 gnome-cups-ui-driver.c
---- libgnomecups/gnome-cups-ui-driver.c 18 Jan 2006 21:19:09 -0000 1.19
-+++ libgnomecups/gnome-cups-ui-driver.c 11 May 2006 17:17:29 -0000
+================================================================================
+--- libgnomecups/gnome-cups-ui-driver.c
++++ libgnomecups/gnome-cups-ui-driver.c
@@ -22,6 +22,8 @@
#include
++++++ gnome-cups-manager-154299.patch ++++++
--- /var/tmp/diff_new_pack.66Z8nh/_old 2006-07-06 11:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.66Z8nh/_new 2006-07-06 11:59:50.000000000 +0200
@@ -1,6 +1,5 @@
-diff -u gnome-cups-manager-0.32cvs20060120.orig/gnome-cups-manager/printer-properties.c gnome-cups-manager-0.32cvs20060120-me/gnome-cups-manager/printer-properties.c
---- gnome-cups-manager-0.32cvs20060120.orig/gnome-cups-manager/printer-properties.c 2006-01-08 10:33:50.000000000 -0600
-+++ gnome-cups-manager-0.32cvs20060120-me/gnome-cups-manager/printer-properties.c 2006-06-05 17:56:53.000000000 -0500
+--- gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/printer-properties.c
++++ gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/printer-properties.c
@@ -436,6 +436,14 @@
close_window (xml);
}
++++++ gnome-cups-manager-suse-lp-group.patch ++++++
--- /var/tmp/diff_new_pack.66Z8nh/_old 2006-07-06 11:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.66Z8nh/_new 2006-07-06 11:59:50.000000000 +0200
@@ -2,12 +2,9 @@
? icons/emblem-default.icon
? icons/emblem-paused.icon
Index: libgnomecups/gnome-cups-permission.c
-===================================================================
-RCS file: /cvs/gnome/gnome-cups-manager/libgnomecups/gnome-cups-permission.c,v
-retrieving revision 1.3
-diff -u -p -u -r1.3 gnome-cups-permission.c
---- libgnomecups/gnome-cups-permission.c 19 Jan 2006 15:33:04 -0000 1.3
-+++ libgnomecups/gnome-cups-permission.c 23 May 2006 20:57:49 -0000
+================================================================================
+--- libgnomecups/gnome-cups-permission.c
++++ libgnomecups/gnome-cups-permission.c
@@ -27,6 +27,8 @@
#include
#include
@@ -17,7 +14,7 @@
#include
static char *gnome_cups_app_path = NULL;
-@@ -34,7 +36,36 @@ static char *gnome_cups_app_path = NULL;
+@@ -34,7 +36,36 @@
gboolean
gnome_cups_can_admin ()
{
++++++ popt-fix.patch ++++++
--- /var/tmp/diff_new_pack.66Z8nh/_old 2006-07-06 11:59:50.000000000 +0200
+++ /var/tmp/diff_new_pack.66Z8nh/_new 2006-07-06 11:59:50.000000000 +0200
@@ -1,6 +1,6 @@
---- gnome-cups-manager-0.32cvs20060120/gnome-cups-add/add-printer.c 2006-01-19 17:02:12.000000000 -0500
-+++ gnome-cups-manager-0.32cvs20060201/gnome-cups-add/add-printer.c 2006-02-01 12:29:08.000000000 -0500
-@@ -327,27 +327,23 @@
+--- gnome-cups-manager-0.32cvs20060120/gnome-cups-add/add-printer.c
++++ gnome-cups-manager-0.32cvs20060120/gnome-cups-add/add-printer.c
+@@ -327,56 +327,42 @@
return found;
}
@@ -33,7 +33,13 @@
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-@@ -360,23 +356,13 @@
+ textdomain (GETTEXT_PACKAGE);
+
+- program = gnome_program_init ("gnome-cups-add", VERSION, LIBGNOMEUI_MODULE, argc, argv,
++ program = gnome_program_init ("gnome-cups-add", PACKAGE_VERSION, LIBGNOMEUI_MODULE, argc, argv,
+ GNOME_PROGRAM_STANDARD_PROPERTIES,
+ GNOME_PARAM_HUMAN_READABLE_NAME, _("Add a Printer"),
+ GNOME_PARAM_POPT_FLAGS, POPT_CONTEXT_POSIXMEHARDER,
GNOME_PARAM_POPT_TABLE, options,
NULL);
@@ -51,7 +57,7 @@
- break;
- }
+ if (print_version) {
-+ fprintf (stdout, "gnome-printer-add version %s\n", VERSION);
++ fprintf (stdout, "gnome-printer-add version %s\n", PACKAGE_VERSION);
+ exit (0);
}
@@ -87,3 +93,25 @@
return 0;
}
+--- gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-cups-icon.c
++++ gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-cups-icon.c
+@@ -123,7 +123,7 @@
+ main (int argc, char *argv[])
+ {
+ gnome_program_init ("gnome-cups-icon",
+- VERSION,
++ PACKAGE_VERSION,
+ LIBGNOMEUI_MODULE, argc, argv,
+ GNOME_PROGRAM_STANDARD_PROPERTIES,
+ GNOME_PARAM_HUMAN_READABLE_NAME, _("Print Monitor"),
+--- gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-cups-manager.c
++++ gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-cups-manager.c
+@@ -217,7 +217,7 @@
+ };
+
+ program = gnome_program_init ("gnome-printer-view",
+- VERSION,
++ PACKAGE_VERSION,
+ LIBGNOMEUI_MODULE, argc, argv,
+ GNOME_PROGRAM_STANDARD_PROPERTIES,
+ GNOME_PARAM_POPT_TABLE, options,
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org