summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <didier@raboud.com>2010-07-25 19:00:36 +0200
committerDidier Raboud <didier@raboud.com>2010-07-25 19:03:18 +0200
commite0f36614bc5827de1825c3832bce1ec756fd7653 (patch)
tree5759f3af9ab5f60254453dd1fb02662b3d32d4a2
parent6d8a89ebda2f65c1d2960968447eb51a53167d21 (diff)
Document patch (DEP3 + patch header)
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch8
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 2ed5765..eaef538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ foomatic-filters (4.0.4-1) UNRELEASED; urgency=low
* Merge from Ubuntu:
- Install the apport hook on Ubuntu
- Merge the changelog entries.
- - Merge the patch.
+ - Merge the patch (see 4.0.4-0ubuntu2 changelog entry).
- Merge most package relationships.
- Merge package descriptions (Closes: #467380)
- Turn on the insertion of PostScript code for CUPS' page accounting by
@@ -28,7 +28,7 @@ foomatic-filters (4.0.4-1) UNRELEASED; urgency=low
- Rework some Conflicts/Breaks
- Update debian/copyright
- -- Didier Raboud <didier@raboud.com> Sun, 25 Jul 2010 18:58:02 +0200
+ -- Didier Raboud <didier@raboud.com> Sun, 25 Jul 2010 18:59:47 +0200
foomatic-filters (4.0.4-0ubuntu2) maverick; urgency=low
diff --git a/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch b/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch
index 6e8edd8..7709dab 100644
--- a/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch
+++ b/debian/patches/01_foomatic-rip-error-out-on-problems-longer-string-buffers.patch
@@ -1,3 +1,11 @@
+Description: Let foomatic-rip actually error out if something goes wrong. It
+ simply continued or closed silently (exit status 0) on several issues (LP:
+ #570522). Also make string buffers bigger as many of them were too small.
+ This patch contains the changes which are planned to be introduced in
+ Foomatic 4.0.5, so this can be considered a test release for 4.0.5.
+Origin: upstream
+Author: Till Kamppeter <till.kamppeter@gmail.com>
+Last-Update: 2010-06-08
Index: foomatic-filters/ChangeLog
===================================================================
--- foomatic-filters.orig/ChangeLog 2010-07-19 16:40:10.000000000 +0200