[med-svn] r9870 - trunk/packages/freemedforms/trunk/debian
Eric Maeker
ericmaeker-guest at alioth.debian.org
Sun Mar 4 08:46:45 UTC 2012
Author: ericmaeker-guest
Date: 2012-03-04 08:46:45 +0000 (Sun, 04 Mar 2012)
New Revision: 9870
Removed:
trunk/packages/freemedforms/trunk/debian/freediams.1
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.doc-base
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.install
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.links
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.substvars
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.doc-base
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.install
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.links
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.substvars
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.install
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.manpages
trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.substvars
Modified:
trunk/packages/freemedforms/trunk/debian/changelog
trunk/packages/freemedforms/trunk/debian/control
trunk/packages/freemedforms/trunk/debian/rules
Log:
build only one app at time, freemedforms emr is now the central package of the project
Modified: trunk/packages/freemedforms/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms/trunk/debian/changelog 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/changelog 2012-03-04 08:46:45 UTC (rev 9870)
@@ -3,8 +3,8 @@
[ Eric Maeker ]
* New upstream
* fully new debian/* files
- - build all freemedforms project applications
- - correctly package freemedforms && freediams
+ - build the freemedforms EMR and common freemedforms project packages
+ - correctly package freemedforms
- remove tilde from version numbering
-- Eric Maeker <eric.maeker at gmail.com> Thu, 01 Mar 2012 13:00:00 +0100
Modified: trunk/packages/freemedforms/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms/trunk/debian/control 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/control 2012-03-04 08:46:45 UTC (rev 9870)
@@ -78,6 +78,7 @@
Package: freemedforms-freedata
Architecture: all
+Replaces: freediams-data
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
@@ -118,53 +119,6 @@
.
This package contains the French documentation of FreeMedForms EMR.
-Package: freemedforms-freediams
-Provides: freediams
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- freemedforms-common-resources (= ${source:Version}),
- freemedforms-freedata (= ${source:Version})
-Description:
- The FreeMedForms project is a set of free and open source
- medical application used to help health professionals
- in their current pratice.
- It is developed by a international community of medical
- doctors and computer workers.
- .
- FreeDiams is a pharmaceutical drug prescriptor assistant.
- It can be used to creation complex prescription and to manage
- drugs interactions.
-
-Package: freemedforms-freediams-doc-en
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Enhances: freemedforms-freediams
-Provides: freemedforms-freediams-doc
-Description: English documentation for FreeDiams
- The FreeMedForms project is a set of free and open source
- medical application used to help health professionals
- in their current pratice.
- It is developed by a international community of medical
- doctors and computer workers.
- .
- This package contains the English documentation of FreeDiams.
-
-Package: freemedforms-freediams-doc-fr
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Enhances: freemedforms-freediams
-Provides: freemedforms-freediams-doc
-Description: French documentation for FreeDiams
- The FreeMedForms project is a set of free and open source
- medical application used to help health professionals
- in their current pratice.
- It is developed by a international community of medical
- doctors and computer workers.
- .
- This package contains the French documentation of FreeDiams.
-
Package: freemedforms-i18n
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Deleted: trunk/packages/freemedforms/trunk/debian/freediams.1
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freediams.1 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freediams.1 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1,47 +0,0 @@
-.TH FreeDiams 1 "01 March 2012"
-.SH NAME
-FreeDiams - pharmaceutical drugs prescriptor
-.SH SYNOPSIS
-.B freediams
-.SH DESCRIPTION
-.B FreeDiams
-prescriber is the result of FreeMedForms prescriber
-plugins built into a standalone application.
-It is developed by medical doctors and is intended
-for use by these same professionals. It can be used alone to
-prescribe and / or test drug interactions within a prescription.
-It can be linked to any application thanks to its command line
-parameters.
-.P
-.B FreeDiams
-can use multiple drugs database. By default, only the
-FDA (USA) database is installed. You can download and
-install new database directly from the application.
-.P
-.B FreeDiams
-is fully integrated in the
-.B FreeMedForms
-open source EMR and can be used as external
-prescriber by any EMR using its interoperability
-interface.
-
-.SH "OPTIONS"
-.LP
-.TP
-\fB\-v / --version\fR
-Displays the current version of FreeDiams.
-.TP
-\fB--exchange-in=</path/to/xml/exchange-in.xml>\fR
-defines the "in" exchange file.
-.P
-More parameters are documented at
-.P
-http://www.freemedforms.com/en/manuals/freediams/command_line
-
-.SH AUTHOR
-.B FreeDiams
-is copyright 2008-2012 by Eric Maeker, MD
-.SH "SEE ALSO"
-.br
-.B http://www.freemedforms.com/
-
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.doc-base
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.doc-base 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.doc-base 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1,18 +0,0 @@
-Document: freemedforms-freediams-doc-en
-Title: FreeDiams user's manual in Englisch language
-Author: Eric Maeker
-Abstract: Electronic Medical Record Manager
- The FreeMedForms project is a set of free and open source
- medical application used to help health professionals
- in their current pratice.
- It is developed by a international community of medical
- doctors and computer workers.
- .
- FreeDiams is a pharmaceutical drug prescriptor assistant.
- It can be used to creation complex prescription and to manage
- drugs interactions.
-Section: Science/Medicine
-
-Format: HTML
-Index: /usr/share/doc/freediams/en/toc.html
-Files: /usr/share/doc/freediams/en/*
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.install
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.install 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.install 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1 +0,0 @@
-global_resources/doc/freediams/en/html/* usr/share/doc/freediams/en
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.links
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.links 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.links 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1 +0,0 @@
-usr/share/doc/freediams/en/toc.html usr/share/doc/freediams/en/index.html
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.substvars
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.substvars 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-en.substvars 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1 +0,0 @@
-misc:Depends=
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.doc-base
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.doc-base 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.doc-base 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1,18 +0,0 @@
-Document: freemedforms-doc-fr
-Title: FreeMedForms user's manual in French language
-Author: Eric Maeker
-Abstract: Electronic Medical Record Manager
- The FreeMedForms project is a set of free and open source
- medical application used to help health professionals
- in their current pratice.
- It is developed by a international community of medical
- doctors and computer workers.
- .
- FreeDiams is a pharmaceutical drug prescriptor assistant.
- It can be used to creation complex prescription and to manage
- drugs interactions.
-Section: Science/Medicine
-
-Format: HTML
-Index: /usr/share/doc/freediams/fr/toc.html
-Files: /usr/share/doc/freediams/fr/*
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.install
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.install 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.install 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1 +0,0 @@
-global_resources/doc/freediams/fr/html/* usr/share/doc/freediams/fr
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.links
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.links 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.links 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1 +0,0 @@
-usr/share/doc/freediams/fr/toc.html usr/share/doc/freediams/fr/index.html
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.substvars
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.substvars 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams-doc-fr.substvars 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1 +0,0 @@
-misc:Depends=
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.install
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.install 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.install 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1,5 +0,0 @@
-usr/bin/freediams
-usr/lib/freediams
-usr/share/applications/freediams.desktop
-usr/share/pixmaps/freediams.svg
-
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.manpages
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.manpages 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.manpages 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1 +0,0 @@
-debian/freediams.1
Deleted: trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.substvars
===================================================================
--- trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.substvars 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/freemedforms-freediams.substvars 2012-03-04 08:46:45 UTC (rev 9870)
@@ -1,2 +0,0 @@
-shlibs:Depends=freemedforms-libs, libc6 (>= 2.1.3), libgcc1 (>= 1:4.1.1), libqt4-network (>= 4:4.5.3), libqt4-sql (>= 4:4.5.3), libqt4-xml (>= 4:4.5.3), libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)
-misc:Depends=
Modified: trunk/packages/freemedforms/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms/trunk/debian/rules 2012-03-04 08:01:15 UTC (rev 9869)
+++ trunk/packages/freemedforms/trunk/debian/rules 2012-03-04 08:46:45 UTC (rev 9870)
@@ -4,7 +4,7 @@
# var: keep the project order (should begin with freemedforms)
#FREEMEDFORMS_PROJECTS := freemedforms freediams freeicd freeaccount
-FREEMEDFORMS_PROJECTS := freemedforms freediams
+PROJECT := freemedforms
QMAKE := qmake-qt4
QMAKE_CONFIG := "CONFIG+=release" "CONFIG+=LINUX_INTEGRATED" -r
QMAKE_IPATH := "INSTALL_ROOT_PATH=$(CURDIR)/debian/tmp/usr/"
@@ -12,7 +12,6 @@
QMAKE_PROJ = cd $(PROJECT) && $(QMAKE) $(QMAKE_CONFIG) $(QMAKE_IPATH) LOWERED_APPNAME="$(PROJECT)" $(PROJECT).pro && cd ..
MAKE_PROJ = make -C $(PROJECT) -f Makefile
MAKEINSTALL_PROJ = make install -C $(PROJECT) -f Makefile
-reverse = $(if $(1),$(call reverse,$(wordlist 2,$(words $(1)),$(1)))) $(firstword $(1))
%:
dh $@
@@ -23,7 +22,8 @@
# so that the freemedforms project is the last configured one (for the libs)
override_dh_auto_configure:
lrelease global_resources/translations/*.ts
- $(foreach PROJECT,$(call reverse,$(FREEMEDFORMS_PROJECTS)),$(QMAKE_PROJ) && ) echo .
+ $(call QMAKE_PROJ,$(PROJECT))
+# $(foreach PROJECT,$(call reverse,$(FREEMEDFORMS_PROJECTS)),$(QMAKE_PROJ) && ) echo .
# Clean build path
override_dh_auto_clean:
@@ -34,11 +34,13 @@
# Make all projects
override_dh_auto_build:
- $(foreach PROJECT,$(FREEMEDFORMS_PROJECTS),$(MAKE_PROJ) && ) echo .
+ $(call MAKE_PROJ,$(PROJECT))
+# $(foreach PROJECT,$(FREEMEDFORMS_PROJECTS),$(MAKE_PROJ) && ) echo .
# Install all projects
override_dh_auto_install:
- $(foreach PROJECT,$(FREEMEDFORMS_PROJECTS),$(MAKEINSTALL_PROJ) && ) echo .
+ $(call MAKEINSTALL_PROJ,$(PROJECT))
+# $(foreach PROJECT,$(FREEMEDFORMS_PROJECTS),$(MAKEINSTALL_PROJ) && ) echo .
override_dh_install:
dh_install
More information about the debian-med-commit
mailing list