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

[Andreas Tille]

Author: tille
Date: 2014-09-02 20:58:27 +0000 (Tue, 02 Sep 2014)
New Revision: 17926

Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
Log:
Do not Conflicts with version freemedforms-emr-resources


Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog	2014-09-02 19:16:52 UTC (rev 17925)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog	2014-09-02 20:58:27 UTC (rev 17926)
@@ -21,6 +21,7 @@
   [ Andreas Tille ]
   * cme fix dpkg-control
   * Fix capitalisation of language names in descriptions
+  * Do not Conflicts with version freemedforms-emr-resources
 
  -- Eric Maeker <eric.maeker at gmail.com>  Sun, 31 Aug 2014 20:53:29 +0200
 

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control	2014-09-02 19:16:52 UTC (rev 17925)
+++ trunk/packages/freemedforms-project/trunk/debian/control	2014-09-02 20:58:27 UTC (rev 17926)
@@ -80,7 +80,6 @@
 Architecture: all
 Depends: ${misc:Depends}
 Breaks: freemedforms-emr-resources (<< 0.7.4)
-Conflicts: freemedforms-emr-resources (<< 0.7.4)
 Replaces: freemedforms-emr-resources (<< 0.7.4)
 Description: free extra-data for the FreeMedForms project
  The FreeMedForms project provides a set of medical applications to help