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

[Eric Maeker]

Author: ericmaeker-guest
Date: 2012-06-25 15:48:08 +0000 (Mon, 25 Jun 2012)
New Revision: 11465

Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
   trunk/packages/freemedforms-project/trunk/debian/rules
Log:
freemedforms: using qmake_qt4 buildsystem, debug package, rewording descriptions

Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog	2012-06-25 15:29:52 UTC (rev 11464)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog	2012-06-25 15:48:08 UTC (rev 11465)
@@ -1,3 +1,15 @@
+freemedforms-project (0.7.5-1) unstable; urgency=low
+
+  [ Eric Maeker ]
+  * debian/rules: 
+    * using buildsystem=qmake_qt4
+    * using dh_auto*
+  * debian/control: 
+    * adding a new experiment debug package
+    * rewording descriptions (Closes: #678257)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 25 Jun 2012 17:40:52 +0200
+
 freemedforms-project (0.7.4-2) unstable; urgency=low
 
   [ Eric Maeker ]

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control	2012-06-25 15:29:52 UTC (rev 11464)
+++ trunk/packages/freemedforms-project/trunk/debian/control	2012-06-25 15:48:08 UTC (rev 11465)
@@ -207,3 +207,19 @@
  open source EMR and can be used as external
  accountancy manager using its interoperability
  interface.
+
+Package: freemedforms-project-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: freemedforms-project (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for the 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
+ international community of medical doctors and computer specialists.
+ .
+ This package contains the debugging symbols for all the applications
+ of the freemedforms project including: libs, emr, freediams, freeaccount.
+ .
+ This package must be concidered as expiremental.
+

Modified: trunk/packages/freemedforms-project/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/rules	2012-06-25 15:29:52 UTC (rev 11464)
+++ trunk/packages/freemedforms-project/trunk/debian/rules	2012-06-25 15:48:08 UTC (rev 11465)
@@ -3,35 +3,27 @@
 # The @ in front of a command prevents make from displaying
 
 # var: keep the project order (should begin with freemedforms) 
-FREEMEDFORMS_PROJECTS := freemedforms
-#SUB_PROJECTS := freediams freeicd freeaccount
-SUB_PROJECTS := freediams freeaccount
-QMAKE := qmake-qt4
-QMAKE_CONFIG := "CONFIG+=release" "CONFIG+=LINUX_INTEGRATED" -r
+FREEMEDFORMS_EMR := freemedforms
+FREEDIAMS := freediams
+FREEACCOUNT := freeaccount
+
+QMAKE_CONFIG := "CONFIG+=LINUX_INTEGRATED" -r
 QMAKE_SUBPROJECT_CONFIG := "CONFIG+=dontbuildlibs" "CONFIG+=dontinstallresources" "CONFIG+=dontinstalllibs"
-QMAKE_IPATH := "INSTALL_ROOT_PATH=$(CURDIR)/debian/tmp/usr/"
+QMAKE_IPATH := "INSTALL_ROOT_PATH=/usr/"
+
 # func
-QMAKE_MAIN_PROJ = cd $(1) && $(QMAKE) $(QMAKE_CONFIG) $(QMAKE_IPATH) LOWERED_APPNAME="$(1)" $(1).pro && cd ..
-QMAKE_SUB_PROJ = cd $(PROJECT) && $(QMAKE) $(QMAKE_CONFIG) $(QMAKE_SUBPROJECT_CONFIG) $(QMAKE_IPATH) LOWERED_APPNAME="$(PROJECT)" $(PROJECT).pro && cd ..
-MAKE_MAIN_PROJ = make -C $(1) -f Makefile
-MAKE_PROJ = make -C $(PROJECT) -f Makefile
-MAKEINSTALL_MAIN_PROJ = make install -C $(1) -f Makefile
-MAKEINSTALL_PROJ = make install -C $(PROJECT) -f Makefile
-reverse = $(if $(1),$(call reverse,$(wordlist 2,$(words $(1)),$(1)))) $(firstword $(1))
+AUTOCONF_MAIN =  -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) LOWERED_APPNAME="$(1)" $(1).pro
+AUTOCONF_SUB =  -D$(1) -- $(QMAKE_CONFIG) $(QMAKE_IPATH) $(QMAKE_SUBPROJECT_CONFIG) LOWERED_APPNAME="$(1)" $(1).pro
 
 %:
-	dh $@
+	dh $@ --parallel --buildsystem=qmake_qt4 --dbg-package=freemedforms-project-dbg
 
-# create translations
-# process every project files without any Makefile conflict
-# process project files in reverse order 
-#    so that the freemedforms project is the last configured one (for the libs)
 override_dh_auto_configure:
 	lrelease global_resources/translations/*.ts
-	$(call QMAKE_MAIN_PROJ,$(FREEMEDFORMS_PROJECTS))
-	$(foreach PROJECT,$(SUB_PROJECTS),$(QMAKE_SUB_PROJ) && ) echo .
-	
-# Clean build path
+	dh_auto_configure $(call AUTOCONF_MAIN, $(FREEMEDFORMS_EMR)) $(extra_configure_opts)
+	dh_auto_configure $(call AUTOCONF_SUB, $(FREEDIAMS)) $(extra_configure_opts)
+	dh_auto_configure $(call AUTOCONF_SUB, $(FREEACCOUNT)) $(extra_configure_opts)
+
 override_dh_auto_clean:
 	rm -Rf bin
 	rm -Rf build
@@ -39,26 +31,16 @@
 	dh_auto_clean
 	find . -name Makefile -delete
 
-# Make all projects
 override_dh_auto_build:
-#	$(call MAKE_PROJ,$(PROJECT))
-	$(call MAKE_MAIN_PROJ,$(FREEMEDFORMS_PROJECTS))
-	$(foreach PROJECT,$(SUB_PROJECTS),$(MAKE_PROJ) && ) echo .
+	dh_auto_build -D$(FREEMEDFORMS_EMR)
+	dh_auto_build -D$(FREEDIAMS)
+	dh_auto_build -D$(FREEACCOUNT)
 
-# Install all projects
 override_dh_auto_install:
-#	$(call MAKEINSTALL_PROJ,$(PROJECT))
-	$(call MAKEINSTALL_MAIN_PROJ,$(FREEMEDFORMS_PROJECTS))
-	$(foreach PROJECT,$(SUB_PROJECTS),$(MAKEINSTALL_PROJ) && ) echo .
+	dh_auto_install -D$(FREEMEDFORMS_EMR) -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
+	dh_auto_install -D$(FREEDIAMS) -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
+	dh_auto_install -D$(FREEACCOUNT) -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
 
 	# Remove empty dirs
 	find $(CURDIR)/debian/tmp/usr/share -type d -empty -delete
 
-override_dh_install:	
-	dh_install
-
-#override_dh_shlibdeps:
-#	LD_LIBRARY_PATH=debian/tmp/usr/lib/freemedforms dh_shlibdeps -l/usr/lib/freemedforms
-
-
-