[med-svn] r11335 - trunk/packages/freemedforms-project/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-06-14 13:21:51 +0000 (Thu, 14 Jun 2012)
New Revision: 11335

Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
Log:
Fix dependencies of binary packages to enable smooth upgrade from previous versions


Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog	2012-06-14 12:57:49 UTC (rev 11334)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog	2012-06-14 13:21:51 UTC (rev 11335)
@@ -1,14 +1,16 @@
-freemedforms-project (0.7.4-2) unstable; urgency=low
+freemedforms-project (0.7.4-2) UNRELEASED; urgency=low
 
   [ Eric Maeker ]
-  * debian/control: manages dependences for files moved from
-    freemedforms-emr-resources to freemedforms-freedata (Closes: #676342)
   * debian/rules: remove empty dirs
   * debian/*.1: hyphen/minus correction
   * debian/*.lintian-overrides: updated
 
- -- Eric Maeker <eric.maeker at gmail.com>  Tue, 07 Jun 2012 00:08:45 +0200
+  [ Andreas Tille ] 
+  * debian/control: Fix relations between freemedforms-emr-resources and
+    freemedforms-freedata (Closes: #676342)
 
+  -- Andreas Tille <tille at debian.org>  Thu, 14 Jun 2012 15:18:52 +0200
+
 freemedforms-project (0.7.4-1) unstable; urgency=low
 
   [ Eric Maeker ]

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control	2012-06-14 12:57:49 UTC (rev 11334)
+++ trunk/packages/freemedforms-project/trunk/debian/control	2012-06-14 13:21:51 UTC (rev 11335)
@@ -66,8 +66,7 @@
 Package: freemedforms-emr-resources
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: freemedforms-data (<< ${binary:Version})
-Breaks: freemedforms-data (<< ${binary:Version})
+Suggests: freemedforms-freedata (= ${binary:Version})
 Description: Data for the FreeMedForms EMR
  The FreeMedForms project is a set of free and open source
  medical application used to help health professionals
@@ -80,9 +79,10 @@
 
 Package: freemedforms-freedata
 Architecture: all
-Depends: ${misc:Depends}
-Replaces: freediams-data
-Breaks: freediams-data
+Depends: ${misc:Depends}, freemedforms-emr-resources (= ${binary:Version})
+Conflicts: freemedforms-emr-resources (<< 0.7.4)
+Replaces: freemedforms-emr-resources (<< 0.7.4)
+Breaks: freemedforms-emr-resources (<< 0.7.4)
 Description: Free extra-data for the FreeMedForms project
  The FreeMedForms project is a set of free and open source
  medical application used to help health professionals