[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.1+dfsg-3-1-ge13cc05

[Julien Valroff]

The following commit has been merged in the master branch:
commit e13cc0597524567b7d9a94b9acbde22576ac9a31
Author: Julien Valroff <julien at kirya.net>
Date:   Thu Aug 25 18:09:44 2011 +0200

    Add gbp.conf to allow filtering out non DFSG-clean files when using git-import-orig to merge new upstream releases

diff --git a/debian/changelog b/debian/changelog
index 917929f..09a49cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dspam (3.10.1+dfsg-4) unstable; urgency=low
+
+  * Add gbp.conf to allow filtering out non DFSG-clean files when using
+    git-import-orig to merge new upstream releases 
+
+ -- Julien Valroff <julien at debian.org>  Thu, 25 Aug 2011 18:09:36 +0200
+
 dspam (3.10.1+dfsg-3) unstable; urgency=low
 
   * Fix Apache configuration example (Closes: #638289) 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..36e790c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[git-import-orig]
+filter = contrib/lotus_notes/*
+filter-pristine-tar = True

-- 
Debian packages for the DSPAM anti-spam filter