Freeze exception for zgv/5.9-5
Dear release team,
I ask for a freeze exception for zgv version 5.9-5.
I have prepared few QA uploads. But unfortunately not all of them were
sponsored before freeze [1].
This update of the package does not fix any RC bug, but it fixes important,
normal and wishlist bugs. Also the quality of package was improved in common.
File in attachment was produced using command:
$ debdiff zgv_5.9-4.dsc zgv_5.9-5.dsc > zgv_5.9-4:5.9-5.diff
It would be nice to see this updated package in Wheezy.
Best regards,
Boris
[1] http://bugs.debian.org/cgi-bin/pkgreport.cgi?include=subject%3A[QA];package=sponsorship-requests
diff -u zgv-5.9/config.mk zgv-5.9/config.mk
--- zgv-5.9/config.mk
+++ zgv-5.9/config.mk
@@ -8,7 +8,7 @@
# This is likely to be what you'll want for most systems:
#
CC=gcc
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS) -O2 -Wall -fomit-frame-pointer -finline-functions
+CFLAGS+=-O2 -Wall -fomit-frame-pointer -finline-functions
#
# If you're brave enough to try compiling zgv on a non-x86 system :-),
# this might be a better bet:
diff -u zgv-5.9/doc/zgv.1 zgv-5.9/doc/zgv.1
--- zgv-5.9/doc/zgv.1
+++ zgv-5.9/doc/zgv.1
@@ -133,7 +133,7 @@
When choosing an auto-mode-fit mode, add \fIdiff\fR to each mode's
width and height. For example, with a value of 20 any picture up to
820x620 will be displayed in an 800x600 mode if possible. If
-\fIdiff\fR is negative, for example -20, the effect is reversed; any
+\fIdiff\fR is negative, for example \-20, the effect is reversed; any
picture above 780x580 will be displayed in a mode with a resolution
higher than 800x600 if possible.
.PP
@@ -501,7 +501,7 @@
.RS
Cause zgv to output the x and y offsets, and width and height of the
section of the image being displayed when you exit zgv. Can be useful
-for things like `\fBpnmcut `zgv -s input.ppm` input.ppm > output.ppm\fR'.
+for things like `\fBpnmcut `zgv \-s input.ppm` input.ppm > output.ppm\fR'.
.PP
.RE
`\fB-T\fR'
@@ -510,7 +510,7 @@
`\fB--show-tagged\fR'
.RS
Print names of tagged files on exit. This can be useful in constructions
-something like `\fBmv `zgv -T` /tmp\fR', which moves to \fI/tmp\fR only
+something like `\fBmv `zgv \-T` /tmp\fR', which moves to \fI/tmp\fR only
the files you select.
.PP
.RE
@@ -2835,10 +2835,10 @@
from X, Emacs, etc.
.PP
One problem with this is that, since zgv uses `\fBfork()\fR', `\fBzgv
--h\fR' and other things which give output on stdout will give confusing
+\-h\fR' and other things which give output on stdout will give confusing
results; the original zgv process will have exited before the new
(replacement) zgv process exits. Redirect stdout if you want things to
-make a bit more sense --- for example, `\fBzgv -h | less\fR' will do what
+make a bit more sense \-\-\- for example, `\fBzgv \-h | less\fR' will do what
you'd expect. For more `normal' uses where zgv doesn't give any output,
there's no problem.
.PP
@@ -2870,7 +2870,7 @@
.PP
.SH "ENABLING THE MOUSE"
To use the mouse support for just one zgv session, start zgv with
-something like `\fBzgv -M\fR'. To enable it by default, add \fImouse
+something like `\fBzgv \-M\fR'. To enable it by default, add \fImouse
on\fR to a config file (see \fBConfig Files\fR).
.PP
zgv uses svgalib's mouse configuration; if you have not set that up, you
@@ -3629,7 +3629,7 @@
Here are some details you should include:
.PP
\fBo\fR
-The version of zgv you are running (`\fBzgv --version\fR' reports this).
+The version of zgv you are running (`\fBzgv \-\-version\fR' reports this).
.PP
\fBo\fR
The version of svgalib (try `\fBls /usr/lib/libvga.*\fR' for this).
@@ -3649,7 +3649,7 @@
\fBo\fR
Finally, if you are a programmer and believe you have managed to fix the
bug yourself, patches are gratefully accepted. :-) You should generate
-the patch using `\fBdiff -c\fR' or (preferably) `\fBdiff -u\fR'.
+the patch using `\fBdiff \-c\fR' or (preferably) `\fBdiff \-u\fR'.
.PP
.RE
.PP
diff -u zgv-5.9/src/Makefile zgv-5.9/src/Makefile
--- zgv-5.9/src/Makefile
+++ zgv-5.9/src/Makefile
@@ -47,13 +47,13 @@
modesel.o readpcd.o readtiff.o readprf.o zgv_io.o
zgv: $(ZGV_OBJS)
- $(CC) $(CFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS)
+ $(CC) $(LDFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS)
bdf2h: bdf2h.o
- $(CC) $(CFLAGS) -o bdf2h bdf2h.o
+ $(CC) $(LDFLAGS) -o bdf2h bdf2h.o
install-info: install-info.c
- $(CC) $(INFODIRDEF) -o install-info install-info.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(INFODIRDEF) -o install-info install-info.c
# explicitly removes /usr/bin/{zgv,zgv-sdl} in case of old
# installation. Not nice to put this in the install target,
diff -u zgv-5.9/debian/zgv.mime zgv-5.9/debian/zgv.mime
--- zgv-5.9/debian/zgv.mime
+++ zgv-5.9/debian/zgv.mime
@@ -1,6 +1,6 @@
-image/gif; /usr/bin/zgv %s; test=expr "`/usr/bin/tty`" : '/dev/\(tty\|vc/\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\.tty[0-9][0-9]*\.'`hostname`'$' >/dev/null 2>&1; description=GIF Image; nametemplate=%s.gif; needsterminal;
-image/jpeg; /usr/bin/zgv %s; test=expr "`/usr/bin/tty`" : '/dev/\(tty\|vc/\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\.tty[0-9][0-9]*\.'`hostname`'$' >/dev/null 2>&1; description=JPEG Image; nametemplate=%s.jpg; needsterminal;
-image/pjpeg; /usr/bin/zgv %s; test=expr "`/usr/bin/tty`" : '/dev/\(tty\|vc/\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\.tty[0-9][0-9]*\.'`hostname`'$' >/dev/null 2>&1; description=JPEG Image; nametemplate=%s.jpg; needsterminal;
-image/png; /usr/bin/zgv %s; test=expr "`/usr/bin/tty`" : '/dev/\(tty\|vc/\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\.tty[0-9][0-9]*\.'`hostname`'$' >/dev/null 2>&1; description=PNG Image; nametemplate=%s.png; needsterminal;
-image/tiff; /usr/bin/zgv %s; test=expr "`/usr/bin/tty`" : '/dev/\(tty\|vc/\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\.tty[0-9][0-9]*\.'`hostname`'$' >/dev/null 2>&1; description=TIFF Image; nametemplate=%s.tif; needsterminal;
-image/bmp; /usr/bin/zgv %s; test=expr "`/usr/bin/tty`" : '/dev/\(tty\|vc/\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\.tty[0-9][0-9]*\.'`hostname`'$' >/dev/null 2>&1; description=BMP Image; nametemplate=%s.bmp; needsterminal;
+image/gif; /usr/bin/zgv '%s'; test=expr "`/usr/bin/tty`" : '/dev/\\(tty\\|vc/\\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\\.tty[0-9][0-9]*\\.'`hostname`'$' >/dev/null 2>&1; description=GIF Image; nametemplate=%s.gif; needsterminal
+image/jpeg; /usr/bin/zgv '%s'; test=expr "`/usr/bin/tty`" : '/dev/\\(tty\\|vc/\\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\\.tty[0-9][0-9]*\\.'`hostname`'$' >/dev/null 2>&1; description=JPEG Image; nametemplate=%s.jpg; needsterminal
+image/pjpeg; /usr/bin/zgv '%s'; test=expr "`/usr/bin/tty`" : '/dev/\\(tty\\|vc/\\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\\.tty[0-9][0-9]*\\.'`hostname`'$' >/dev/null 2>&1; description=JPEG Image; nametemplate=%s.jpg; needsterminal
+image/png; /usr/bin/zgv '%s'; test=expr "`/usr/bin/tty`" : '/dev/\\(tty\\|vc/\\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\\.tty[0-9][0-9]*\\.'`hostname`'$' >/dev/null 2>&1; description=PNG Image; nametemplate=%s.png; needsterminal
+image/tiff; /usr/bin/zgv '%s'; test=expr "`/usr/bin/tty`" : '/dev/\\(tty\\|vc/\\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\\.tty[0-9][0-9]*\\.'`hostname`'$' >/dev/null 2>&1; description=TIFF Image; nametemplate=%s.tif; needsterminal
+image/bmp; /usr/bin/zgv '%s'; test=expr "`/usr/bin/tty`" : '/dev/\\(tty\\|vc/\\)[0-9][0-9]*' >/dev/null 2>&1 || expr "$STY" : '[0-9][0-9]*\\.tty[0-9][0-9]*\\.'`hostname`'$' >/dev/null 2>&1; description=BMP Image; nametemplate=%s.bmp; needsterminal
diff -u zgv-5.9/debian/watch zgv-5.9/debian/watch
--- zgv-5.9/debian/watch
+++ zgv-5.9/debian/watch
@@ -3 +3 @@
-ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/svga/zgv-(.*)\.tar\.gz
+ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/svga/zgv-(.*[0-9])\.tar\.gz
diff -u zgv-5.9/debian/changelog zgv-5.9/debian/changelog
--- zgv-5.9/debian/changelog
+++ zgv-5.9/debian/changelog
@@ -1,3 +1,42 @@
+zgv (5.9-5) unstable; urgency=low
+
+ * QA upload.
+ * Updated debian/watch: changed regexp.
+ * Bumped Standards-Version to 3.9.3 (was 3.9.2).
+ * Added debhelper version (9 is used); updated debian/compat.
+ Fixed lintian note package-lacks-versioned-build-depends-on-debhelper.
+ * Added file debian/source/format: format 1.0 is still used in this package.
+ * Patched files config.mk and src/Makefile to respect build with
+ hardening flags. [Thanks to Mario 'BitKoenig' Holbe] (Closes: #663625)
+ * Patched Makefile: cut permanent launching strip command.
+ Fixed not handling nostrip build option [policy 10.1]. (Closes: #438363)
+ * Patched file debian/zgv.mime. [Thanks to Mario 'BitKoenig' Holbe]
+ Fixed problem that mailcap entries did not work on plain consoles.
+ (Closes: #379319)
+ * Rewritten debian/rules:
+ - now dh is used instead of direct dh_* commands
+ - added --as-needed option to LDFLAGS
+ - added section get-orig-source (uscan is used)
+ - fixed lintian warnings:
+ + hardening-no-relro
+ + hardening-no-fortify-functions
+ + dh-clean-k-is-deprecated
+ + debian-rules-ignores-make-clean-error
+ + debian-rules-missing-recommended-target build-arch
+ + debian-rules-missing-recommended-target build-indep
+ * Updated debian/control:
+ - added Homepage field
+ - added ${misc:Depends} to package zgv
+ - changed build dependency from libpng12-dev to libpng-dev
+ (Closes: #662575)
+ * Updated debian/menu: fixed lintian warnings:
+ - unquoted-string-in-menu-item
+ - menu-item-uses-apps-section
+ * Updated doc/zgv.1: fixed lintian notes hyphen-used-as-minus-sign.
+ * Deleted file debian/postinst: generated automatically.
+
+ -- Boris Pek <tehnick-8@mail.ru> Sat, 30 Jun 2012 04:09:42 +0300
+
zgv (5.9-4) unstable; urgency=low
* QA upload
diff -u zgv-5.9/debian/compat zgv-5.9/debian/compat
--- zgv-5.9/debian/compat
+++ zgv-5.9/debian/compat
@@ -1 +1 @@
-7
+9
reverted:
--- zgv-5.9/debian/postinst
+++ zgv-5.9.orig/debian/postinst
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-
-# Make sure we should be running...
-case "$1" in
- configure)
- # continue below
- ;;
- abort-upgrade|abort-remove|abort-deconfigure)
- exit 0
- ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# the old postinst didn't remove MIME stuff on upgrade, so we need to
-# check whether it's still there and remove it if so.
-if [ -f /var/lib/mime/mime-db ] && [ -x install-mime ]; then
- if grep zgv /var/lib/mime/mime-db >/dev/null 2>&1; then
- /usr/sbin/install-mime --remove --package=zgv
- fi
-fi
-
-#DEBHELPER#
diff -u zgv-5.9/debian/rules zgv-5.9/debian/rules
--- zgv-5.9/debian/rules
+++ zgv-5.9/debian/rules
@@ -2,68 +2,35 @@
-# -*- makefile -*-
-# Made with the aid of dh_make, by Craig Small
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
-# Some lines taken from debmake, by Cristoph Lameter.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-
-build: build-stamp
-build-stamp:
- dh_testdir
- # Add here commands to compile the package.
- make src RCFILE=/etc/zgv.conf
- touch build-stamp
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
+LDFLAGS+=-Wl,--as-needed
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
+%:
+ dh $@ --parallel
- dh_clean
-
-# Build architecture-independent files here.
-binary-indep: build
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build
-# dh_testversion
- dh_testdir
+override_dh_auto_clean:
dh_testroot
- dh_clean -k
- dh_installdirs
+ dh_auto_clean
+ rm -f build-stamp
- # Add here commands to install the files into debian/zgv
- $(MAKE) -C src install PREFIX=`pwd`/debian/zgv/usr
+override_dh_auto_build:
+ dh_auto_build -- src RCFILE=/etc/zgv.conf
+override_dh_auto_install:
+ $(MAKE) -C src install PREFIX=`pwd`/debian/zgv/usr
cp -p doc/sample.zgvrc debian/zgv/etc/zgv.conf
-
cp -p debian/presubj debian/zgv/usr/share/bug/zgv/
- dh_installdocs
+override_dh_installinfo:
dh_installinfo doc/zgv doc/zgv-?
- dh_installexamples
- dh_installmime
-# dh_installmenu
-# dh_installinit
-# dh_installcron
+
+override_dh_installman:
dh_installman doc/zgv.1
- dh_installchangelogs
- dh_strip
- dh_compress
- # keep it suid
+
+override_dh_fixperms:
dh_fixperms --exclude bin/zgv
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
-# dh_makeshlibs
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: override_dh_strip
+override_dh_strip:
+ dh_strip
+
+get-orig-source:
+ uscan --noconf --verbose --force-download --rename --download-current-version --destdir=..
+
diff -u zgv-5.9/debian/menu zgv-5.9/debian/menu
--- zgv-5.9/debian/menu
+++ zgv-5.9/debian/menu
@@ -1,3 +1,3 @@
-?package(zgv):command="/usr/bin/zgv" needs=vc \
- section=Apps/Viewers hotkey="z" title=zgv \
+?package(zgv):command="/usr/bin/zgv" needs="vc" \
+ section="Applications/Viewers" hotkey="z" title="zgv" \
longtitle="SVGALib multi-format graphics file viewer"
diff -u zgv-5.9/debian/control zgv-5.9/debian/control
--- zgv-5.9/debian/control
+++ zgv-5.9/debian/control
@@ -2,12 +2,15 @@
Section: graphics
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.9.2
-Build-Depends: libsvga1-dev, debhelper, libjpeg-dev, libpng12-dev, libtiff4-dev, gawk
+Build-Depends: debhelper (>> 9),
+ libsvga1-dev, libjpeg-dev, libpng-dev, libtiff4-dev, gawk
+Homepage: http://www.svgalib.org/rus/zgv/
+Standards-Version: 3.9.3
Package: zgv
Architecture: i386 amd64
-Depends: ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info
+Depends: ${misc:Depends}, ${shlibs:Depends},
+ dpkg (>= 1.15.4) | install-info
Description: SVGAlib graphics viewer
'zgv' is a graphics viewer, based around SVGAlib, which can display
GIF87a, GIF89a, JPEG/JFIF, PNG, PBM/PGM/PPM, BMP, and TGA files on a
only in patch2:
unchanged:
--- zgv-5.9.orig/Makefile
+++ zgv-5.9/Makefile
@@ -119,7 +119,6 @@
cd zgv-$(VERS)-bin/doc; ln -s ../../doc/sample.zgvrc .
cd zgv-$(VERS)-bin/doc; ln -s ../../doc/{zgv,zgv-?,zgv.1} .
cd zgv-$(VERS)-bin; ln -s ../src/{zgv,install-info} .
- strip zgv-$(VERS)-bin/{zgv,install-info}
tar zchvf ../zgv-$(VERS)-bin.tar.gz zgv-$(VERS)-bin
rm -fr zgv-$(VERS)-bin
$(MAKE) clean
only in patch2:
unchanged:
--- zgv-5.9.orig/debian/source/format
+++ zgv-5.9/debian/source/format
@@ -0,0 +1 @@
+1.0
Reply to: