[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.2+dfsg-3-4-gea794b7
Thomas Preud'homme
robotux at celest.fr
Mon Jan 14 15:01:24 UTC 2013
The following commit has been merged in the master branch:
commit 1ba9073937ee5d4596a4d379e886bb9672f5a9aa
Author: Thomas Preud'homme <robotux at celest.fr>
Date: Mon Jan 14 15:27:44 2013 +0100
Explicit backported commits in CHANGELOG
diff --git a/debian/changelog b/debian/changelog
index 7d8a748..e5689d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dspam (3.10.2+dfsg-4) unstable; urgency=low
* Disable multi-arch since it create many problems with regards to the
handling of shared resources when a package is installed for several
architectures (Closes: #695275).
+ * Enhance 008_fix_exim_integration_doc.diff to state more explicitly in
+ CHANGELOG which changes are backports for Debian of upstream commits.
-- Thomas Preud'homme <robotux at debian.org> Tue, 08 Jan 2013 18:50:26 +0100
diff --git a/debian/patches/008_fix_exim_integration_doc.diff b/debian/patches/008_fix_exim_integration_doc.diff
index 58cdb57..0499477 100644
--- a/debian/patches/008_fix_exim_integration_doc.diff
+++ b/debian/patches/008_fix_exim_integration_doc.diff
@@ -12,7 +12,10 @@ Last-Update: 2012-08-13
--- dspam-3.10.1+dfsg.orig/CHANGELOG
+++ dspam-3.10.1+dfsg/CHANGELOG
-@@ -1,3 +1,5 @@
+@@ -1,3 +1,8 @@
++Patch backported for Debian
++--------------
++
+[20121202:2115] sbajic: Update documentation for Exim integration.
+
Version 3.10.2
--
Debian packages for the DSPAM anti-spam filter
More information about the Pkg-dspam-commits
mailing list