[med-svn] r20285 - trunk/packages/gdcm/trunk/debian

[Gert Wollny]

Author: gert-guest
Date: 2015-10-18 16:17:45 +0000 (Sun, 18 Oct 2015)
New Revision: 20285

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/control
Log:
Add build conflict as requested in #801228

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2015-10-18 15:58:31 UTC (rev 20284)
+++ trunk/packages/gdcm/trunk/debian/changelog	2015-10-18 16:17:45 UTC (rev 20285)
@@ -2,11 +2,11 @@
 
   [Gert Wollny]
   * new upstream version. Closes: #797738
-  * Apply patch provided by Mathieu (see below) Closes:  #797673
+  * Apply patch provided by Mathieu (see below) Closes: #797673
   * d/* update all files to use 2.6 instead of 2.4
   * Transition to use vtk6, Related: #798164
   * remove java bindings because they depend on libvtk*-java but
-    vtk6 currently doesn't provide these bindings
+    vtk6 currently doesn't provide these bindings Related: 798963
   * Add patch enable-vtk6-bindings.patch to correct bindings for VTK6
   * Add patch linkvtkdoc.patch to use compressed vtk6-doc helpers
     Related: #751395,  #751412
@@ -16,7 +16,8 @@
   * removing some static VC++ libs from tarball to make it follow DFSG
   * add lintian overrides for 
     - embedded javascript (rationale: src:doxygen/debian/Readme.jquery) 
-    - dep5-copyright-license-name-not-unique (rationale: #779676) 
+    - dep5-copyright-license-name-not-unique, rationale: #779676
+  * Add build-conflict: libopenjp2-7-dev, Closes: #801228
 
   [Mathieu Malaterre]
   * Do not use activiz.net anymore

Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control	2015-10-18 15:58:31 UTC (rev 20284)
+++ trunk/packages/gdcm/trunk/debian/control	2015-10-18 16:17:45 UTC (rev 20285)
@@ -36,6 +36,7 @@
 		     doxygen-latex,
 		     ghostscript, 
                      graphviz
+Build-Conflicts: libopenjp2-7-dev 
 Standards-Version: 3.9.6
 X-Python-Version: 2.7
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/