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

Eric Maeker ericmaeker-guest at alioth.debian.org
Fri Jun 7 15:16:00 UTC 2013


Author: ericmaeker-guest
Date: 2013-06-07 15:15:59 +0000 (Fri, 07 Jun 2013)
New Revision: 13879

Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
   trunk/packages/freemedforms-project/trunk/debian/rules
Log:
FreeMedForms: preparing new upstream 0.9.0~beta1

Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog	2013-06-07 11:46:04 UTC (rev 13878)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog	2013-06-07 15:15:59 UTC (rev 13879)
@@ -1,6 +1,20 @@
 freemedforms-project (0.8.2.1-1) experimental; urgency=low
 
   [ Eric Maeker ]
+  * Adding dependency to zlib >= 1.2.8
+
+ -- Eric Maeker <eric.maeker at gmail.com>  Fri, 07 Jun 2013 16:21:28 +0200
+
+freemedforms-project (0.8.2.1-1) experimental; urgency=low
+
+  [ Eric Maeker ]
+  * Adding dependency to zlib >= 1.2.8
+
+ -- Eric Maeker <eric.maeker at gmail.com>  Wed, 20 Feb 2013 10:00:00 +0100
+
+freemedforms-project (0.8.2.1-1) experimental; urgency=low
+
+  [ Eric Maeker ]
   * new upstream
   * debian/rules: script doc update
   * manages are now included in the source package

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control	2013-06-07 11:46:04 UTC (rev 13878)
+++ trunk/packages/freemedforms-project/trunk/debian/control	2013-06-07 15:15:59 UTC (rev 13879)
@@ -7,12 +7,13 @@
  Thorsten Alteholz <debian at alteholz.de>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 9), 
- libqt4-dev (>= 4:4.7.0), 
+ libqt4-dev (>= 4:4.8.0),
  libxext-dev, 
  zlib1g-dev, 
  libopencv-core-dev (>= 2.3),
  libopencv-highgui-dev (>= 2.3),
- libopencv-objdetect-dev (>= 2.3)
+ libopencv-objdetect-dev (>= 2.3),
+ libquazip-dev (>= 0.4.4)
 Standards-Version: 3.9.3
 Homepage: http://www.freemedforms.com/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freemedforms-project/
@@ -22,8 +23,7 @@
 Architecture: all
 Depends: ${misc:Depends},
  freemedforms-emr (>= ${source:Version}),
- freediams (>= ${source:Version}),
- freeaccount (>= ${source:Version})
+ freediams (>= ${source:Version})
 Description: FreeMedForms project
  The FreeMedForms project provides a set of medical applications to help
  health professionals in their day-to-day practice. It is developed by an
@@ -54,7 +54,9 @@
 
 Package: freemedforms-common-resources
 Architecture: all
-Depends: ${misc:Depends}, freemedforms-theme (= ${source:Version}), freemedforms-i18n (= ${source:Version})
+Depends: ${misc:Depends},
+ freemedforms-theme (= ${source:Version}),
+ freemedforms-i18n (= ${source:Version})
 Description: common data for the FreeMedForms project applications
  The FreeMedForms project provides a set of medical applications to help
  health professionals in their day-to-day practice. It is developed by an
@@ -198,24 +200,24 @@
  FreeDiams is a pharmaceutical drug prescription assistant which can be
  used to create complex prescriptions and to handle drug interactions.
 
-Package: freeaccount
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- freemedforms-libs (= ${binary:Version}),
- freemedforms-freedata (= ${source:Version}),
- freemedforms-common-resources (= ${source:Version})
-Suggests: ttf-mscorefonts-installer
-Description: medical accountancy manager
- 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.
- .
- FreeAccount is an medical accountancy manager.
- .
- FreeAccount is fully integrated in the FreeMedForms
- open source EMR and can be used as external
- accountancy manager using its interoperability
- interface.
+#Package: freeaccount
+#Architecture: any
+#Depends: ${shlibs:Depends}, ${misc:Depends},
+# freemedforms-libs (= ${binary:Version}),
+# freemedforms-freedata (= ${source:Version}),
+# freemedforms-common-resources (= ${source:Version})
+#Suggests: ttf-mscorefonts-installer
+#Description: medical accountancy manager
+# 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.
+# .
+# FreeAccount is an medical accountancy manager.
+# .
+# FreeAccount is fully integrated in the FreeMedForms
+# open source EMR and can be used as external
+# accountancy manager using its interoperability
+# interface.
 
 #Package: freemedforms-project-dbg
 #Priority: extra

Modified: trunk/packages/freemedforms-project/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/rules	2013-06-07 11:46:04 UTC (rev 13878)
+++ trunk/packages/freemedforms-project/trunk/debian/rules	2013-06-07 15:15:59 UTC (rev 13879)
@@ -1,27 +1,43 @@
 #!/usr/bin/make -f
-# (c) 2012, Eric Maeker, MD (fr), The FreeMedForms project, BSD 3 clause license
-# The @ in front of a command prevents make from displaying
+# (c) 2011-2013, Eric Maeker, MD (fr), The FreeMedForms project
+# This code is released under the BSD 3 clause license
 
+#--------------------------------------------------------------------
+# Comments on the updates:
+#--------------------------------------------------------------------
+# Updating from 0.8.2 to 0.9.0
+# The optional plugins and features can now be defined in the 
+#     buildspecs/optionalplugins.pri
+#     buildspecs/optionalfeatures.pri
+# You can edit these files and modify the plugins/features you want to build/ignore.
+#
+# The qmake command line is then shortened to
+#     qmake -r {spec} {release config} {LinuxIntegratedConfigFlag if required} {libs tags} {project_file}
+# Find the documentation of the new build process here
+#     http://www.freemedforms.com/en/code/buildsystem
+#
+# FreeAccount is now obsolete as unmaintained.
+#--------------------------------------------------------------------
+# Updating form 0.7.x to 0.8.x
 # The new build system of the FreeMedForms project (0.8+) creates the
 #   buildpsecs/compiling.pri
 # during the qmake step. This file differs from apps to apps, so we need
 # cache it and reuse it before doing any make steps.
+#--------------------------------------------------------------------
 
 # vars
 FREEMEDFORMS_EMR:=freemedforms
 FREEDIAMS:=freediams
-FREEACCOUNT:=freeaccount
 
 QMAKE:=qmake-qt4
-QMAKE_GLOBAL_CONFIG:="CONFIG+=LINUX_INTEGRATED"
-QMAKE_FREEMEDFORMS_CONFIG := "CONFIG+=with-alerts" "CONFIG+=with-webcam"
+QMAKE_GLOBAL_CONFIG:="CONFIG+=LINUX_INTEGRATED" "CONFIG+=dontbuildquazip"
 QMAKE_SUBPROJECT_CONFIG := "CONFIG+=dontbuildlibs" "CONFIG+=dontinstallresources" "CONFIG+=dontinstalllibs"
 QMAKE_IPATH := "INSTALL_ROOT_PATH=/usr/"
 QMAKE_COMPILING:=buildspecs/compiling.pri
 
 # func
-AUTOCONF_MAIN = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(QMAKE_FREEMEDFORMS_CONFIG) $(1).pro
-AUTOCONF_SUB = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(QMAKE_SUBPROJECT_CONFIG) $(1).pro
+AUTOCONF_MAIN = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(1).pro
+AUTOCONF_SUB = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(1).pro
 
 %:
 	dh $@ --parallel --buildsystem=qmake_qt4 # --dbg-package=freemedforms-project-dbg
@@ -35,9 +51,6 @@
 	dh_auto_configure -D$(FREEDIAMS) -- $(call AUTOCONF_SUB, $(FREEDIAMS)) $(extra_configure_opts)
 	cp $(QMAKE_COMPILING) build/$(FREEDIAMS).pri
 
-	dh_auto_configure -D$(FREEACCOUNT) -- $(call AUTOCONF_SUB, $(FREEACCOUNT)) $(extra_configure_opts)
-	cp $(QMAKE_COMPILING) build/$(FREEACCOUNT).pri
-
 override_dh_auto_clean:
 	rm -Rf bin
 	rm -Rf build
@@ -52,9 +65,6 @@
 	cp build/$(FREEDIAMS).pri $(QMAKE_COMPILING)
 	dh_auto_build -D$(FREEDIAMS)
 
-	cp build/$(FREEACCOUNT).pri $(QMAKE_COMPILING)
-	dh_auto_build -D$(FREEACCOUNT)
-
 override_dh_auto_install:
 	cp build/$(FREEMEDFORMS_EMR).pri $(QMAKE_COMPILING)
 	dh_auto_install -D$(FREEMEDFORMS_EMR) -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
@@ -62,13 +72,9 @@
 	cp build/$(FREEDIAMS).pri $(QMAKE_COMPILING)
 	dh_auto_install -D$(FREEDIAMS) -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
 
-	cp build/$(FREEACCOUNT).pri $(QMAKE_COMPILING)
-	dh_auto_install -D$(FREEACCOUNT) -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp	
-	
 	# Remove empty dirs
 	find $(CURDIR)/debian/tmp/usr/share -type d -empty -delete
 
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download --destdir=../tarballs
-




More information about the debian-med-commit mailing list