Bug#687898: unblock: evince/3.4.0-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package evince
Most importantly
- it contains a fix for the RC bug #658139 which re-adds a mime entry
for application/pdf for the old mime-support system.
- enables all hardening flags which is deemed beneficial for a (PDF)
viewer
Full debdiff is attached.
Thanks,
Michael
unblock evince/3.4.0-3
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru evince-3.4.0/debian/changelog evince-3.4.0/debian/changelog
--- evince-3.4.0/debian/changelog 2012-05-16 16:09:16.000000000 +0200
+++ evince-3.4.0/debian/changelog 2012-08-30 02:28:06.000000000 +0200
@@ -1,3 +1,22 @@
+evince (3.4.0-3) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Build with all hardening flags. Closes: #678995.
+ * Add corresponding build-dependency on a recent dpkg-dev.
+
+ [ Michael Biebl ]
+ * Build against poppler 0.18.
+
+ [ Jeremy Bicha ]
+ * Fix typo in package description
+ * Have libevdocument3-4 break/replace libevince3-3 too (LP: #1018543)
+
+ [ Josselin Mouette ]
+ * Re-add evince.mime with only application/pdf supported.
+ Closes: #658139.
+
+ -- Michael Biebl <biebl@debian.org> Thu, 30 Aug 2012 02:27:50 +0200
+
evince (3.4.0-2) unstable; urgency=low
* Upload to unstable.
diff -Nru evince-3.4.0/debian/control evince-3.4.0/debian/control
--- evince-3.4.0/debian/control 2012-05-16 17:27:45.000000000 +0200
+++ evince-3.4.0/debian/control 2012-08-30 02:32:50.000000000 +0200
@@ -10,6 +10,7 @@
Uploaders: Frederic Peters <fpeters@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: cdbs (>= 0.4.90),
debhelper (>= 8),
+ dpkg-dev (>= 1.16.1),
dh-autoreconf,
intltool (>= 0.35.0),
gnome-pkg-tools (>= 0.10),
@@ -26,7 +27,7 @@
libsm-dev (>= 2:1.0.0),
zlib1g-dev,
libnautilus-extension-dev (>= 2.91.4),
- libpoppler-glib-dev (>= 0.16.0),
+ libpoppler-glib-dev (>= 0.18.0),
libspectre-dev (>= 0.2.0),
libtiff4-dev,
libdjvulibre-dev (>= 3.5.17),
@@ -136,11 +137,13 @@
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
+Replaces: libevince3-3
+Breaks: libevince3-3
Description: Document (PostScript, PDF) rendering library
This package contains libevdocument, which performs the rendering of the
documents.
.
- It shipps with a ps, pdf, dvi, tiff, djvu, comics and xps backend.
+ It ships with a ps, pdf, dvi, tiff, djvu, comics and xps backend.
Package: libevview3-3
Architecture: any
diff -Nru evince-3.4.0/debian/control.in evince-3.4.0/debian/control.in
--- evince-3.4.0/debian/control.in 2012-04-19 15:21:53.000000000 +0200
+++ evince-3.4.0/debian/control.in 2012-08-30 02:28:27.000000000 +0200
@@ -5,6 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.4.90),
debhelper (>= 8),
+ dpkg-dev (>= 1.16.1),
dh-autoreconf,
intltool (>= 0.35.0),
gnome-pkg-tools (>= 0.10),
@@ -21,7 +22,7 @@
libsm-dev (>= 2:1.0.0),
zlib1g-dev,
libnautilus-extension-dev (>= 2.91.4),
- libpoppler-glib-dev (>= 0.16.0),
+ libpoppler-glib-dev (>= 0.18.0),
libspectre-dev (>= 0.2.0),
libtiff4-dev,
libdjvulibre-dev (>= 3.5.17),
@@ -131,11 +132,13 @@
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
+Replaces: libevince3-3
+Breaks: libevince3-3
Description: Document (PostScript, PDF) rendering library
This package contains libevdocument, which performs the rendering of the
documents.
.
- It shipps with a ps, pdf, dvi, tiff, djvu, comics and xps backend.
+ It ships with a ps, pdf, dvi, tiff, djvu, comics and xps backend.
Package: libevview3-3
Architecture: any
diff -Nru evince-3.4.0/debian/evince.mime evince-3.4.0/debian/evince.mime
--- evince-3.4.0/debian/evince.mime 1970-01-01 01:00:00.000000000 +0100
+++ evince-3.4.0/debian/evince.mime 2012-08-30 02:27:46.000000000 +0200
@@ -0,0 +1 @@
+application/pdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf; priority=5
diff -Nru evince-3.4.0/debian/patches/01_poppler-0.16-compat.patch evince-3.4.0/debian/patches/01_poppler-0.16-compat.patch
--- evince-3.4.0/debian/patches/01_poppler-0.16-compat.patch 2012-04-19 14:54:11.000000000 +0200
+++ evince-3.4.0/debian/patches/01_poppler-0.16-compat.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-Description: Make evince compile against poppler 0.16
-Author: Pino Toscano <pino@debian.org>
-Index: evince-3.3.90/configure.ac
-===================================================================
---- evince-3.3.90.orig/configure.ac 2012-03-08 13:47:49.657097584 +0100
-+++ evince-3.3.90/configure.ac 2012-03-08 13:47:51.641097514 +0100
-@@ -485,7 +485,7 @@
- [enable_pdf=yes])
-
- if test "x$enable_pdf" = "xyes"; then
-- POPPLER_REQUIRED=0.18.0
-+ POPPLER_REQUIRED=0.16.0
- PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED,enable_pdf=yes,enable_pdf=no)
-
- if test "x$enable_pdf" = "xyes"; then
-Index: evince-3.3.90/backend/pdf/ev-poppler.cc
-===================================================================
---- evince-3.3.90.orig/backend/pdf/ev-poppler.cc 2012-03-08 13:47:49.657097584 +0100
-+++ evince-3.3.90/backend/pdf/ev-poppler.cc 2012-03-08 13:48:22.821096411 +0100
-@@ -1234,9 +1234,11 @@
-
- }
- break;
-+#if POPPLER_CHECK_VERSION(0, 18, 0)
- case POPPLER_ACTION_JAVASCRIPT:
- unimplemented_action = "POPPLER_ACTION_JAVASCRIPT";
- break;
-+#endif
- case POPPLER_ACTION_UNKNOWN:
- unimplemented_action = "POPPLER_ACTION_UNKNOWN";
- }
diff -Nru evince-3.4.0/debian/patches/series evince-3.4.0/debian/patches/series
--- evince-3.4.0/debian/patches/series 2012-05-16 16:09:01.000000000 +0200
+++ evince-3.4.0/debian/patches/series 2012-06-26 04:06:49.000000000 +0200
@@ -1,2 +1 @@
-01_poppler-0.16-compat.patch
03_nodisplay.patch
diff -Nru evince-3.4.0/debian/rules evince-3.4.0/debian/rules
--- evince-3.4.0/debian/rules 2012-04-19 15:05:26.000000000 +0200
+++ evince-3.4.0/debian/rules 2012-06-26 00:45:18.000000000 +0200
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+include /usr/share/dpkg/buildflags.mk
+
include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
Reply to: