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

Eric Maeker ericmaeker-guest at moszumanska.debian.org
Sun Aug 31 18:48:44 UTC 2014 

Author: ericmaeker-guest
Date: 2014-08-31 18:48:44 +0000 (Sun, 31 Aug 2014)
New Revision: 17888

Removed:
   trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-en.links
   trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-fr.links
   trunk/packages/freemedforms-project/trunk/debian/freediams-doc-en.links
   trunk/packages/freemedforms-project/trunk/debian/freediams-doc-fr.links
   trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-en.links
   trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-fr.links
   trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-en.links
   trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-fr.links
Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
   trunk/packages/freemedforms-project/trunk/debian/rules
   trunk/packages/freemedforms-project/trunk/debian/watch
Log:
freemedforms-project: new upstream 0.9.2 correctly builds (watch file untested)

Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1,3 +1,11 @@
+freemedforms-project (0.9.2-1) unstable; urgency=low
+
+  * New upstream
+  * debian/rules:
+    - Correcting subproject build
+
+ -- Eric Maeker <eric.maeker at gmail.com>  Fri, 29 Aug 2014 19:41:17 +0200
+
 freemedforms-project (0.9.0-3) unstable; urgency=low
 
   * Correcting user's documentation installation path

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/control	2014-08-31 18:48:44 UTC (rev 17888)
@@ -122,7 +122,7 @@
 Depends: ${misc:Depends}
 Enhances: freediams
 Provides: freediams-doc
-Description: FreeDiams english documentation
+Description: FreeDiams English documentation
  The FreeMedForms project provides a set of medical applications to help
  health professionals in their day-to-day practice. It is developed by an
  international community of medical doctors and computer specialists.
@@ -131,7 +131,7 @@
  It can be used to creation complex prescription and to manage
  drugs interactions.
  .
- This package contains the english documentation of freediams.
+ This package contains the English documentation of freediams.
 
 Package: freediams-doc-fr
 Architecture: all
@@ -139,7 +139,7 @@
 Depends: ${misc:Depends}
 Enhances: freediams
 Provides: freediams-doc
-Description: FreeDiams french documentation
+Description: FreeDiams French documentation
  The FreeMedForms project provides a set of medical applications to help
  health professionals in their day-to-day practice. It is developed by an
  international community of medical doctors and computer specialists.
@@ -148,7 +148,7 @@
  It can be used to creation complex prescription and to manage
  drugs interactions.
  .
- This package contains the french documentation of freediams.
+ This package contains the French documentation of freediams.
 
 Package: freemedforms-libs
 Architecture: any

Deleted: trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-en.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-en.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-en.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freeaccount/en/toc.html	usr/share/doc/freemedforms-project/freeaccount/en/index.html

Deleted: trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-fr.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-fr.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freeaccount-doc-fr.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freeaccount/fr/toc.html	usr/share/doc/freemedforms-project/freeaccount/fr/index.html

Deleted: trunk/packages/freemedforms-project/trunk/debian/freediams-doc-en.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freediams-doc-en.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freediams-doc-en.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freediams/en/html/toc.html	usr/share/doc/freemedforms-project/freediams/en/html/index.html

Deleted: trunk/packages/freemedforms-project/trunk/debian/freediams-doc-fr.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freediams-doc-fr.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freediams-doc-fr.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freediams/fr/html/toc.html	usr/share/doc/freemedforms-project/freediams/fr/html/index.html

Deleted: trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-en.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-en.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-en.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freemedforms/en/html/toc.html	usr/share/doc/freemedforms-project/freemedforms/en/html/index.html

Deleted: trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-fr.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-fr.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freemedforms-doc-fr.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freemedforms/fr/html/toc.html	usr/share/doc/freemedforms-project/freemedforms/fr/html/index.html

Deleted: trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-en.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-en.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-en.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freemedforms/en/html/toc.html	usr/share/doc/freemedforms-project/freemedforms/en/html/index.html

Deleted: trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-fr.links
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-fr.links	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/freemedforms-emr-doc-fr.links	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1 +0,0 @@
-usr/share/doc/freemedforms-project/freemedforms/fr/html/toc.html	usr/share/doc/freemedforms-project/freemedforms/fr/html/index.html

Modified: trunk/packages/freemedforms-project/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/rules	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/rules	2014-08-31 18:48:44 UTC (rev 17888)
@@ -5,7 +5,7 @@
 #--------------------------------------------------------------------
 # Comments on the updates:
 #--------------------------------------------------------------------
-# Updating from 0.9.0-2 to 0.9.0-4
+# Updating from 0.9.0-2 to 0.9.2
 # Using qtchooser and QT_VERSION system var to force a specific Qt version build
 #
 # Updating from 0.8.2 to 0.9.0
@@ -47,7 +47,7 @@
 
 # func
 AUTOCONF_MAIN = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(1).pro
-AUTOCONF_SUB = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(1).pro
+AUTOCONF_SUB = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_SUBPROJECT_CONFIG) $(QMAKE_IPATH) $(1).pro
 
 %:
 	dh $@ --parallel --buildsystem=qmake # --dbg-package=freemedforms-project-dbg

Modified: trunk/packages/freemedforms-project/trunk/debian/watch
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/watch	2014-08-31 18:45:33 UTC (rev 17887)
+++ trunk/packages/freemedforms-project/trunk/debian/watch	2014-08-31 18:48:44 UTC (rev 17888)
@@ -1,7 +1,12 @@
 version=3
-opts=uversionmangle=s/\%7E/~/,downloadurlmangle=s%^(http:)//code\.google\.com(//freemedforms\.googlecode\.com/)%$1$2% \
-http://code.google.com/p/freemedforms/downloads/list \
-(?:.*/|)freemedformsfullsources(?:-|_|-v|_v|\.|V)(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz)
+opts=pgpsigurlmangle=s/$/.sig/ \
+http://sf.net/freemedforms/freemedforms-project-src_(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+
+# < 0.9.2 version
+#version=3
+#opts=uversionmangle=s/\%7E/~/,downloadurlmangle=s%^(http:)//code\.google\.com(//freemedforms\.googlecode\.com/)%$1$2% \
+#http://code.google.com/p/freemedforms/downloads/list \
+#(?:.*/|)freemedformsfullsources(?:-|_|-v|_v|\.|V)(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz)
 # Bart Martens <bartm at debian.org> 2013-07-04 06:02:08
 
 # Old version

More information about the debian-med-commit mailing list