--- gtklp-1.2.7.orig/debian/control +++ gtklp-1.2.7/debian/control @@ -0,0 +1,23 @@ +Source: gtklp +Section: x11 +Priority: optional +Maintainer: Zak B. Elep +Build-Depends: autoconf, automake, autotools-dev, cdbs, autopoint, debhelper (>= 5.0.0), gettext, libcups2-dev, libglib2.0-dev, libgtk2.0-dev, libtool, quilt +Build-Conflicts: autoconf2.13, automake1.4 +Standards-Version: 3.8.3 +Homepage: http://gtklp.sourceforge.net/ +Vcs-Git: git://code.zakame.net/git/gtklp.git +Vcs-Browser: http://code.zakame.net/gtklp.git + +Package: gtklp +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: printing tool for CUPS on the GNOME Desktop + GtkLP lets you print files under the Common Unix Printing System + (CUPS). Written in GTK+ 2.0 and for the GNOME desktop environment, + it supports multiple option settings for each printer it knows, + with all the standard CUPS options available. + . + Other features include localized dialogs for several languages, as + well as multiple interfaces; with a little more effort, you can use + GtkLP as a drop-in replacement for `lp'. --- gtklp-1.2.7.orig/debian/README.Debian +++ gtklp-1.2.7/debian/README.Debian @@ -0,0 +1,16 @@ +gtklp for Debian +---------------------- + +This release now uses GTK2. + +gtklp-1.0rel+1.0f-2 now has "/usr/bin/gtklpq" as the default "GtkLPQ +Command", so calls to GtkLPQ from GtkLP should now work correctly. +Also, `sensible-browser' (from debianutils) is used as the default +browser command instead of `netscape'. + +For those upgrading from older releases (0.9n), you should change the +"GtkLPQ Command" textbox under the GtkLP tab in gtklp from "1" to +"/usr/bin/gtklpq". + + -- Zak B. Elep , Sat Aug 27 09:04:08 2005 + --- gtklp-1.2.7.orig/debian/copyright +++ gtklp-1.2.7/debian/copyright @@ -0,0 +1,35 @@ +This is the Debian package for GtkLP, and it is built from sources +obtained from http://gtklp.sourceforge.net/ + +This package was debianized by Matthias Kabel on +Sun, 12 Nov 2000 18:04:06 +0100. + +Zak B. Elep took over the maintenance of this +package on Sun, 25 Apr 2004 13:30:01 +0800. + +Upstream Author: Tobias Mueller + +Copyright: Copyright (C) 1998-2004 Tobias Mueller + +License: + + 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 the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + 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., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA + +On Debian systems, the complete text of the GNU General Public License, +version 2, can be found in the file `/usr/share/common-licenses/GPL-2'. + +Zak B. Elep + --- gtklp-1.2.7.orig/debian/watch +++ gtklp-1.2.7/debian/watch @@ -0,0 +1,5 @@ +# Watch control file for package gtklp, used by uscan +# $Id: watch,v 1.2 2006-06-03 12:16:34 zakame Exp $ +version=3 +http://sf.net/gtklp/gtklp-(.+)\.src\.tar\.gz debian uupdate + --- gtklp-1.2.7.orig/debian/menu +++ gtklp-1.2.7/debian/menu @@ -0,0 +1,4 @@ +?package(gtklp):needs="X11" section="Applications/System/Administration"\ + title="gtklp" command="/usr/bin/gtklp" +?package(gtklp):needs="X11" section="Applications/System/Administration"\ + title="gtklpq" command="/usr/bin/gtklpq" --- gtklp-1.2.7.orig/debian/compat +++ gtklp-1.2.7/debian/compat @@ -0,0 +1 @@ +5 --- gtklp-1.2.7.orig/debian/README.source +++ gtklp-1.2.7/debian/README.source @@ -0,0 +1,33 @@ +Building gtklp for Debian +------------------------- + +The gtklp source package uses quilt to apply and remove its +patches. Please refer to /usr/share/doc/quilt/README.source for +information about how to use quilt for source packages. + +The quilt series is generated from the Git repository, using TopGit +itself. This process is documented in +/usr/share/doc/topgit/HOWTO-tg2quilt.gz . + +The gtklp packages uses a branch layout similar to that described for +topgit(1) and git-buildpackage(1): + + bugs/*: fixes for Debian bugs, usually based upstream, but when a bugs + branch is based on the debian branch, it is not tracked by + topgit + + fixes/*: miscellaneous fixes, based upstream + + pristine-tar: delta files for pristine-tar(1) + + debian/*: Debian-specific changes not for upstrean, e.g., custom + links using Debian tools + +Package building is still done on the master branch: + + $ git checkout master + $ debian/rules tg-cleanexport + $ git buildpackage --git-ignore-new + $ git clean -df && git checkout -f + + -- Zak B. Elep , Fri, 28 Aug 2009 10:09:13 +0800 --- gtklp-1.2.7.orig/debian/changelog +++ gtklp-1.2.7/debian/changelog @@ -0,0 +1,411 @@ +gtklp (1.2.7-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: gtklp.h:99:1: error: unknown type name 'ppd_file_t'": + add patch from Ubuntu / Colin Watson: + - bugs/639032.diff: Include for ppd_file_t + (closes: #639032, LP: #831283). + * Fix "FTBFS format not a string literal and no format arguments [- + Werror=format-security]": add patch from Ubuntu / Daniel T Chen: + - bugs/644113.diff: Fix format string literals and some unused variables. + Resolves FTBFS. (Closes: #644113) + + -- gregor herrmann Mon, 21 Nov 2011 17:13:35 +0100 + +gtklp (1.2.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * There is an autopoint package now so build-depending on + it and remove cvs (Closes: #572471). + + -- Nico Golde Sun, 25 Jul 2010 20:29:38 +0200 + +gtklp (1.2.7-2) unstable; urgency=low + + * Use TopGit and Quilt to manage patches + * Re-add debian/patches, autogenerated from git branches + * debian/rules: call autogen.sh after applying patches + + -- Zak B. Elep Fri, 28 Aug 2009 10:55:54 +0800 + +gtklp (1.2.7-1) unstable; urgency=low + + * New Upstream Version + + No longer dumps core when unconfigured (Closes: #170025) + + No errors displayed while running gtklpq (Closes: 370491) + * Package now maintained in git, see http://code.zakame.net/gtklp.git + * Remove debian/patches, now merged in git + * debian/rules: + + Remove simple-patchsys.mk + + Rebuild Autotools at every package build, as documented + in autotools-dev + * debian/control: update policy version, add Vcs fields and + necessary Build-Depends for Autotools rebuild + * autogen.sh: use autopoint instead of gettextize + * include/defaults.h: increase printer name maximum length + (Closes: #422266) + + -- Zak B. Elep Tue, 25 Aug 2009 14:41:02 +0800 + +gtklp (1.2.6-1) unstable; urgency=low + + * New upstream release (Closes: #519834). + * Acknowledge NMU by petere@, thanks + * debian/control: + + Update maintainer email + + Update Standards-Version + + Revert Section back to x11 + + Remove obsolete versioned dependency on libcupsys2-dev (now libcups2-dev) + + Add ${misc:Depends} + * debian/patches: + + 15_configure.in_update: restructure configure.in and remove stuff + we don't need (gtk+1.2, forte, old file-dialog build) + + 20_update_autotools: regenerate after above patching + * debian/menu: + + Update menu sections + + -- Zak B. Elep Thu, 11 Dec 2008 16:22:59 +0800 + +gtklp (1.2.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Removed garbage files from 20_autotools_update.patch, to fix FTBFS if + built twice in a row. (Closes: #442589) + * Added Homepage control field. + + -- Peter Eisentraut Mon, 30 Jun 2008 10:57:38 +0200 + +gtklp (1.2.3-1) unstable; urgency=low + + * New upstream release + * debian/patches: + + Updated 20_autotools_update for automake1.10 + * debian/watch: + + Updated so uscan now works. + * debian/copyright: + + Separate copyright and license statements, thanks to + Nico Golde + + -- Zak B. Elep Tue, 12 Jun 2007 15:12:58 +0000 + +gtklp (1.2.2-1) unstable; urgency=low + + * New upstream version. + * debian/patches: + + Remove 15_autotools_freetypefix.patch and 19_po_updates.patch, + now merged in upstream. + + Update 20_autotools_update.patch, some of it has been merged + (notably ./intl) + * debian/copyright: + + Slightly touch, update source download location. + + -- Zak B. Elep Sat, 3 Jun 2006 20:36:46 +0800 + +gtklp (1.2.1-2) unstable; urgency=low + + * debian/control: + + Change Section to `gnome'. + + Bump Standards-Version. + + Slightly touch the synopsis and long description. + * debian/patches: + + Refresh patches and include annotations. + + Add 19_po_updates.patch , fixing Catalan (thanks to Lluis + Vilanova) and updating English and French translations. + (Closes: #367575) + + Update 20_autotools_update.patch to also update gettext. This + seems to break the touch-fu in debian/rules, so a `touch -r + m4/glibc2.m4 m4/gettext.m4` seems to be in order :/ + * debian/rules: + + Ensure that PO's get recompiled upon next build by removing + po/stamp-po on clean. + + Call `$(MAKE) distclean' earlier by appending to + `cleanbuilddir/gtklp' target so we can avoid rerunning + `configure' upon clean (which is due to the reversion of + 20_autotools_update.) + + Improve the touch-fu so we don't accidentally get autotools + rebuilt (or else we'll have a FTBFS.) See note on + 20_autotools_update.patch above. + * Remove Emacs local vars in this changelog. + + -- Zak B. Elep Mon, 22 May 2006 10:06:13 +0800 + +gtklp (1.2.1-1) unstable; urgency=low + + * New upstream release + * debian/patches: + - Rename and freshen patches. + + -- Zak B. Elep Sat, 4 Mar 2006 10:46:18 +0800 + +gtklp (1.2.0-1) unstable; urgency=low + + * New upstream release + * debian/patches: + - Added 15autotools_freetypefix.patch (sort out fixes) + - Updated 20autotools_update.patch + * debian/watch: + - Fix sourceforge watch. + * debian/rules: + - Use touch-fu instead of patching autotools with AM_MAINTAINER_MODE + to reduce diff size. + + -- Zak B. Elep Fri, 24 Feb 2006 10:21:48 +0800 + +gtklp (1.1.0-2) unstable; urgency=low + + * Move build system to CDBS + debhelper. + * debian/patches: + - Add 10debian_gtklpq_browser (fix from 1.0rel+1.0g-1). + - Add 20autotools_update fixing libtool to not include unneeded + freetype, et. al in build, see + http://wiki.debian.org/FreetypeTransition + * debian/control: + - Rewrite description as per + http://people.debian.org/~walters/descriptions.html, and push + homepage link a bit as per developers-reference best practices ;) + * debian/rules: + - Remove extra ch{s,t} locales after install. + + -- Zak B. Elep Sat, 28 Jan 2006 14:34:38 +0800 + +gtklp (1.1.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Added gettext to Build-Depends in response to possible missing B-D + warnings from the buildds. + * debian/changelog: + - Update FSF address. + + -- Zak B. Elep Tue, 13 Dec 2005 15:12:10 +0800 + +gtklp (1.0rel+1.0g-1) unstable; urgency=low + + * New upstream release + * Debian release now maintained in GNU Arch repository at + http://zakame.spunge.org/arch/debian-2005/ + * Updated autotools toolchain and config.{guess,sub} files in latest + autotools-dev (20050803.1) + * Add DEF_GTKLPQ_CMD in include/defaults.h and point GTKLPQCOM to it in + gtklp/gtklp_functions.c (Closes: #271640) + * Use `sensible-browser' instead of `netscape' in include/defaults.h + (Closes: #319347) + * Now using a completely new build system with Manoj Srivastava's + debian-dir and skeleton-make-rules instead of debhelper + + -- Zak B. Elep Wed, 31 Aug 2005 10:33:09 +0800 + +gtklp (1.0rel+1.0f-1) unstable; urgency=low + + * New upstream release + * Fixes number-of-copies being ignored because of input from keyboard + (Closes: #312755) + * Upstream includes patch from Jens Seidel containing German PO file + corrections (from gtklp-1.0e) (Closes: #314056) + + -- Zak B. Elep Sun, 19 Jun 2005 21:47:48 +0800 + +gtklp (1.0rel+1.0d-1) unstable; urgency=low + + * New upstream release + * Edited debian/rules to remove config.{guess,sub}.* cruft and use files + from /usr/share/misc/config.{guess,sub} (autotools-dev) + * Added autotools-dev in Build-Depends in debian/control + + -- Zak B. Elep Sat, 11 Jun 2005 17:05:05 +0800 + +gtklp (1.0rel-1) unstable; urgency=low + + * New upstream release + * Fixed debian/watch, now works + + -- Zak B. Elep Tue, 7 Dec 2004 15:23:27 +0800 + +gtklp (1.0pre3-2) unstable; urgency=low + + * Using the new GTK 2.4 file selector (thanks to patch by Jeramy Rutley ;) + + -- Zak B. Elep Tue, 7 Dec 2004 13:55:35 +0800 + +gtklp (1.0pre3-1) unstable; urgency=low + + * New upstream release + * Fixed debian/menu typo (s/Toos/Tools/) (Closes: #277689) + * Changed debian/rules to include dh_installmenu as per #277689 + * Fixed missing *.mo on gettext install (due to stale po/stamp-po) + * More dh_* comment-outs on debian/rules (link,installexamples) + + -- Zak B. Elep Sat, 23 Oct 2004 10:38:19 +0800 + +gtklp (1.0pre2-1) unstable; urgency=low + + * New upstream release + * Changed README.Debian to notify users upgrading from 0.9n of the "GtkLPQ + Command" in gtklp. + + -- Zak B. Elep Sun, 19 Sep 2004 11:47:14 +0800 + +gtklp (1.0pre1-1) unstable; urgency=low + + * New upstream release + * Finally got upstream to fix the copyright issues. Now the copyright file + can be properly filed :). Modified debian/copyright to reflect this + (Thanks Andreas! ;) + * Removed debian/watch as it doesn't work (Need to resolve this in the near + future, though :( learn uscan... + + -- Zak B. Elep Sun, 29 Aug 2004 22:14:31 +0800 + +gtklp (0.9u-1) unstable; urgency=low + + * New upstream release + + -- Zak B. Elep Tue, 24 Aug 2004 08:59:13 +0800 + +gtklp (0.9s-2) unstable; urgency=low + + * Removed ChangeLog as it doubled changelog.gz + * Changed debian/copyright to reflect change in package maintainer + + -- Zak B. Elep Mon, 14 Jun 2004 16:43:24 +0800 + +gtklp (0.9s-1) unstable; urgency=low + + * New upstream version, merged patches in 0.9p-1 to upstream source: + - "Look" check boxes now work properly (Closes: #153779) + - (Some) typos in the man page have been corrected (Closes: #170642) + - Spanish translation of "even" and "odd" are now correct (Closes: + #226839) + * GTK2 is now the default, fixed debian/control and description + * Fixed debian/rules to deal with leftover .gmo's + * Fixed debian/copyright, but source should also be changed to conform with + GPL licensing rules (i.e., putting the license declaration _inside_ the + source, it's not enough to just include the COPYING file ;) + * Rebuilt gtklp against libcupsys2-gnutls10 (Closes: #249494) + * Upstream says the following bugs have been fixed since 0.9p: + - Printer instances ought to be supported (Closes: #218608) + - Now doesn't dump core when no printers are available (Closes: #170025) + - Should now save page option on being told to do so (Closes: #174518) + - Printing on localhost should now recognize printer settings (Closes: + #177478) + + -- Zak B. Elep Thu, 27 May 2004 14:05:34 +0800 + +gtklp (0.9p-1) unstable; urgency=low + + * New maintainer (Closes: #244199, #245619) + * New upstream version (Closes: #209172, #194459) + * Fixed typo in man page (#170642), patch forwarded to upstream + * Fixed translation bug (#226839), patch forwarded to upstream + * Man page fixes (Closes: #100435) + * English is the default language (Closes: #85962) + * Rebuilt debian directory to reflect new Standards-Version (was 3.2.1) + * Build-Dependencies already complete (Closes: #84581, #89878, #90528, + #123676) + * Added Kalle Olavi Niemitalo's GTK+ signals patch (Closes: #153799) + * (Re)added Guido Guenther's patch for gtklpq button in gtklp (Closes: + #157399) + * Removed gnutls and debmake `artifact' dependencies upon suggestion + by Andreas Metzler (Closes: #219555) + + -- Zak B. Elep Sun, 25 Apr 2004 13:30:01 +0800 + +gtklp (0.9n-1) unstable; urgency=low + + * New upstream version closes: Bug#172417 + * closes: Bug#124709, Bug#136780, Bug#156795 + * closes: Bug#162312 + * moved man-page from /usr/man to /usr/share/man (closes: #164640) + * added libgnutls(5)-dev to build dependencies + * removed /usr/X11R6/bin from dirs as not used + + -- Matthias Kabel Fri, 20 Jun 2002 22:34:13 +0200 + +gtklp (0.9m-2) unstable; urgency=low + + * New upstream version closes: Bug#162312 + + -- Matthias Kabel Thu, 25 Sep 2002 21:11:28 +0200 + +gtklp (0.9m-1) unstable; urgency=low + + * New upstream version closes: Bug#162312 + + -- Matthias Kabel Thu, 25 Sep 2002 21:11:28 +0200 + +gtklp (0.9k-3) unstable; urgency=low + + * Additional Button to start gtklp Thanks to Guido Guenther closes Bug#157399 + + -- Matthias Kabel Thu, 26 Aug 2002 22:34:55 +0200 + +gtklp (0.9k-2) unstable; urgency=low + + * Corrected the menu, closes: Bug#156795 + + -- Matthias Kabel Thu, 15 Aug 2002 19:28:39 +0200 + +gtklp (0.9k-1) unstable; urgency=low + + * New upstream version + + -- Matthias Kabel Fri, 26 Jul 2002 21:55:18 +0200 + + +gtklp (0.9f-1) unstable; urgency=low + + * New upstream version + + -- Matthias Kabel Sun, 14 Apr 2002 19:36:44 +0200 + +gtklp (0.9-1) unstable; urgency=low + + * New upstream version + + -- Matthias Kabel Tue, 5 Mar 2002 22:55:23 +0200 + +gtklp (0.8h-2) unstable; urgency=low + + * Fixed a Bug in postinst closes: Bug##136910 + + -- Matthias Kabel Tue, 5 Mar 2002 22:28:12 +0200 + +gtklp (0.8h-1) unstable; urgency=low + + * New upstream version + Support for password-protected printers + + closes: Bug#123676 + + -- Matthias Kabel Wed, 12 Dec 2001 23:57:42 +0200 + + +gtklp (0.8-1) unstable; urgency=low + + * New upstream version + + * gtklpq new in upstream + + -- Matthias Kabel Sun, 16 Sep 2001 21:25:31 +0200 + +gtklp (0.6g-3) unstable; urgency=low + + + * added the documentation from the homepage + + * improved the man-page + + closes: Bug#100434 + + -- Matthias Kabel Wed, 17 Jul 2001 22:22:36 +0100 + +gtklp (0.6g-2) unstable; urgency=low + + + * fixed the man page. closes: Bug#100435 + added debstd to the build-dependencies. closes: Bug#90528 + + * new upstream version + + + -- Matthias Kabel Sat, 21 April 2001 10:52:41 +0100 --- gtklp-1.2.7.orig/debian/rules +++ gtklp-1.2.7/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f +# +# rules --- Debian packaging rules for gtklp +# Copyright (C) 2006 Zak B. Elep +# +# $Id: rules,v 1.2 2006-06-03 12:16:34 zakame Exp $ + +# Let's use CDBS! + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +-include /usr/share/topgit/tg2quilt.mk +include /usr/share/cdbs/1/class/autotools.mk + +# diffs are managed in git, which TopGit/Quilt generate patches from via +# debian/rules tg-cleanexport +QUILT_PATCH_DIR = debian/patches + +# Specify what source docs should go in /usr/share/doc/gtklp +DEB_INSTALL_DOCS_ALL := README AUTHORS TODO + +# Let CDBS rebuild the Autotools for us, using the source's own +# autogen.sh (NOTE: we could have set the DEB_AUTO_UPDATE_* variables +# here, but for some reason CDBS won't regenerate a missing aclocal.m4, +# as is currently the case in gtklp-1.2.7) +post-patches:: + test -e debian/stamp-autogen-sh || (sh -x autogen.sh && touch \ + debian/stamp-autogen-sh) + +# Remove extra ch{s,t} locales (we already have zh_{CN,TW} +install/gtklp:: + rm -rf debian/gtklp/usr/share/locale/chs + rm -rf debian/gtklp/usr/share/locale/cht + +# Remove generated .gmo files and Autotools stuff +clean:: + rm -f debian/stamp-autogen-sh + rm -f po/*.gmo po/stamp-po + rm -f Makefile.in config.h.in configure depcomp \ + gtklp/Makefile.in gtklpq/Makefile.in install-sh \ + libgtklp/Makefile.in m4/Makefile.in man/Makefile.in \ + missing mkinstalldirs config.guess config.sub ltmain.sh \ + m4/libtool.m4 --- gtklp-1.2.7.orig/debian/patches/series +++ gtklp-1.2.7/debian/patches/series @@ -0,0 +1,5 @@ +bugs/422266.diff -p1 +debian/gtklpq-sensible-browser.diff -p1 +fixes/autogen-sh.diff -p1 +bugs/639032.diff +bugs/644113.diff --- gtklp-1.2.7.orig/debian/patches/fixes/autogen-sh.diff +++ gtklp-1.2.7/debian/patches/fixes/autogen-sh.diff @@ -0,0 +1,31 @@ +From: Zak B. Elep +Subject: [PATCH] autogen.sh: fix for non-interactive builds + +Update autogen.sh so it can be called non-interactively (e.g. use +autopoint instead of gettextize.) + +Signed-off-by: Zak B. Elep + +--- + autogen.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 3432ac0..92f9f81 100644 +--- a/autogen.sh ++++ b/autogen.sh +@@ -5,10 +5,10 @@ LC_ALL=C + #LC_ALL=UTF-8 + export LANG LC_ALL + ++echo Running autopoint... ++autopoint --force + echo Running libtoolize... + libtoolize --copy --force +-echo Running gettextize... +-gettextize --copy -f --intl + echo Running aclocal... + aclocal -I m4 + echo Running autoheader... +-- +tg: (f201f96..) fixes/autogen-sh (depends on: upstream) --- gtklp-1.2.7.orig/debian/patches/bugs/422266.diff +++ gtklp-1.2.7/debian/patches/bugs/422266.diff @@ -0,0 +1,28 @@ +From: Zak B. Elep +Subject: [PATCH] include/defaults.h: increase printer name maximum length + +Bump DEF_PRN_LEN to a bigger size than 50 characters. + +Debian Bug #422266 + +Signed-off-by: Zak B. Elep + +--- + include/defaults.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/defaults.h b/include/defaults.h +index be0f451..caf5c75 100644 +--- a/include/defaults.h ++++ b/include/defaults.h +@@ -69,7 +69,7 @@ + #define GTKLPRC_GLOBAL "gtklprc" + + /* Constants */ +-#define DEF_PRN_LEN 50 ++#define DEF_PRN_LEN 256 + #define MAX_BANNER 20 + #define MAXPATH 256 + #define MAXLINE 256 +-- +tg: (f201f96..) bugs/422266 (depends on: upstream) --- gtklp-1.2.7.orig/debian/patches/bugs/644113.diff +++ gtklp-1.2.7/debian/patches/bugs/644113.diff @@ -0,0 +1,307 @@ +Index: gtklp-1.2.7/libgtklp/libgtklp.c +=================================================================== +--- gtklp-1.2.7.orig/libgtklp/libgtklp.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/libgtklp/libgtklp.c 2011-10-30 13:52:53.000000000 -0400 +@@ -489,7 +489,7 @@ + + const char *getPass (const char *prompt) + { +- GtkWidget *vbox, *hbox, *hbox1, *vbox1, *vbox2, *labell, *labelp, *yes, *no; ++ GtkWidget *vbox, *hbox, *vbox1, *vbox2, *labell, *labelp; + gint gi1; + #if GTK_MAJOR_VERSION == 1 + GtkWidget *sep,*passwin; +@@ -715,9 +715,6 @@ + GtkWidget *exitErrorDialog; + GtkWidget *hbox,*label,*pixmapwid; + char tmplabel[MAXLINE+1]; +- GtkStyle *style; +- GdkPixmap *pixmap; +- GdkBitmap *mask; + #if GTK_MAJOR_VERSION == 1 + GtkWidget *button,*vbox,*sep,*bbox; + #endif +@@ -761,9 +758,9 @@ + gtk_widget_show(pixmapwid); + + if(strlen(gerror2) == 0) +- snprintf(tmplabel,(size_t)MAXLINE,gerror1); ++ snprintf(tmplabel,(size_t)MAXLINE,"%s",gerror1); + else +- snprintf(tmplabel,(size_t)MAXLINE,gerror1,gerror2); ++ snprintf(tmplabel,(size_t)MAXLINE,"%s\n%s",gerror1,gerror2); + label=gtk_label_new(tmplabel); + gtk_box_pack_end(GTK_BOX(hbox),label,FALSE, FALSE,FRAME_SPACING_V); + gtk_widget_show(label); +@@ -791,7 +788,7 @@ + #endif + } else { + if(strlen(gerror2) == 0) +- g_warning(gerror1); ++ g_warning("%s",gerror1); + else + g_warning(gerror1,gerror2); + } +Index: gtklp-1.2.7/gtklp/gtklp.c +=================================================================== +--- gtklp-1.2.7.orig/gtklp/gtklp.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklp/gtklp.c 2011-10-30 13:54:03.000000000 -0400 +@@ -136,7 +136,6 @@ + int calledLpr; + int calledLp; + int forceX; +- char Path[MAXPATH+1]; + char *z1; + char tmpenv[MAX_SERVER_NAME+13]; + +@@ -216,7 +215,6 @@ + confdir[0]=(uintptr_t)NULL; + ServerName[0]=(uintptr_t)NULL; + UserName[0]=(uintptr_t)NULL; +- Path[0]=(uintptr_t)NULL; + ReallyPrint=1; + needFileSelection = 1; + cmdNumCopies=-1; +@@ -302,7 +300,7 @@ + case '?': + if(calledGtkLP) + { +- g_print(str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n"))); ++ g_print("%s",str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n"))); + } + return(0); + break; +@@ -310,7 +308,7 @@ + if(calledGtkLP) + { + if(DEBUG) +- printf("Ignoring Data on stdin !\n"); ++ printf("%s","Ignoring Data on stdin !\n"); + ignore_stdin=1; + } + if(calledLp) +@@ -324,7 +322,7 @@ + break; + case 'b': + if(DEBUG) +- printf("Using builtin defaults !\n"); ++ printf("%s","Using builtin defaults !\n"); + builtin=1; + break; + case 'p': +@@ -342,7 +340,7 @@ + if(strlen(optarg) > MAX_PORT) + { + if(DEBUG) +- printf("Port too long !\n"); ++ printf("%s","Port too long !\n"); + exitOnError(str2str(_("Invalid Portnumber !")),"",-1); + } + else +@@ -368,7 +366,7 @@ + else + { + if(DEBUG) +- printf("PROG-ERROR: Printername too long !\n "); ++ printf("%s","PROG-ERROR: Printername too long !\n "); + exitOnError(str2str(_("Invalid Printername !")),"",-1); + } + break; +@@ -387,7 +385,7 @@ + else + { + if(DEBUG) +- printf("PROG-ERROR: Servername too long !\n "); ++ printf("%s","PROG-ERROR: Servername too long !\n "); + exitOnError(str2str(_("Invalid Servername !")),"",-1); + } + break; +@@ -399,7 +397,7 @@ + else + { + if(DEBUG) +- printf("PROG-ERROR: Username too long !\n "); ++ printf("%s","PROG-ERROR: Username too long !\n "); + exitOnError(str2str(_("Invalid Username !")),"",-1); + } + break; +@@ -474,7 +472,7 @@ + case 'r': + if(calledLpr) + { +- g_print("lp -t not supported !\n"); ++ g_print("%s","lp -t not supported !\n"); + } + if(calledLp) + break; +@@ -524,7 +522,7 @@ + else + { + if(DEBUG) +- printf("Prog-Error: MAXPRINTFILES to short !\n"); ++ printf("%s","Prog-Error: MAXPRINTFILES to short !\n"); + exitOnError(str2str(_("Too many files to print !")),"",-3); + } + } +@@ -538,7 +536,7 @@ + + if(DEBUG) + { +- printf("Files to print: \n"); ++ printf("%s","Files to print: \n"); + for(i1=0;i1= MAXPRINTFILES) { + gtk_widget_set_sensitive(fileAdd,FALSE); +Index: gtklp-1.2.7/gtklp/gtklp_functions.c +=================================================================== +--- gtklp-1.2.7.orig/gtklp/gtklp_functions.c 2011-10-30 13:52:53.000000000 -0400 ++++ gtklp-1.2.7/gtklp/gtklp_functions.c 2011-10-30 13:52:53.000000000 -0400 +@@ -216,7 +216,7 @@ + + void getOptions(char *printername,int which) + { +- int i1,hasrc,nohome,ppdOptAnz; ++ int i1,hasrc,nohome; + int needNew=0; + int whichfile=0; + char printpath[MAXPATH+1],globalpath[MAXPATH+1]; +@@ -264,7 +264,6 @@ + if(!builtin) + { + nohome=0; +- ppdOptAnz=-1; + printpath[0]=(uintptr_t)NULL; + globalpath[0]=(uintptr_t)NULL; + printpath_g[0]=(uintptr_t)NULL; +Index: gtklp-1.2.7/gtklp/image.c +=================================================================== +--- gtklp-1.2.7.orig/gtklp/image.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklp/image.c 2011-10-30 13:52:53.000000000 -0400 +@@ -109,15 +109,12 @@ + + void imageScalingAllChanged(GtkWidget *widget,gpointer data) + { +- int strangeerrortrap; + char tmp[MAXLINE+1]; + + snprintf(tmp,(size_t)MAXLINE,"%s",gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(scaleTypeCombo)->entry))); + if(DEBUG) + printf("Scaling Combo changed: %s\n",tmp); + +- strangeerrortrap=1; +- + if(strlen(tmp)==0) { + if(DEBUG) + printf("Ignore empty PopUp-Result in imageScalingAllChanged\n"); +Index: gtklp-1.2.7/gtklpq/gtklpq.c +=================================================================== +--- gtklp-1.2.7.orig/gtklpq/gtklpq.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklpq/gtklpq.c 2011-10-30 13:52:53.000000000 -0400 +@@ -100,7 +100,6 @@ + GdkBitmap *mgtklpq_exit,*mgtklpq_move,*mgtklpq_prio, *mgtklpq_stop_job, *mgtklpq_stop_jobs; + GtkWidget *image; + int i1; +- char Path[MAXPATH+1]; + char *z1; + int queryIntervall=0; + int xpos,ypos; +@@ -237,7 +236,6 @@ + DEF_PRN[0]=(uintptr_t)NULL; + ServerName[0]=(uintptr_t)NULL; + UserName[0]=(uintptr_t)NULL; +- Path[0]=(uintptr_t)NULL; + passWord[0]=(uintptr_t)NULL; + i1=getopt(argc,argv,GTKLPQ_ProgOpts); + while(i1 != -1) +Index: gtklp-1.2.7/gtklpq/printer.c +=================================================================== +--- gtklp-1.2.7.orig/gtklpq/printer.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklpq/printer.c 2011-10-30 13:52:53.000000000 -0400 +@@ -1163,7 +1163,6 @@ + void cancelJob (GtkWidget * dialog) + { + int job_id; /* Job ID */ +- const char *dest; /* Destination printer */ + char uri[MAX_URI+1]; /* Printer or job URI */ + char touri[MAX_URI+1]; + ipp_t *request; /* IPP request */ +@@ -1228,7 +1227,6 @@ + return; + break; + } +- dest = NULL; + response = NULL; + + if(dialog != (GtkWidget *)NULL) --- gtklp-1.2.7.orig/debian/patches/bugs/639032.diff +++ gtklp-1.2.7/debian/patches/bugs/639032.diff @@ -0,0 +1,19 @@ +Description: Include for ppd_file_t +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/639032 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/831283 +Forwarded: no +Last-Update: 2011-09-14 + +Index: b/gtklp/gtklp.h +=================================================================== +--- a/gtklp/gtklp.h ++++ b/gtklp/gtklp.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include + --- gtklp-1.2.7.orig/debian/patches/debian/gtklpq-sensible-browser.diff +++ gtklp-1.2.7/debian/patches/debian/gtklpq-sensible-browser.diff @@ -0,0 +1,45 @@ +From: Zak B. Elep +Subject: [PATCH] Use gtklpq and sensible-browser for defaults + +Let GtkLP be able to invoke GtkLPQ and sensible-browser for its +components. + +Signed-off-by: Zak B. Elep + +--- + gtklp/gtklp_functions.c | 4 +++- + include/defaults.h | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gtklp/gtklp_functions.c b/gtklp/gtklp_functions.c +index 0b05bba..a0b5001 100644 +--- a/gtklp/gtklp_functions.c ++++ b/gtklp/gtklp_functions.c +@@ -721,8 +721,10 @@ void getOptions(char *printername,int which) + jobidonexit=0; + strncpy(BROWSER,DEF_BROWSER_CMD,(size_t)MAXPATH); + strncpy(HELPURL,DEF_HELP_HOME,(size_t)MAXPATH); +- GTKLPQCOM[0]=(uintptr_t)NULL; ++ strncpy(GTKLPQCOM,DEF_GTKLPQ_CMD,(size_t)MAXPATH); + wantconst=0; ++ ++ + #if GTK_MAJOR_VERSION != 1 + mainWindowHeight=0; + mainWindowWidth=0; +diff --git a/include/defaults.h b/include/defaults.h +index be0f451..b8b6108 100644 +--- a/include/defaults.h ++++ b/include/defaults.h +@@ -63,7 +63,8 @@ + /* PATHS */ + #define DEF_GTKLPRC "/etc/gtklp" + #define DEF_HELP_HOME "http://localhost:631/sum.html#STANDARD_OPTIONS" +-#define DEF_BROWSER_CMD "netscape $0 2>/dev/null&" ++#define DEF_BROWSER_CMD "sensible-browser $0 2>/dev/null&" ++#define DEF_GTKLPQ_CMD "gtklpq" + + #define GTKLPRC_USER ".gtklp" + #define GTKLPRC_GLOBAL "gtklprc" +-- +tg: (f201f96..) debian/gtklpq-sensible-browser (depends on: upstream)