[cpl-plugin-uves] 03/05: 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-uves.

commit ab985433d72de59472c417b518a21eed5f97303e
Merge: 936dfc2 e561a5d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jan 29 12:00:32 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 5ba9065,20ff8b9..3ed065f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,5 +1,9 @@@
  libadd_cpl.patch
  set_plugindir.patch
  use-std-paths-for-cpl.patch
 +use_system_qfits.patch
 +fix_compiler_errors.patch
 +shlib-calls-exit.patch
 +fix-typos.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-uves.git