summaryrefslogtreecommitdiff
path: root/debian/changelog
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 /debian/changelog
parent6d8a89ebda2f65c1d2960968447eb51a53167d21 (diff)
Document patch (DEP3 + patch header)
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog4
1 files changed, 2 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