[cpl-plugin-kmos] 01/02: Merge branch 'debian-template' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-kmos.

commit 61836a7da2ce217b26be8d4df808be1f7c37e38b
Merge: 875c8ad e561a5d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jan 23 14:02:38 2014 +0100

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/patches/series

 debian/patches/fix_test_fail.patch                   | 20 +++++++++-----------
 .../{serial-tests => force-serial-tests.patch}       |  0
 debian/patches/series                                |  3 ++-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --cc debian/patches/series
index 55229a6,20ff8b9..611e439
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,5 +1,8 @@@
  libadd_cpl.patch
  set_plugindir.patch
  use-std-paths-for-cpl.patch
 +no_test_data.patch
 +fortify.patch
 +spellfix.patch
- serial-tests
+ fix_test_fail.patch
+ force-serial-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-kmos.git