summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJulien BLACHE <jblache@debian.org>2008-11-26 22:35:41 +0100
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:48 +0000
commitb85ae08349167bed47c71ed7ace8acd275b9ab22 (patch)
tree94694d586ca7782fb453bf07c5251e02b52843d9 /debian
parente5485fc0e6e11763f1e4d309c5ccced01802974d (diff)
parentdc7150ada6000f0c8e6ee61da9598573d3b63b7f (diff)
Imported Debian patch 0.996-1debian/0.996-1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
-rw-r--r--debian/patches/06_fix_pdf_xref.dpatch28
-rw-r--r--debian/xsane.postinst2
3 files changed, 15 insertions, 28 deletions
diff --git a/debian/changelog b/debian/changelog
index 15b16d5..328b454 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xsane (0.996-1) unstable; urgency=low
+
+ * New upstream release.
+
+ * debian/xsane.postinst:
+ + Make maintainer script set -e.
+
+ * debian/patches/06_fix_pdf_xref.dpatch:
+ + Updated; this release fixes the single-page case but the multipage case
+ was left out.
+
+ -- Julien BLACHE <jblache@debian.org> Wed, 26 Nov 2008 22:35:41 +0100
+
xsane (0.995-6) unstable; urgency=low
* debian/patches/06_fix_pdf_xref.dpatch:
diff --git a/debian/patches/06_fix_pdf_xref.dpatch b/debian/patches/06_fix_pdf_xref.dpatch
index 07ffad0..60cc285 100644
--- a/debian/patches/06_fix_pdf_xref.dpatch
+++ b/debian/patches/06_fix_pdf_xref.dpatch
@@ -19,31 +19,3 @@ diff -urNad xsane-0.995~/src/xsane-multipage-project.c xsane-0.995/src/xsane-mul
}
}
#ifdef HAVE_LIBTIFF
-diff -urNad xsane-0.995~/src/xsane-save.c xsane-0.995/src/xsane-save.c
---- xsane-0.995~/src/xsane-save.c 2008-09-17 21:53:33.000000000 +0200
-+++ xsane-0.995/src/xsane-save.c 2008-09-17 21:54:07.654207681 +0200
-@@ -4087,7 +4087,7 @@
-
- for (i=1; i <= pages * 2 + 7; i++)
- {
-- fprintf(outfile, "%010lu 00000 n \n", xref->obj[i]);
-+ fprintf(outfile, "%010lu 00000 %c \n", xref->obj[i], (xref->obj[i]) ? 'n' : 'f');
- }
-
- fprintf(outfile, "\n");
-@@ -4186,11 +4186,13 @@
-
- xsane_save_pdf_create_document_header(outfile, &xref, 1, flatedecode);
-
-- xref.obj[4] = ftell(outfile);
-- xref.obj[5] = ftell(outfile);
-+ /* Objects 4 and 5 are unused and do not exist */
-+ xref.obj[4] = 0;
-+ xref.obj[5] = 0;
-
- if (apply_ICM_profile && (cms_function == XSANE_CMS_FUNCTION_EMBED_SCANNER_ICM_PROFILE))
- {
-+ /* Use object 4 for ICM profile */
- icc_object = 4;
- xsane_embed_pdf_icm_profile(outfile, &xref, image_info->icm_profile, flatedecode, icc_object);
- }
diff --git a/debian/xsane.postinst b/debian/xsane.postinst
index 3a7af58..b0b66df 100644
--- a/debian/xsane.postinst
+++ b/debian/xsane.postinst
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
HTMLDOCDIR=/usr/share/doc/xsane/html
NEWHTMLDOCDIR=../xsane-common/html