[Pkg-cups-devel] r312 -
cupsys/branches/cups-1.2-ubuntu/debian/patches
Martin Pitt
mpitt at costa.debian.org
Mon Jul 24 07:37:29 UTC 2006
Author: mpitt
Date: Mon Jul 24 07:37:28 2006
New Revision: 312
Added:
cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch (contents, props changed)
Log:
add 57_cupsaddsmb.dpatch (was dropped in Debian merge)
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch Mon Jul 24 07:37:28 2006
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 56_cupsaddsmb.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.2.1~/systemv/cupsaddsmb.c cupsys-1.2.1/systemv/cupsaddsmb.c
+--- cupsys-1.2.1~/systemv/cupsaddsmb.c 2006-07-01 10:54:43.000000000 +0000
++++ cupsys-1.2.1/systemv/cupsaddsmb.c 2006-07-01 12:14:15.000000000 +0000
+@@ -240,26 +240,30 @@
+ * Try to export it...
+ */
+
+- for (status = 0; !status;)
+- {
++/* for (status = 0; !status;)
++ { */
+ /*
+ * Get the password, as needed...
+ */
+
+ if (!SAMBAPassword)
+ {
+- snprintf(prompt, sizeof(prompt),
++ /* snprintf(prompt, sizeof(prompt),
+ _("Password for %s required to access %s via SAMBA: "),
+ SAMBAUser, SAMBAServer);
+
+ if ((SAMBAPassword = cupsGetPassword(prompt)) == NULL)
+- break;
++ break; */
++ _cupsLangPrintf(stderr,
++ _("Password for %s required to access %s via SAMBA: "),
++ SAMBAUser, SAMBAServer); /* localize */
++ SAMBAPassword = cupsGetPassword("");
+ }
+
+ status = cupsAdminExportSamba(dest, ppdfile, SAMBAServer,
+ SAMBAUser, SAMBAPassword,
+ Verbosity ? stderr : NULL);
+- }
++ /* } */
+
+ unlink(ppdfile);
+
More information about the Pkg-cups-devel
mailing list