[med-svn] r8714 - trunk/packages/freediams/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-11-30 12:11:51 +0000 (Wed, 30 Nov 2011)
New Revision: 8714

Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/control
   trunk/packages/freediams/trunk/debian/copyright
Log:
Finally move freediams to non-free; try to find a reasonable upgrade path from freediams+freediams-data to freediams+freediams-drugs using a combination of Conflicts/Provides/Replaces but failed. :-(


Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog	2011-11-30 05:20:33 UTC (rev 8713)
+++ trunk/packages/freediams/trunk/debian/changelog	2011-11-30 12:11:51 UTC (rev 8714)
@@ -1,14 +1,26 @@
-freediams (0.6.2-1) unstable; urgency=low
+freediams (0.6.2-1) UNRELEASED; urgency=low
 
   [ Eric Maeker ]
   * New upstream version
   * debian/control: Suggests: ttf-mscorefonts-installer msttcorefonts
   * debian/copyright: Details for databases
+    --> Database licenses are non-free
 
   [ Andreas Tille ]
-  * debian/control: Removed suggested msttcorefonts
+  * debian/control:
+    - Removed suggested msttcorefonts
+    - Moved to non-free because databases are not free
+      --> needs further discussion how to provide a stripped down
+          free alternative
+    - freediams:
+      Conflicts/Replaces/Provides: freediams-data (<< ${source:Version})
+    - freediams-drugs:
+      Conflicts: freediams (<< ${source:Version})
   * debian/{control,rules}: rename freediams-data to freediams-drugs
   * debian/rules: use calculated $(pkg) name instead of "freediams" string
+  * Hopefully the new version
+      Closes: #648705
+    otherwise more info about debian-kbsd is needed
 
  -- Andreas Tille <tille at debian.org>  Thu, 17 Nov 2011 11:22:54 +0100
 

Modified: trunk/packages/freediams/trunk/debian/control
===================================================================
--- trunk/packages/freediams/trunk/debian/control	2011-11-30 05:20:33 UTC (rev 8713)
+++ trunk/packages/freediams/trunk/debian/control	2011-11-30 12:11:51 UTC (rev 8714)
@@ -1,5 +1,5 @@
 Source: freediams
-Section: science
+Section: non-free/science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Eric Maeker <eric.maeker at free.fr>,
@@ -16,6 +16,8 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (>= 4.4.3), libqtgui4 (>= 4.4.3), libqt4-sql-sqlite, libqt4-xml,
  libqt4-network, libqt4-svg, freediams-drugs (= ${source:Version})
 Suggests: freediams-doc, ttf-mscorefonts-installer
+Conflicts: freediams-data
+Replaces: freediams-data
 Description: Pharmaceutical drugs prescriptor and interactions checker
  FreeDiams prescriber is the result of FreeMedForms prescriber plugins
  built into a standalone application.  It is developed by medical doctors
@@ -35,7 +37,10 @@
 Package: freediams-drugs
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: freediams
+Recommends: freediams (= ${source:Version})
+Conflicts: freediams-data, freediams (<< ${source:Version})
+Replaces: freediams-data
+Provides: freediams-data
 Description: Data for pharmaceutical drugs prescriptor and interactions checker FreeDiams
  FreeDiams prescriber is the result of FreeMedForms prescriber plugins
  built into a standalone application.  It is developed by medical doctors
@@ -56,7 +61,7 @@
 
 Package: freediams-doc-en
 Architecture: all
-Section: doc
+Section: non-free/doc
 Depends: ${misc:Depends}
 Enhances: freediams
 Provides: freediams-doc
@@ -80,7 +85,7 @@
 
 Package: freediams-doc-fr
 Architecture: all
-Section: doc
+Section: non-free/doc
 Depends: ${misc:Depends}
 Enhances: freediams
 Provides: freediams-doc

Modified: trunk/packages/freediams/trunk/debian/copyright
===================================================================
--- trunk/packages/freediams/trunk/debian/copyright	2011-11-30 05:20:33 UTC (rev 8713)
+++ trunk/packages/freediams/trunk/debian/copyright	2011-11-30 12:11:51 UTC (rev 8714)
@@ -369,7 +369,7 @@
 
 Files: global_resources/database/drugs/master.db
 Copyright: Eric Maeker, MD
-License: GPL-3+
+License: The file is created by upstream using the following database licenses
  This file is constructed using the following raw source files:
  1) Canadian drugs database: http://www.hc-sc.gc.ca/dhp-mps/prodpharma/databasdon/txt/allfiles.zip
     License: public domain like