--- qiv-2.3.1.orig/debian/NEWS.Debian +++ qiv-2.3.1/debian/NEWS.Debian @@ -0,0 +1,6 @@ +qiv (2.0-6) unstable; urgency=low + + The options -x, -y, -z and -o are disabled. See bug #351816 for all + details. + + -- Bart Martens Wed, 22 Nov 2006 14:52:29 +0100 --- qiv-2.3.1.orig/debian/README.Debian-source +++ qiv-2.3.1/debian/README.Debian-source @@ -0,0 +1,16 @@ +qiv for Debian +-------------- + +How I created the .orig.tar.gz : + +tar xzf qiv-2.1-pre12.tgz +mv qiv-2.1-pre12/debian qiv-2.1-pre12/upstreamdebian +mv qiv-2.1-pre12 qiv-2.1-pre12.orig +tar cf qiv_2.1~pre12.orig.tar qiv-2.1-pre12.orig +gzip -9 qiv_2.1~pre12.orig.tar + +md5sum *z +3cc72f691b7902fba6f3049c15427222 qiv_2.1~pre12.orig.tar.gz +80ba1e2da5115a3cc3a6f7e19cb620d8 qiv-2.1-pre12.tgz + + -- Bart Martens Sun, 20 May 2007 14:01:49 +0200 --- qiv-2.3.1.orig/debian/changelog +++ qiv-2.3.1/debian/changelog @@ -0,0 +1,380 @@ +qiv (2.3.1-1) unstable; urgency=medium + + * New upstream release. + * debian/control: Build-Depends: liblcms2-dev. + * debian/rules: Updated. qiv-command.example is now in subdirectory. + * debian/patches/14_bash.diff: Removed. Now included upstream. + * debian/patches/15_browse.diff: Removed. Now included upstream. + * debian/patches/16_usleep.diff: Added. Closes: #745617. + + -- Bart Martens Sun, 26 Oct 2014 11:05:52 +0100 + +qiv (2.2.4-2) unstable; urgency=low + + * debian/patches/15_browse.diff: Use the -B option only when there is at + least one image to show. Fixes segfault. Closes: #702619. + + -- Bart Martens Sat, 09 Mar 2013 17:33:16 +0000 + +qiv (2.2.4-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sun, 22 May 2011 15:53:15 +0000 + +qiv (2.2.3-1) unstable; urgency=low + + * New upstream release. Closes: #572165, #556303, #532055. + + -- Bart Martens Fri, 19 Mar 2010 20:12:33 +0100 + +qiv (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Sun, 31 May 2009 23:39:50 +0200 + +qiv (2.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Bart Martens Fri, 29 May 2009 20:55:08 +0200 + +qiv (2.2-1) unstable; urgency=low + + * New upstream release. Closes: #456133, #497286. + * debian/patches_amd64/01_no_GDK_WA_WMCLASS.diff: Removed. + * debian/patches_powerpc/01_no_GDK_WA_WMCLASS.diff: Removed. + * debian/patches/09_man_xscreensaver.diff: Removed. + * debian/patches/12_cmdbuflen.diff: Removed. + * debian/patches/13_gtk_includes.diff: Disabled. + * debian/patches/14_bash.diff: Added. Closes: #489650. + * debian/control: Build-Depends: libimlib2-dev, libgtk2.0-dev, libmagic-dev, + libexif-dev. + * debian/copyright: Added description of how the .orig.tar.gz was made. + * debian/watch: Updated for new upstream download site. + + -- Bart Martens Thu, 30 Apr 2009 09:10:08 +0200 + +qiv (2.1~pre12-5) unstable; urgency=low + + * debian/patches_powerpc/01_no_GDK_WA_WMCLASS.diff: Added. Closes: #461940. + Same patch as added for amd64 in 2.1~pre12-2, see below. + + -- Bart Martens Fri, 25 Jan 2008 18:36:45 +0100 + +qiv (2.1~pre12-4) unstable; urgency=low + + * debian/patches/13_gtk_includes.diff: Added. Closes: #456854. + + -- Bart Martens Thu, 20 Dec 2007 09:42:35 +0100 + +qiv (2.1~pre12-3) unstable; urgency=low + + * debian/patches/12_cmdbuflen.diff: Added. Closes: #441401. Thanks to + Norman Ramsey . + + -- Bart Martens Sun, 23 Sep 2007 18:15:48 +0200 + +qiv (2.1~pre12-2) unstable; urgency=low + + * debian/rules: Added support for architecture specific patches. + * debian/patches_amd64/01_no_GDK_WA_WMCLASS.diff: Added. Closes: #426754. + + -- Bart Martens Sun, 03 Jun 2007 17:55:13 +0200 + +qiv (2.1~pre12-1) unstable; urgency=low + + * New upstream (pre)release. Closes: #422035. + * debian/README.Debian-source: Explains the .orig.tar.gz file. + * debian/bin/qiv, debian/install, debian/rules, debian/lintian/qiv, + debian/patches/08_hide_therealqiv.diff: Removed the wrapper that was added + in version 2.0-5. + * debian/docs: Additionally install README.TODO. + * debian/docs: Don't install debian/NEWS.Debian, see disabled patches below. + * Removed obsolete patches: + debian/patches/01.fix_xinerama.diff + debian/patches/02.typo_envoked.diff + debian/patches/03.additional_keys.diff + debian/patches/04.qiv-nosort.diff + debian/patches/05.qiv-manpage-options.diff + debian/patches/06.xmalloc.diff + debian/patches/10_qiv-nosort_2.diff + * Updated patch: debian/patches/09_man_xscreensaver.diff + * Disabled patches: + debian/patches/07_no_background_opts.diffDISABLED + debian/patches/11_no_background_opts_2.diffDISABLED + * debian/copyright: Updated. + * debian/watch: Updated. + + -- Bart Martens Sun, 20 May 2007 14:01:49 +0200 + +qiv (2.0-8) unstable; urgency=low + + * debian/README.Debian, debian/docs: Removed README.Debian, and install + debian/NEWS.Debian. Closes: #403936. + * debian/qiv.mime: Updated. Closes: #404220. Thanks to Roman Galeyev + . + + -- Bart Martens Sat, 27 Jan 2007 17:02:56 +0100 + +qiv (2.0-7) unstable; urgency=low + + * debian/NEWS.Debian: Added. + * debian/patches/10_qiv-nosort_2.diff: Added. Closes: #383110. + * debian/patches/11_no_background_opts_2.diff: Added. Closes: #351816. + + -- Bart Martens Wed, 6 Dec 2006 19:58:52 +0100 + +qiv (2.0-6) unstable; urgency=low + + * debian/patches/07_no_background_opts.diff: Added. Closes: #351816. + * debian/patches/08_hide_therealqiv.diff: Added, to hide "therealqiv". + * debian/patches/09_man_xscreensaver.diff: Added. Closes: #360514. + * debian/bin/qiv: Use "exec". Closes: #399596. + + -- Bart Martens Wed, 22 Nov 2006 14:52:29 +0100 + +qiv (2.0-5) unstable; urgency=low + + * New maintainer. Closes: #398124. + * Acknowledge NMU's. Closes: #320115, #347042. + * debian/*: Repackaged with cdbs. + * debian/control: Updated build-depends to gdk-imlib11-dev. + * debian/patches/*: Converted dpatches to diff files. + * debian/patches/02.typo_envoked.diff: Added. Closes: #311232. Patch by A + Costa , thanks. + * debian/patches/04.qiv-nosort.diff: Added. Closes: #383110. Patch by + Kevin Locke , thanks. + * debian/patches/05.qiv-manpage-options.diff: Added. Closes: #383108. + Patch by Kevin Locke , thanks. + * debian/patches/06.xmalloc.diff: Added. Closes: #383113. Patch by Kevin + Locke , thanks. + * debian/watch: Added. + * debian/bin/qiv, debian/lintian/qiv, debian/rules: Add wrapper using + XLIB_SKIP_ARGB_VISUALS=1 as workaround for problem in qiv with X composite + extension. Closes: #326849. Thanks to Joerg Platte . + + -- Bart Martens Sun, 12 Nov 2006 09:21:38 +0100 + +qiv (2.0-4.2) unstable; urgency=low + + * NMU. + * debian/patches/02.improves_bgimage_setting.dpatch, debian/patches/00list: + Removed patch with regression. Closes: #320115. + * debian/copyright: Fixed old-fsf-address-in-copyright-file. + * debian/control: Standards version. + * debian/control: Adjusted homepage. + + -- Bart Martens Sat, 13 May 2006 21:00:04 +0200 + +qiv (2.0-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Update build-deps for xlibs-dev removal; closes: #347042. + + -- Justin Pryzby Sat, 14 Jan 2006 15:23:43 -0500 + +qiv (2.0-4) unstable; urgency=low + + * New maintainer (Closes: #304096) + * added Homepage to long description + * use dpatch now + * Closes: #294293: qiv should support the new background setting + mechanism; used provided patch + * Closes: #262986: more customizable keys for qiv-command; used provided + patch + + -- Christoph Wegscheider Sun, 22 May 2005 09:03:12 +0200 + +qiv (2.0-3) unstable; urgency=low + + * eliminated warning about missing Xinerama extension on non-Xinerama + displays + * correctly center image on Xinerama displays + * Thanks to Geoffrey T. Dairiki for these patches! + + -- Martin Pitt Wed, 16 Jun 2004 21:04:31 +0200 + +qiv (2.0-2) unstable; urgency=low + + * enabled Xinerama support in Makefile (closes: #253880) + + -- Martin Pitt Sun, 13 Jun 2004 11:34:10 +0200 + +qiv (2.0-1) unstable; urgency=low + + * new upstream version; key "PageUp" now does not crash any more when there + are less than five pictures. closes: #246732 + * updated description + + -- Martin Pitt Sun, 23 May 2004 23:53:16 +0200 + +qiv (1.9-4) unstable; urgency=low + + * short option for --ignore_path_sort is now correctly documented as -P + (manpage and --help). (closes: #234174) + + -- Martin Pitt Mon, 23 Feb 2004 19:46:04 +0100 + +qiv (1.9-3) unstable; urgency=low + + * Added option -B / --noblank to disable screensaver and DPMS during + execution (closes: #178668) + + -- Martin Pitt Wed, 4 Feb 2004 23:42:46 +0100 + +qiv (1.9-2) unstable; urgency=low + + * shortened NAME section in manpage (closes: #230752) + * stated copyright holders in debian/copyright + + -- Martin Pitt Tue, 3 Feb 2004 20:07:11 +0100 + +qiv (1.9-1) unstable; urgency=low + + * new upstream release (some new features, upstream took over my patches) + * correctly install README.CHANGES as upstream changelog + * updated long description + + -- Martin Pitt Sun, 14 Dec 2003 23:38:53 +0100 + +qiv (1.8-6) unstable; urgency=low + + * qiv.mime: now gives option '-n' to ignore file extension (better for mail + attachments etc.) (closes: #217226) + * changed my Maintainer address + + -- Martin Pitt Tue, 28 Oct 2003 17:49:31 +0100 + +qiv (1.8-5) unstable; urgency=low + + * undeleting a file now also works on FAT file systems (closes: #210550) + (this really was the last spot using link(), I checked!) + + -- Martin Pitt Fri, 12 Sep 2003 12:16:29 +0200 + +qiv (1.8-4) unstable; urgency=low + + * deleting a file now also works on FAT file systems (closes: #209079) + * updated Standards-Version to 3.6.1 (no changes required) + + -- Martin Pitt Tue, 9 Sep 2003 11:26:37 +0200 + +qiv (1.8-3) unstable; urgency=low + + * new maintainer (closes: #193604) + * debian/control: updated maintainer and wrong upstream URL + * debian/copyright: replaced copyright with standard GPL clause + * fixed build-deps: removed unnecessary libglib1.2-dev, added gdk-imlib-dev + as alternative to make it Woody-compatible + * debian/qiv.mime: added image/pjpeg type (closes: #193643) + * image.c, reload_image(): now checked image loading for errors, thanks to + Niels Andersen; patch sent to upstream who included it (closes: #194575) + * updated to standards version 3.5.10: DH_COMPAT -> debian/compat, respect + DEB_BUILD_OPTIONS + * cleaned up debian/ directory: removed dirs, docs (debian/rules does that + now) + * removed debian/patches/: Makefile patch not needed any more, patch to + options.c incorporated into package.diff.gz (also sent to upstream who + included it in next version) + * complete rewrite of debian/rules + * included intro.jpg and qiv-command.example in package + * removed Emacs' local variables stuff from Debian changelog + + -- Martin Pitt Mon, 26 May 2003 20:34:28 +0200 + +qiv (1.8-2) unstable; urgency=low + + * Builded against gdk-imlib1. + + -- Luis Bustamante Thu, 6 Feb 2003 07:25:08 -0500 + +qiv (1.8-1) unstable; urgency=low + + * The I-will-take-care-of-qiv release. + * Package builded from the scratch. Updated to standards version 3.5.8. + * New maintainer (closes: #176329). + * New upstream release (closes: #156155). + * It seems qiv handles bmp files correctly now (closes: #120681). + * Builded against gdk-imlib2 (closes: #158926). + * Better delay handling for slideshow. Thanks to Samuele Giovanni Tonon + (closes: #159019). + * Stop clearing when panning in full screen mode (closes: #150951). + * Show images with unknown extensions using -n option (closes: #99811). + + -- Luis Bustamante Thu, 16 Jan 2003 12:00:55 -0500 + +qiv (1.7-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * Move man page from /usr/man to /usr/share/man (closes: #141105). + + -- Colin Watson Thu, 18 Apr 2002 00:08:22 +0100 + +qiv (1.7-0.1) unstable; urgency=low + + * NMU + * New Upstream release (Closes: #110115) + * Upstream fixed: (Closes: #97090) + * moved binary and manpage to /usr, not /usr/X11R6 + * This isnt a Debian native package, lets give it an orig.tar.gz, not + a tar.gz.. Tsk. + + -- Michael Beattie Fri, 22 Feb 2002 23:57:20 +1200 + +qiv (1.6-1) unstable; urgency=low + + * Upstream release (closes: #82827) + + -- Mitch Blevins Sun, 11 Feb 2001 16:07:31 -0600 + +qiv (1.5-2) unstable; urgency=low + + * Added Build-Depends (closes: Bug#82405) + + -- Mitch Blevins Mon, 15 Jan 2001 23:53:58 -0600 + +qiv (1.5-1) unstable; urgency=low + + * Upstream release (closes: Bug#77504) + * Fixed typo in description (closes: Bug#56126) + * Added mime types to /etc/mailcap (closes: Bug#61598) + + -- Mitch Blevins Thu, 4 Jan 2001 19:08:35 -0600 + +qiv (1.1-1) unstable; urgency=low + + * Upstream release + + -- Mitch Blevins Mon, 31 May 1999 23:09:11 -0400 + +qiv (1.0-5) unstable; urgency=low + + * Recompiled for gtk/glib 1.2 + + -- Mitch Blevins Sat, 6 Mar 1999 01:28:09 -0500 + +qiv (1.0-4) unstable; urgency=low + + * Recomplied to fix multiple libglib dependencies + + -- Mitch Blevins Tue, 2 Feb 1999 10:30:10 -0500 + +qiv (1.0-3) unstable; urgency=low + + * Removed install from default target in Makefile + + -- Mitch Blevins Mon, 11 Jan 1999 07:48:26 -0500 + +qiv (1.0-2) unstable; urgency=low + + * Updated libjpeg dependancies + + -- Mitch Blevins Sat, 14 Nov 1998 02:27:23 -0500 + +qiv (1.0-1) unstable; urgency=low + + * Initial Release. + + -- Mitch Blevins Sun, 8 Nov 1998 23:37:24 -0500 --- qiv-2.3.1.orig/debian/compat +++ qiv-2.3.1/debian/compat @@ -0,0 +1 @@ +5 --- qiv-2.3.1.orig/debian/control +++ qiv-2.3.1/debian/control @@ -0,0 +1,21 @@ +Source: qiv +Section: graphics +Priority: extra +Maintainer: Bart Martens +Build-Depends: cdbs, debhelper (>= 5), libimlib2-dev, libgtk2.0-dev, libx11-dev, libxinerama-dev, libmagic-dev, libexif-dev, liblcms2-dev +Standards-Version: 3.9.2 +Homepage: http://qiv.spiegl.de/ + +Package: qiv +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Quick image viewer for X + Quick Image Viewer (qiv) is a very small and pretty fast GDK/Imlib image + viewer. Features include zoom, maxpect, scale down, fullscreen, + brightness/contrast/gamma correction, slideshow, pan with keyboard and mouse, + rotate left/right, flip, delete (move to .qiv-trash/), jump to image x, jump + forward/backward x images, filename filter, and you can use qiv to set your + X11-Desktop background. + . + qiv also supports the assignment of external commands (like metacam) to unused + keys. --- qiv-2.3.1.orig/debian/copyright +++ qiv-2.3.1/debian/copyright @@ -0,0 +1,104 @@ +This package was debianized by Mitch Blevins on +Sun, 8 Nov 1998 23:37:24 -0500 + +It was downloaded from: + + http://www.klografx.net/qiv/download/ + http://spiegl.de/qiv/ + +The .orig.tar.gz file was created as follows: + + tar xzf qiv-2.2.tgz + mv qiv-2.2/debian qiv-2.2/upstreamdebian + mv qiv-2.2 qiv-2.2.orig + tar cf qiv_2.2.orig.tar qiv-2.2.orig + gzip -9 qiv_2.2.orig.tar + +Upstream authors, as listed in Changelog: + + Adam Kopacz + Andy Spiegl + Darren Smith + Pavel Andreev + Decklin Foster + Holger Mueller + Scott Sams + Serge Winitzki + Frederic Crozat + Rutger Nijlunsing + John Knottenbelt + Danny + Tomas Ogren + Erik Jacobsen + Alfred Weyers + Daniel + Henning Kulander + Ask Bjoern Hansen + Adrian Lopez + Y Furuhashi + Wayne Davison + Johannes Stezenbach + OEyvind Kolaas + Matthieu Castet + Geoffrey T. Dairik + Leopoldo Cerbaro + Heikki Lehvaslaiho + Larry Doolittle + S. Dobrev + Thomas Wiegner + Barry deFreese + Peter deWachter + Akos Pasztory + +Copyright: + + Copyright (C) 1989-2011 the above-mentioned authors + See "Changelog" for details who did what when. + + Copyright (C) 1987-1997 Free Software Foundation, Inc. + For lib/getopt*. + +License: + + This package 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; version 2 dated June, 1991. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License version 2 can be found in `/usr/share/common-licenses/GPL-2'. + +The debian packaging is +Copyright (c) 1998-2001 Mitch Blevins +Copyright (c) 2002 Michael Beattie +Copyright (c) 2002 Colin Watson +Copyright (c) 2003 Luis Bustamante +Copyright (c) 2003-2004 Martin Pitt +Copyright (c) 2005 Christoph Wegscheider +Copyright (c) 2006 Justin Pryzby +Copyright (c) 2006-2014 Bart Martens +and is licensed under the GPL version 2, see above. + +The files xmalloc.c and xmalloc.h contain this: + + * Created by Kevin Locke (from numerous canonical examples) + * + * I hereby place this file in the public domain. It may be freely reproduced, + * distributed, used, modified, built upon, or otherwise employed by anyone + * for any purpose without restriction. + +Kevin Locke wrote on bug 383113: + + I have attached my stock do-or-die memory handling functions (public domain, + but easily relicensable to GPL if desired), and a patch to incorporate those + functions into qiv. + --- qiv-2.3.1.orig/debian/docs +++ qiv-2.3.1/debian/docs @@ -0,0 +1,2 @@ +intro.jpg +README.TODO --- qiv-2.3.1.orig/debian/examples +++ qiv-2.3.1/debian/examples @@ -0,0 +1 @@ +qiv-command --- qiv-2.3.1.orig/debian/install +++ qiv-2.3.1/debian/install @@ -0,0 +1 @@ +qiv usr/bin --- qiv-2.3.1.orig/debian/manpages +++ qiv-2.3.1/debian/manpages @@ -0,0 +1 @@ +qiv.1 --- qiv-2.3.1.orig/debian/patches/07_no_background_opts.diffDISABLED +++ qiv-2.3.1/debian/patches/07_no_background_opts.diffDISABLED @@ -0,0 +1,132 @@ +diff -ruN origtree/qiv-2.0/options.c qiv-2.0/options.c +--- origtree/qiv-2.0/options.c 2006-11-22 16:07:04.000000000 +0100 ++++ qiv-2.0/options.c 2006-11-22 16:09:15.000000000 +0100 +@@ -28,9 +28,6 @@ + { + {"help", 0, NULL, 'h'}, + {"center", 0, NULL, 'e'}, +- {"root", 0, NULL, 'x'}, +- {"root_t", 0, NULL, 'y'}, +- {"root_s", 0, NULL, 'z'}, + {"maxpect", 0, NULL, 'm'}, + {"scale_down", 0, NULL, 't'}, + {"brightness", 1, NULL, 'b'}, +@@ -44,7 +41,6 @@ + {"disable_grab", 0, NULL, 'G'}, + {"select_dir", 1, NULL, 'A'}, + {"version", 0, NULL, 'v'}, +- {"bg_color", 1, NULL, 'o'}, + {"slide", 0, NULL, 's'}, + {"random", 0, NULL, 'r'}, + {"readonly", 0, NULL, 'R'}, +@@ -200,12 +196,6 @@ + case 'h': show_help(argv[0], 0); break; + case 'e': center=0; + break; +- case 'x': to_root=1; +- break; +- case 'y': to_root_t=1; +- break; +- case 'z': to_root_s=1; +- break; + case 't': scale_down=1; + break; + case 'm': maxpect=1; +@@ -239,8 +229,6 @@ + case 'v': g_print("qiv (Quick Image Viewer) v%s\n", VERSION); + gdk_exit(0); + break; +- case 'o': image_bg_spec = optarg; +- break; + case 's': slide=1; + break; + case 'r': random_order=1; +diff -ruN origtree/qiv-2.0/qiv.1 qiv-2.0/qiv.1 +--- origtree/qiv-2.0/qiv.1 2006-11-22 16:07:04.000000000 +0100 ++++ qiv-2.0/qiv.1 2006-11-22 16:08:21.000000000 +0100 +@@ -52,15 +52,6 @@ + .B \-W, \-\-fixed_zoom \fIx\fB. + Window with fixed zoom factor (percentage \fIx\fR). + .TP +-.B \-x, \-\-root \fIfile\fB +-Set \fIfile\fR as the current desktop background (centered) and exit. +-.TP +-.B \-y, \-\-root_t \fIfile\fB +-Set \fIfile\fR as the current desktop background (tiled) and exit. +-.TP +-.B \-z, \-\-root_s \fIfile\fB +-Set \fIfile\fR as the current desktop background (stretched) and exit. +-.TP + .B \-m, \-\-maxpect + Expand image(s) to fit screen size while preserving aspect ratio. + .TP +@@ -99,10 +90,6 @@ + .B \-v, \-\-version + Print version information. + .TP +-.B \-o, \-\-bg_color \fIx\fB +-Set root background color to named color \fIx\fR or 24 bit hex RGB triple +-in the format \fI#RRGGBB\fR. +-.TP + .B \-s, \-\-slide + Start slideshow immediately. + .TP +@@ -146,15 +133,9 @@ + .SH EXAMPLES + qiv \-atsd2 *.jpg + .br +-qiv \-\-maxpect \-\-root image.png +-.br + qiv \-\-maxpect \-\-slide \-\-random \-\-delay=2 * + .br + qiv \-\-maxpect \-\-scale_down \-\-slide \-\-delay=2 `find / *` +-.br +-qiv \-\-bg_color 0000FF \-\-root image.png +-.br +-qiv \-\-bg_color blue \-\-root image.png + .SH KEYS + .EX + space/left mouse/wheel down next picture +@@ -198,9 +179,6 @@ + i statusbar on/off + I iconify window + w watch file on/off +-x center image on background +-y tile image on background +-z stretch image on background + .EE + .SH MOUSE CONTROLS + .EX +diff -ruN origtree/qiv-2.0/utils.c qiv-2.0/utils.c +--- origtree/qiv-2.0/utils.c 2006-11-22 16:07:04.000000000 +0100 ++++ qiv-2.0/utils.c 2006-11-22 16:09:32.000000000 +0100 +@@ -440,7 +440,6 @@ + g_print( + "General options:\n" + " --file, -F x Read file names from text file x\n" +- " --bg_color, -o x Set root background color to x\n" + " --brightness, -b x Set brightness to x (-32..32)\n" + " --center, -e Disable window centering\n" + " --contrast, -c x Set contrast to x (-32..32)\n" +@@ -460,9 +459,6 @@ + " --no_statusbar, -i Disable statusbar\n" + " --statusbar, -I Enable statusbar\n" + " --numeric_sort, -N Sort filenames with numbers intuitively\n" +- " --root, -x Set centered desktop background and exit\n" +- " --root_t, -y Set tiled desktop background and exit\n" +- " --root_s, -z Set stretched desktop background and exit\n" + " --scale_down, -t Shrink image(s) larger than the screen to fit\n" + " --transparency, -p Enable transparency for transparent images\n" + " --version, -v Print version information and exit\n" +--- origtree/qiv-2.0/main.h 2004-04-19 08:47:19.000000000 +0200 ++++ qiv-2.0/main.h 2006-11-22 16:14:17.000000000 +0100 +@@ -97,9 +97,6 @@ + "i statusbar on/off", + "I iconify window", + "w watch file on/off", +- "x center image on background", +- "y tile image on background", +- "z stretch image on background", + NULL + }; + --- qiv-2.3.1.orig/debian/patches/11_no_background_opts_2.diffDISABLED +++ qiv-2.3.1/debian/patches/11_no_background_opts_2.diffDISABLED @@ -0,0 +1,11 @@ +--- ../orig/qiv-2.0/options.c 2006-12-06 19:54:05.000000000 +0100 ++++ options.c 2006-12-06 19:56:33.000000000 +0100 +@@ -23,7 +23,7 @@ + extern int rreaddir(const char *); + extern int rreadfile(const char *); + +-static char *short_options = "hexyzmtb:c:g:niIpaGA:vo:srRSd:u:fw:W:DPMNF:T"; ++static char *short_options = "hemtb:c:g:niIpaGA:vsrRSd:u:fw:W:DPMNF:T"; + static struct option long_options[] = + { + {"help", 0, NULL, 'h'}, --- qiv-2.3.1.orig/debian/patches/13_gtk_includes.diff.DISABLED +++ qiv-2.3.1/debian/patches/13_gtk_includes.diff.DISABLED @@ -0,0 +1,14 @@ +Fixes #456854. +qiv: FTBFS: error: gdk/gdkx.h: No such file or directory + + +--- ../orig/qiv-2.1~pre12/Makefile 2007-04-25 02:52:39.000000000 +0200 ++++ Makefile 2007-12-20 09:49:03.000000000 +0100 +@@ -66,6 +66,7 @@ + # -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN + + INCLUDES = `imlib-config --cflags-gdk` ++INCLUDES += `gtk-config --cflags` + LIBS = `imlib-config --libs-gdk` + # [as] thinks that this is not portable enough + # [lc] I use a virtual screen of 1600x1200, and the resolution is 1024x768, --- qiv-2.3.1.orig/debian/patches/16_usleep.diff +++ qiv-2.3.1/debian/patches/16_usleep.diff @@ -0,0 +1,14 @@ +# bug 745617 +# patch by Hamish + +--- ../orig/qiv-2.3.1/utils.c 2013-12-20 01:50:37.000000000 +0100 ++++ ./utils.c 2014-10-26 11:54:51.000000000 +0100 +@@ -722,7 +722,7 @@ + update_image(q, REDRAW); + } + } +- usleep(200); /* avoid eating 100% cpu */ ++ usleep(100000); /* avoid eating 100% cpu */ + + return TRUE; + } --- qiv-2.3.1.orig/debian/qiv.mime +++ qiv-2.3.1/debian/qiv.mime @@ -0,0 +1,17 @@ +image/gif; qiv -tfi %s; description="GIF Image"; test=test "$DISPLAY"; nametemplate=%s.gif; priority=4 +image/jpeg; qiv -tfi %s; description="JPEG Image"; test=test "$DISPLAY"; nametemplate=%s.jpeg; priority=4 +image/pjpeg; qiv -tfi %s; description="JPEG Image"; test=test "$DISPLAY"; nametemplate=%s.jpeg; priority=4 +image/tiff; qiv -tfi %s; description="TIFF Image"; test=test "$DISPLAY"; nametemplate=%s.tiff; priority=4 +image/x-portable-bitmap; qiv -tfi %s; description="PBM Image"; test=test "$DISPLAY"; nametemplate=%s.pbm; priority=4 +image/x-portable-graymap; qiv -tfi %s; description="PGM Image"; test=test "$DISPLAY";nametemplate=%s.pgm; priority=4 +image/x-portable-pixmap; qiv -tfi %s; description="PPM Image"; test=test "$DISPLAY"; nametemplate=%s.ppm; priority=4 +image/x-xbitmap; qiv -tfi %s; description="XBM Image"; test=test "$DISPLAY"; nametemplate=%s.xbm; priority=4 +image/x-xpixmap; qiv -tfi %s; description="XPM Image"; test=test "$DISPLAY"; nametemplate=%s.xpm; priority=4 +image/bmp; qiv -tfi %s; description="BMP Image"; test=test "$DISPLAY"; nametemplate=%s.bmp; priority=4 +image/x-bmp; qiv -tfi %s; description="BMP Image"; test=test "$DISPLAY"; nametemplate=%s.bmp; priority=4 +image/x-ms-bmp; qiv -tfi %s; description="BMP Image"; test=test "$DISPLAY"; nametemplate=%s.bmp; priority=4 +image/x-rgb; qiv -tfi %s; description="RGB Image"; test=test "$DISPLAY"; nametemplate=%s.rgb; priority=4 +image/targa; qiv -tfi %s; description="TARGA Image"; test=test "$DISPLAY"; nametemplate=%s.tga; priority=4 +image/fits; qiv -tfi %s; description="FITS Image"; test=test "$DISPLAY"; nametemplate=%s.fits; priority=4 +image/png; qiv -tfi %s; description="PNG Image"; test=test "$DISPLAY"; nametemplate=%s.png; priority=4 +image/pm; qiv -tfi %s; description="PM Image"; test=test "$DISPLAY"; nametemplate=%s.pm; priority=4 --- qiv-2.3.1.orig/debian/rules +++ qiv-2.3.1/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_PATCHDIRS := debian/patches debian/patches_$(DEB_HOST_ARCH) + +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +update-config:: + [ -f qiv-command ] || mv contrib/qiv-command.example qiv-command + +reverse-config:: + [ ! -f qiv-command ] || mv qiv-command contrib/qiv-command.example + +clean:: + rm -f qiv xmalloc.o --- qiv-2.3.1.orig/debian/watch +++ qiv-2.3.1/debian/watch @@ -0,0 +1,5 @@ +version=3 +opts="uversionmangle=s/(\d)[\-_]?(rc\d+|pre-rc\d+|pre\d+a?)$/$1~$2/;s/[\-\.](source|Source|src|orig|unix)$//;s/-(bin|osx)$/~$1/;s/^v(\d)/$1/;" \ +http://spiegl.de/qiv/download/ .*qiv-(v?[\d\.]+(?:rc|rc\d+|pre-rc\d+|-unix|-source|-Source|-src|\.src|\.orig|[a-z]|b\d+|beta\d+-src|beta\d+)?)\.t.* +# generated with watchupstream 0.6 +# watchupstream qiv --try=http://spiegl.de/qiv/download/