--- xzgv-0.9.1.orig/TODO +++ xzgv-0.9.1/TODO @@ -86,15 +86,9 @@ manually, if possible (but IIRC it may not be easy :-/). Should also add h/l equivalents if I do this. -The goto-dir dialog (and copy/move) should have some graphical means -of choosing a dir, in addition to the text-entry widget. The only -thing I've seen which looks reasonable is xmms's `DIR+' dialog, which -doesn't look like it'd be too hard to adapt (though it's hard to tell -for sure who I should credit this to if I did nick it :-)), but it -might be better to wait until GTK+ has some standard -file-selection-like thing for doing this. Anyway, even if I do add -some `pretty' dir chooser I *have* to ensure you can always just do -`G', type in the name, then enter (like you can now). +The goto-dir dialog (and copy/move) should use a GUI directory +chooser, in addition to the text-entry widget; but ensure you can +always just do `G', type in the name, then enter (like you can now). * Wishlist features (not too important) @@ -126,12 +120,6 @@ * Trivia -[is this next one still the case?] -Incredibly, texi2html doesn't support @email, so you end up with e.g. -"you can email me at @email{rus@svgalib.org}" in the output HTML. -Mmmm, classy. :-( Should I just use @code? IIRC the formatting is much -the same. - When you delete a file from the viewer (ctrl-d works there too), it works fine, but the deleted picture stays in the viewer. It might be better if it auto-closed the file (though this may be somewhat @@ -171,22 +159,6 @@ really see any other way of showing tagging which wouldn't look nasty or take up loads of room. -- 8-bit and/or dithering-related bugs: - - - thumbnails don't look so great in palette-based (e.g. 8-bit) modes. - Should either dither them myself if depth<=8 (a bit painful but - probably the way to go), or load them as gdb-pixbuf images (easy - but may prove very memory-hungry, and may possibly be slower). - -- if you use Tab (or the cursor keys) to move around in dialogs, it - acts like there's an invisible widget in addition to the ones you - can see. So in e.g. the file details (with only an Ok button) you - press Tab and the highlight disappears from Ok - press it again and - it returns. Investigation shows window->focus_widget is set to NULL - when on this `invisible widget', so it's hard to tell WTF is going - on, exactly. (A quick test of other GTK+ and Gnome programs seems to - suggest this is a GTK+ `feature'.) - - Thumbnails are given an accurate width/height `IMGINFO' comment, but are always claimed to be "RGB", as Imlib doesn't provide any way for us to find out what type they are (other Gimp-style types are @@ -194,5 +166,4 @@ common file types by reading the file's header, but this would be really ugly - is it worth it or not? (An xv-ish file type after the width/height would be easier, but still kludgey, and I'd much rather - be Gimp-friendly than xv-friendly.) May be worth returning valid - image-type info for own-reader types like GIF and PNG, though. + be Gimp-friendly than xv-friendly.) --- xzgv-0.9.1.orig/debian/changelog +++ xzgv-0.9.1/debian/changelog @@ -0,0 +1,220 @@ +xzgv (0.9.1-3) unstable; urgency=medium + + * Fix RC bug; need dummy prerm file to allow clean upgrade from wheezy + (Closes: #726800) + * Update Debian Policy Standards Version to 3.9.5 + + -- Theodore Y. Ts'o Wed, 01 Jan 2014 11:42:29 -0500 + +xzgv (0.9.1-2) unstable; urgency=low + + * Add build dependency on install-info (Closes: #719375) + * Tighten up package description (Closes: #600415) + + -- Theodore Y. Ts'o Sun, 13 Oct 2013 20:31:28 -0400 + +xzgv (0.9.1-1) unstable; urgency=low + + * New upstream version + * Fix bug which caused xzgv to crash when adjusting the scaling using + the 's' or 'd' keys when no image is being displayed. (Closes: #498033) + * Link all libraries needed explicitly so we successfully link using + the binutils-gold linker. (Closes: #713586, #556765) + + -- Theodore Y. Ts'o Wed, 26 Jun 2013 21:47:00 -0400 + +xzgv (0.9+svn40-1) unstable; urgency=low + + * Fix xzgv crashing on thumbnail files. (Closes: #457252) + * Update home page in package description to the Sourceforge project + * Install mailcap entries (Closes: #167445) + * Update Debian Policy Standards Version to 3.8.0.0 + + -- Theodore Y. Ts'o Fri, 11 Jul 2008 20:22:31 -0400 + +xzgv (0.9+svn34-1) unstable; urgency=low + + * New upstream release. (Closes: #444686, #408841, #456826) + * This version of xzgv no longer uses GTK+ and imlib, but rather GTK 2 + with gdk-pixbuf as the rendering back-end. As a result, Gamma, + brightness, contrast, and EXIF-orientation are currently + unsupported. (Closes: #456138) + + -- Theodore Y. Ts'o Tue, 18 Dec 2007 09:06:26 -0500 + +xzgv (0.8-5) unstable; urgency=low + + * Build against gdk-imlib11-dev (Closes: #333047) + + -- Theodore Y. Ts'o Sun, 13 Nov 2005 00:14:33 -0500 + +xzgv (0.8-4) unstable; urgency=low + + * Build against libpng 1.2. + + -- Theodore Y. Ts'o Wed, 15 Jun 2005 01:33:52 -0400 + +xzgv (0.8-3) unstable; urgency=high + + * Applied security fix to prevent buffer overruns from: + http://www.svgalib.org/rus/zgv/zgv-5.8-integer-overflow-fix.diff + Addresses vulnerability: CAN-2004-0994 (Closes: #284127) + + -- Theodore Y. Ts'o Mon, 13 Dec 2004 12:23:47 -0500 + +xzgv (0.8-2) unstable; urgency=medium + + * Update to use libtiff4 instead of libtiff3 in order to avoid + compatibility problems caused by accidental ABI changes in libtiff + version 3.5.7; sarge will not contain libtiff.so.3 for this reason. + * Fix quoting problems in debian/menu. + + -- Theodore Y. Ts'o Fri, 30 Jul 2004 20:08:23 -0400 + +xzgv (0.8-1) unstable; urgency=low + + * New upstream release. + + -- Theodore Y. Ts'o Thu, 9 Oct 2003 07:09:32 -0400 + +xzgv (0.7-15) unstable; urgency=low + + * New maintainer. + + -- Theodore Y. Ts'o Sat, 12 Jul 2003 01:42:39 -0400 + +xzgv (0.7-14) unstable; urgency=low + + * Fix multiline literal FTBFS. (Closes: #196541) + + -- Chris Lawrence Mon, 23 Jun 2003 06:08:09 -0500 + +xzgv (0.7-13) unstable; urgency=low + + * Revert back to libpng2-dev and libgdk-imlib1-dev. + Remember, kids, it's all fun and games until someone gets hurt. + (Closes: #167134) [severity-inflated] + + -- Chris Lawrence Thu, 31 Oct 2002 13:46:21 -0600 + +xzgv (0.7-12) unstable; urgency=low + + * Fix problem with rendering non-ASCII characters in the image browser. + (Closes: #157186) + + -- Chris Lawrence Fri, 23 Aug 2002 15:07:46 -0500 + +xzgv (0.7-11) unstable; urgency=low + + * Add build dependencies on libjpeg62-dev and libtiff3g-dev. + + -- Chris Lawrence Thu, 22 Aug 2002 22:30:23 -0500 + +xzgv (0.7-10) unstable; urgency=low + + * Transition to libpng3 (new imlib). + + -- Chris Lawrence Wed, 21 Aug 2002 13:42:27 -0500 + +xzgv (0.7-9) unstable; urgency=low + + * Add explicit build dependency on libpng2-dev; for some reason, it + isn't being pulled in on some architectures' build daemons. + + -- Chris Lawrence Wed, 10 Jul 2002 14:19:15 -0500 + +xzgv (0.7-8) unstable; urgency=low + + * Fix bug with middle mouse button in file selector. (Closes: #151788) + Thanks to Russell Marks for the patch. + * Note in xzgv.texi which options aren't accepted in the .xzgvrc file, + based on comments in the file. (Closes: #151787) + + -- Chris Lawrence Tue, 9 Jul 2002 14:09:32 -0500 + +xzgv (0.7-7) unstable; urgency=low + + * Spawn x-terminal-emulator when reading help, rather than xterm. + (Closes: #151738) + * Add icon to menu entry. + + -- Chris Lawrence Tue, 2 Jul 2002 22:29:26 -0500 + +xzgv (0.7-6) unstable; urgency=high + + * Update build dependencies. (Closes: #136067) + * Rebuild against latest libpng. (Closes: #136065) + + -- Chris Lawrence Wed, 27 Feb 2002 10:20:05 -0600 + +xzgv (0.7-5) unstable; urgency=low + + * Include patch from upstream to fix segfaults with some corrupted + JPEGs. + * Rebuild against new libpng. + + -- Chris Lawrence Sun, 13 Jan 2002 19:18:05 -0600 + +xzgv (0.7-4) unstable; urgency=low + + * Clean up info file registration. (Closes: #122461) + + -- Chris Lawrence Thu, 13 Dec 2001 23:10:41 -0600 + +xzgv (0.7-3) unstable; urgency=low + + * Added menu hint "Images." (Closes: #121033) + + -- Chris Lawrence Sun, 25 Nov 2001 00:32:22 -0600 + +xzgv (0.7-2) unstable; urgency=low + + * Add build dependency on texinfo. (Closes: #98881) + + -- Chris Lawrence Fri, 1 Jun 2001 22:47:40 -0500 + +xzgv (0.7-1) unstable; urgency=low + + * New upstream release. + * Upstream added optional support for deleting files w/o confirmation. + (Closes: #75908) + + -- Chris Lawrence Sun, 13 May 2001 15:22:10 -0500 + +xzgv (0.6-2) unstable; urgency=low + + * Fix segmentation fault when reading certain + pathologically-constructed GIFs that nonetheless conform with the + GIF specification, using a patch from the upstream author. + + -- Chris Lawrence Wed, 13 Dec 2000 15:08:04 -0600 + +xzgv (0.6-1) unstable; urgency=low + + * New upstream release + * Fix missing build dependency. (Closes: #76389) + * Prune non-essential build dependencies; you've got to love the transitive + property of Debian dependencies... + * Add homepage URL to Description. + + -- Chris Lawrence Sat, 25 Nov 2000 01:08:50 -0600 + +xzgv (0.5-1) unstable; urgency=low + + * New upstream release. + * Enable MMX optimization on i386, since it seems to work again upstream. + + -- Chris Lawrence Sat, 28 Oct 2000 22:05:59 -0500 + +xzgv (0.4-1) unstable; urgency=low + + * New upstream release. (Closes: #64355) + + -- Chris Lawrence Fri, 19 May 2000 19:00:40 -0500 + +xzgv (0.3-1) unstable; urgency=low + + * Initial Release. + * Disabled MMX option since gas chokes on the asm code. + + -- Chris Lawrence Sat, 29 Jan 2000 07:18:39 -0600 --- xzgv-0.9.1.orig/debian/compat +++ xzgv-0.9.1/debian/compat @@ -0,0 +1 @@ +5 --- xzgv-0.9.1.orig/debian/control +++ xzgv-0.9.1/debian/control @@ -0,0 +1,30 @@ +Source: xzgv +Section: graphics +Priority: optional +Maintainer: Theodore Y. Ts'o +Build-Depends: debhelper (>= 5), gawk, libgtk2.0-dev, texinfo, install-info +Standards-Version: 3.9.5 + +Package: xzgv +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Picture viewer for X with a thumbnail-based selector + xzgv is a picture viewer for X, with a thumbnail-based file selector. + Most file formats are supported, and the thumbnails used are + compatible with xv, zgv, and the Gimp. It can also be used with `xzgv + file(s)', to effectively bypass the file selector. + . + xzgv differs from other picture viewers for X in that it uses one + window for both the file selector and viewer, it (unlike xv) allows + both scrolling and fit-to-window methods of viewing large pictures, + and it (unlike xv and some others) doesn't ever mangle the picture's + aspect ratio. + . + It also provides extensive keyboard support; if you prefer using the + keyboard, this is almost certainly the best viewer for you. But it + doesn't skimp on the mousey stuff, either. + . + Note that this program is written by the author of the svgalib-based + "zgv", and has similar features. + . + Home Page: http://sourceforge.net/projects/xzgv --- xzgv-0.9.1.orig/debian/copyright +++ xzgv-0.9.1/debian/copyright @@ -0,0 +1,47 @@ +This package was debianized by Chris Lawrence on +Sat, 29 Jan 2000 07:18:39 -0600. The Debian packaging was recreated +by Theodore Y. Ts'o on Tue, 18 Dec 2007 09:06:26 -0500. + +It was downloaded from using +the svn repository located at: + + + +Upstream Authors: + + Russell Marks + Reuben Thomas + and others; see the "Acknowledgements" section in the info file + or man page. + +Copyright: + + xzgv 0.9 - picture viewer for X, with thumbnail-based file selector. + Copyright (C) 1999-2003 Russell Marks. + Copyright (C) 2007 Reuben Thomas. + + Debian packaging is Copyright 2000-2003 by Chris Lawrence + and is licensed under the GPL + + Debian packaging is Copyright 2003, 2004, 2005, 2007 by + Theodore Y. Ts'o and is licensed under the GPL + +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 St, Fifth Floor, Boston, MA + 02110-1301, USA. + + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. --- xzgv-0.9.1.orig/debian/dirs +++ xzgv-0.9.1/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/pixmaps --- xzgv-0.9.1.orig/debian/docs +++ xzgv-0.9.1/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +TODO --- xzgv-0.9.1.orig/debian/menu +++ xzgv-0.9.1/debian/menu @@ -0,0 +1,3 @@ +?package(xzgv):needs="X11" section="Applications/Viewers"\ + title="xzgv Image Viewer" command="/usr/bin/xzgv" hints="Images"\ + icon="/usr/share/pixmaps/xzgv.xpm" --- xzgv-0.9.1.orig/debian/rules +++ xzgv-0.9.1/debian/rules @@ -0,0 +1,108 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PATH=/bin:/usr/bin:/usr/sbin + +CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + +CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \ + `pkg-config --cflags x11` +LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lglib-2.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lglib-2.0 -lX11 -lm + +configure: debian/configure-stamp +debian/configure-stamp: + dh_testdir + + # xzgv doesn't use configure + + touch configure-stamp + + +build: build-arch build-indep + +build-arch: debian/build-arch-stamp +debian/build-arch-stamp: debian/configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) CFLAGS="$(CPPFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)" all info + + touch $@ + +build-indep: debian/build-indep-stamp +debian/build-indep-stamp: debian/configure-stamp + #docbook-to-man debian/xzgv.sgml > xzgv.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f debian/*-stamp + + # Add here commands to clean up after the build process. + $(MAKE) realclean + rm -rf `find . -type d -name .xvpics` + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/xzgv. + $(MAKE) install PREFIX=$(CURDIR)/debian/xzgv/usr INFODIR=$(CURDIR)/debian/xzgv/usr/share/info MANDIR=$(CURDIR)/debian/xzgv/usr/share/man/man1 INFO_DIR_UPDATE=no + cp $(CURDIR)/debian/xzgv.xpm $(CURDIR)/debian/xzgv/usr/share/pixmaps + rm -f $(CURDIR)/debian/xzgv/usr/share/info/dir* + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam + dh_installmime +# dh_python +# dh_installinit +# dh_installcron + dh_installinfo $(CURDIR)/doc/xzgv.info.gz + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- xzgv-0.9.1.orig/debian/source/format +++ xzgv-0.9.1/debian/source/format @@ -0,0 +1 @@ +1.0 --- xzgv-0.9.1.orig/debian/xzgv.prerm +++ xzgv-0.9.1/debian/xzgv.prerm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +# dummy empty prerm script to ensure clean upgrades from wheezy +# (that still called install-info) +# See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726800 + +#DEBHELPER# --- xzgv-0.9.1.orig/debian/xzgv.xpm +++ xzgv-0.9.1/debian/xzgv.xpm @@ -0,0 +1,51 @@ +/* XPM */ +static char * xzgv_xpm[] = { +"32 32 16 1", +" c None", +". c #333333", +"+ c #007F7F", +"@ c #4C4C4C", +"# c #666667", +"$ c #191919", +"% c #7F7F7F", +"& c #B2B2B2", +"* c #CCCCCC", +"= c #007F00", +"- c #00FF00", +"; c #999999", +"> c #00007F", +", c #00FFFF", +"' c #7F7F00", +") c #E5E5E5", +" ", +" ", +" ", +" ", +" .+@#+@+#+@. ", +" $%&****&****&.$ ", +" $@**&*&*&*&*&**&+$ ", +" +&***************@$ ", +" #==..+*&&-&;-&&&&;&*&&->=#@= ", +" *&;=+-;-++-&-;-;-&-&&**+#-&& ", +" &&-+-#.+@@-;;---*&&&-&&;.+&&$ ", +" $&&;=&+$;,;&-;&*',;&,*-&&+-&- ", +" &&=-&;-%&&;--;;-@=.+&;-,%.&-$ ", +" $&-++-&*-;,*-;--;-;+.-+-&&+;& ", +" &;=-;&;--;-&-;;-&&-;..-*&=;;$ ", +" $-&>-;-;-&-&-;--&--;-+;-;,;-; ", +" $.;*)))))*)*))*))*)**)**&$ ", +" $%*&*&&*&@+;*&*&*&**&**; ", +" $+***&*&****&*&*&*&**&*% ", +" $%**&*****&*&**&**&*&**+ ", +" +&&*&&#+;&**&*&*&*&**&. ", +" $;*&**+%@+%**&**&*&*&+ ", +" $+**&*&**&*&*&*&****+$ ", +" @;*&**&**&*&*&*&&*+. ", +" $+&*&*&*&*&*&****#. ", +" $@**&**&*&**&*&@$ ", +" $+;********&%. ", +" $.+%;;;#@+$ ", +" $.$$. ", +" $ ", +" ", +" "}; --- xzgv-0.9.1.orig/doc/xzgv.texi +++ xzgv-0.9.1/doc/xzgv.texi @@ -2530,7 +2530,7 @@ @cindex identifying files @cindex files, identification of -@cindex picture format, identification of +@cindex picture format, identification of @cindex file format, identification of The format a file is in is identified by its content. The file-reading @@ -3005,9 +3005,9 @@ the GTK+ version being used by xzgv. @item -The bitdepth your X server is running in (common depths are 8-bit (256 -colours), 15-bit, 16-bit, 24-bit, and 32-bit). If you don't know what -depth you're running in, try @code{xdpyinfo|grep depth}. +The bitdepth your X server is running in (common depths are 16-bit, +24-bit, and 32-bit). If you don't know what depth you're running in, try +@code{xdpyinfo|grep depth}. @item A description of the bug --- what effects it has, the circumstances it @@ -3073,15 +3073,10 @@ @cindex changes, possible future @cindex wish-list -@c I don't refer to the reporting bugs node here, because I think that -@c would be overly confusing. - If you want to suggest a feature you'd like in xzgv, or a change to an -existing feature, contact me at @email{rus@@svgalib.org}. +existing feature, contact me; see @xref{Reporting Bugs} for the address. -xzgv is rather a moving target at the moment, so for now future changes -etc. are only listed in the @file{TODO} file. Normal service will be -resumed once things settle down a bit. :-) +Future changes etc. are listed in the @file{TODO} file. @node Keyboard Commands Index, Menu Item Index, Future Changes, Top --- xzgv-0.9.1.orig/src/Makefile +++ xzgv-0.9.1/src/Makefile @@ -9,8 +9,10 @@ # This gets definitions for CC, CFLAGS, BINDIR etc. include ../config.mk -CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` -LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` +CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \ + `pkg-config --cflags x11` +LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \ + `pkg-config --libs x11` -lm all: xzgv @@ -23,7 +25,7 @@ backend.o xzgv: $(OBJS) - $(CC) $(LDFLAGS) -o xzgv $(OBJS) + $(CC) -o xzgv $(OBJS) $(LDFLAGS) installdirs: /bin/sh ../mkinstalldirs $(BINDIR)