On Tue, Mar 08, 2005 at 10:54:04PM +0100, Baptiste Carvello wrote:
> Hello,
>
> I'm afraid my corrected patch got lost in the mail, as it didn't make it
> to the web interface. I'm resending it just in case. Sorry if you
> receive it twice.
I've uploaded a NMU with the patch. Full NMU patch attached.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Naur gnome-cups-manager-0.25.bak/debian/changelog
gnome-cups-manager-0.25/debian/changelog
--- gnome-cups-manager-0.25.bak/debian/changelog 2005-03-12
19:49:53.000000000 +0100
+++ gnome-cups-manager-0.25/debian/changelog 2005-03-12 19:55:11.053530456
+0100
@@ -1,3 +1,11 @@
+gnome-cups-manager (0.25-2.1) unstable; urgency=high
+
+ * Non-maintainer upload
+ * Fix "Cannot add a new printer if executed as non root",
+ patch by Baptiste Carvello (Closes: #295310)
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 12 Mar 2005 19:42:44 +0100
+
gnome-cups-manager (0.25-2) unstable; urgency=high
* urgency=high because the changes only concern the translations which were
diff -Naur gnome-cups-manager-0.25.bak/debian/control
gnome-cups-manager-0.25/debian/control
--- gnome-cups-manager-0.25.bak/debian/control 2005-03-12 19:49:53.000000000
+0100
+++ gnome-cups-manager-0.25/debian/control 2005-03-12 20:11:28.366956232
+0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ross Burton <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 4.1.0), cdbs, gnome-pkg-tools, autotools-dev,
intltool, libgnomecups1.0-dev (>= 0.1.11), libgnomeprint2.2-dev (>= 2.6.1-6),
libglade2-dev (>= 2.4.0), libgnomeui-dev (>= 2.6.1.1-2)
-Uploaders: Debian GNOME Maintainers <[EMAIL PROTECTED]>, Akira TAGOH <[EMAIL
PROTECTED]>, Andreas Rottmann <[EMAIL PROTECTED]>, Andrew Lau <[EMAIL
PROTECTED]>, Carlos Perellà MarÃn <[EMAIL PROTECTED]>, Edd Dumbill <[EMAIL
PROTECTED]>, Emil Soleyman-Zomalan <[EMAIL PROTECTED]>, Gustavo Noronha Silva
<[EMAIL PROTECTED]>, J.H.M. Dassen (Ray) <[EMAIL PROTECTED]>, Joe Drew <[EMAIL
PROTECTED]>, Johannes Rohr <[EMAIL PROTECTED]>, Jordi Mallach <[EMAIL
PROTECTED]>, Jose Carlos Garcia Sogo <[EMAIL PROTECTED]>, Josselin Mouette
<[EMAIL PROTECTED]>, Marc 'HE' Brockschmidt <[EMAIL PROTECTED]>, OndÅej SurÃ
<[EMAIL PROTECTED]>, Rob Bradford <[EMAIL PROTECTED]>, Robert McQueen <[EMAIL
PROTECTED]>, Sebastien Bacher <[EMAIL PROTECTED]>, Takuo KITAME <[EMAIL
PROTECTED]>
+Uploaders: Debian GNOME Maintainers <[EMAIL PROTECTED]>, Akira TAGOH <[EMAIL
PROTECTED]>, Andreas Rottmann <[EMAIL PROTECTED]>, Andrew Lau <[EMAIL
PROTECTED]>, Carlos Perellà MarÃn <[EMAIL PROTECTED]>, Ed Boraas <[EMAIL
PROTECTED]>, Edd Dumbill <[EMAIL PROTECTED]>, Emil Soleyman-Zomalan <[EMAIL
PROTECTED]>, Gustavo Noronha Silva <[EMAIL PROTECTED]>, J.H.M. Dassen (Ray)
<[EMAIL PROTECTED]>, Joe Drew <[EMAIL PROTECTED]>, Johannes Rohr <[EMAIL
PROTECTED]>, Jordi Mallach <[EMAIL PROTECTED]>, Jose Carlos Garcia Sogo <[EMAIL
PROTECTED]>, Josselin Mouette <[EMAIL PROTECTED]>, Marc 'HE' Brockschmidt
<[EMAIL PROTECTED]>, OndÅej Surà <[EMAIL PROTECTED]>, Rob Bradford <[EMAIL
PROTECTED]>, Robert McQueen <[EMAIL PROTECTED]>, Sebastien Bacher <[EMAIL
PROTECTED]>, Sjoerd Simons <[EMAIL PROTECTED]>, Takuo KITAME <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
Package: gnome-cups-manager
diff -Naur gnome-cups-manager-0.25.bak/debian/patches/change-su-command.diff
gnome-cups-manager-0.25/debian/patches/change-su-command.diff
--- gnome-cups-manager-0.25.bak/debian/patches/change-su-command.diff
2005-03-12 19:49:53.000000000 +0100
+++ gnome-cups-manager-0.25/debian/patches/change-su-command.diff
2005-03-12 20:11:14.923999872 +0100
@@ -1,11 +1,37 @@
---- gnome-cups-manager-0.24.orig/libgnomecups/gnome-cups-permission.c
2004-08-18 23:02:59.000000000 +0200
-+++ gnome-cups-manager-0.24/libgnomecups/gnome-cups-permission.c
2004-08-24 12:54:51.000000000 +0200
-@@ -76,7 +76,7 @@
+--- gnome-cups-manager-0.25.orig/libgnomecups/gnome-cups-permission.c
2004-08-24 08:39:23.000000000 +0200
++++ gnome-cups-manager-0.25/libgnomecups/gnome-cups-permission.c
2005-03-07 14:47:43.000000000 +0100
+@@ -76,20 +76,28 @@
gboolean force_admin, GtkWidget *toplevel)
{
static char const *su_app[] = {
- "gnomesu"
-+ "gksu", "--", "--"
++ "gksu"
};
char const **args = g_new0 (char const *, argc + G_N_ELEMENTS (su_app) +
1 /* app */ + 1 /* null */);
+ unsigned offset, i = 0;
+ GError *err = NULL;
+
+- if (force_admin && !gnome_cups_can_admin ())
++ if (force_admin && !gnome_cups_can_admin ()){
+ for (i = 0 ; i < G_N_ELEMENTS (su_app) ; i++)
+ args [i] = (char *)su_app [i];
+- offset = i;
+- app = args [offset++] = gnome_cups_execname (app);
+- for (i = 0 ; i < argc ; i++)
+- args [i + offset] = argv [i];
++ offset = i;
++ app = gnome_cups_execname (app);
++ for (i = 0 ; i < argc ; i++)
++ app = (char *)g_strjoin((gchar *)" ", (gchar *)app,
(gchar *)argv [i], NULL);
++ args [offset++] = app;
++ }
++ else {
++ offset = i;
++ app = args [offset++] = gnome_cups_execname (app);
++ for (i = 0 ; i < argc ; i++)
++ args [i + offset] = argv [i];
++ }
+
+ g_spawn_async (NULL, (char **)args, NULL, G_SPAWN_SEARCH_PATH,
+ NULL, NULL, NULL, &err);
