[cpl-plugin-sinfo] 40/42: Merge branch 'debian' of liska:git/debian/cpl-plugin/sinfo 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-sinfo.

commit 0541f36cc77957c3d8634e6efb1053b499b7d613
Merge: 4abfc5a 6b5bbc6
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Sep 16 10:23:15 2013 +0200

    Merge branch 'debian' of liska:git/debian/cpl-plugin/sinfo into debian
    
    Conflicts:
    	debian/control

 debian/changelog |    2 +-
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/control
index 05fd3ef,1d78419..2767150
--- a/debian/control
+++ b/debian/control
@@@ -33,8 -33,8 +33,8 @@@ Description: ESO data reduction pipelin
  Package: cpl-plugin-sinfo-calib
  Architecture: all
  Multi-Arch: foreign
--Depends: ${misc:Depends}, cpl-plugin-sinfo, wget
 -Section: contrib/science
 -Description: ESO data reduction pipeline calibration data installer for SINFONI
 - This package installs calibration data of the data reduction pipeline for the
 - SINFONI instrument of the Very Large Telescope (VLT) from the European Southern
++Depends: ${misc:Depends}, cpl-plugin-sinfo
 +Description: ESO data reduction pipeline calibration data for SINFONI
 + This package contains calibration data of the data reduction pipeline for the
 + SINFONI instrument of the Very Large Telescope (VLT) from the European
 + Southern Observatory (ESO).

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