[med-svn] r9871 - trunk/packages/freediams/trunk/debian

Eric Maeker ericmaeker-guest at alioth.debian.org
Sun Mar 4 08:54:17 UTC 2012


Author: ericmaeker-guest
Date: 2012-03-04 08:54:17 +0000 (Sun, 04 Mar 2012)
New Revision: 9871

Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/control
   trunk/packages/freediams/trunk/debian/copyright
   trunk/packages/freediams/trunk/debian/freediams-doc-en.doc-base
   trunk/packages/freediams/trunk/debian/freediams-doc-fr.doc-base
   trunk/packages/freediams/trunk/debian/rules
   trunk/packages/freediams/trunk/debian/watch
Log:
freediams is dependent to freemedforms package (build && install), remove tilde to versions

Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog	2012-03-04 08:46:45 UTC (rev 9870)
+++ trunk/packages/freediams/trunk/debian/changelog	2012-03-04 08:54:17 UTC (rev 9871)
@@ -1,3 +1,14 @@
+freediams (0.7.0.beta2-1) unstable; urgency=low
+
+  [ Eric Maeker ]
+  * New upstream
+  * updated debian/* files
+    - adding dependency to the freemedforms packages
+    - rewritten rules
+    - remove tilde from version numbering
+
+ -- Eric Maeker <eric.maeker at gmail.com>  Sat, 03 Mar 2012 00:00:00 +0100
+
 freediams (0.7.0~beta1-1) unstable; urgency=low
 
   [ Eric Maeker ]

Modified: trunk/packages/freediams/trunk/debian/control
===================================================================
--- trunk/packages/freediams/trunk/debian/control	2012-03-04 08:46:45 UTC (rev 9870)
+++ trunk/packages/freediams/trunk/debian/control	2012-03-04 08:54:17 UTC (rev 9871)
@@ -6,6 +6,7 @@
  Andreas Tille <tille at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8), libqt4-dev (>= 4.7.0), libxext-dev, quilt (>= 0.47), zlib1g-dev
+Build-Depends: freemedforms-libs (= ${source:Version})
 Standards-Version: 3.9.2
 Homepage: http://www.freemedforms.com/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freediams/
@@ -13,52 +14,24 @@
 
 Package: freediams
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (>= 4.7.0), libqtgui4 (>= 4.7.0), libqt4-sql-sqlite, libqt4-xml,
- libqt4-network, libqt4-svg, freediams-drugs (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libqtcore4 (>= 4.7.0), libqtgui4 (>= 4.7.0), libqt4-sql-sqlite, libqt4-xml,
+ libqt4-network, libqt4-svg,
+ freemedforms-freedata (= ${source:Version}), freemedforms-common-resources (${source:Version}),
+ freemedforms-libs (= ${source:Version}), freemedforms-common-resources (${source:Version})
 Suggests: freediams-doc, ttf-mscorefonts-installer
 Conflicts: freediams-data
-Replaces: freediams-data
 Description: Pharmaceutical drugs prescriptor and interactions checker
- 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 drugs interactions within a
- prescription.  It can be linked to any application thanks to its command
- line parameters.
+ 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 can use multiple drugs database (FR, CA, USA, BE, PT, ZA).
- All drugs database can calculate the drug interactions through data
- issued from multiple sources.
- .
- FreeDiams is fully integrated in the FreeMedForms open source EMR
- and can be used as external prescriber by any EMR using its
- interoperability interface.
+ FreeDiams is a pharmaceutical drug prescriptor assistant.
+ It can be used to creation complex prescription and to manage
+ drugs interactions.
 
-Package: freediams-drugs
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: freediams (= ${source:Version})
-Conflicts: freediams-data
-Breaks: freediams (<< ${source:Version})
-Replaces: freediams-data
-Description: Data for pharmaceutical drugs prescriptor and interactions checker FreeDiams
- 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 drugs interactions within a
- prescription.  It can be linked to any application thanks to its command
- line parameters.
- .
- FreeDiams can use multiple drugs database (FR, CA, USA, BE, PT, ZA).
- All drugs database can calculate the drug interactions through data
- issued from multiple sources.
- .
- FreeDiams is fully integrated in the FreeMedForms open source EMR
- and can be used as external prescriber by any EMR using its
- interoperability interface.
- .
- This package contains the default 100% free drugs database (FDA).
-
 Package: freediams-doc-en
 Architecture: all
 Section: doc
@@ -66,21 +39,16 @@
 Enhances: freediams
 Provides: freediams-doc
 Description: FreeDiams English Documentation
- 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 drugs interactions within a
- prescription.  It can be linked to any application thanks to its command
- line parameters.
+ 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 can use multiple drugs database (FR, CA, USA, BE, PT, ZA).
- All drugs database can calculate the drug interactions through data
- issued from multiple sources.
+ FreeDiams is a pharmaceutical drug prescriptor assistant.
+ It can be used to creation complex prescription and to manage
+ drugs interactions.
  .
- FreeDiams is fully integrated in the FreeMedForms open source EMR
- and can be used as external prescriber by any EMR using its
- interoperability interface.
- .
  This package contains the English documentation of freediams.
 
 Package: freediams-doc-fr
@@ -90,20 +58,15 @@
 Enhances: freediams
 Provides: freediams-doc
 Description: FreeDiams French Documentation
- 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 drugs interactions within a
- prescription.  It can be linked to any application thanks to its command
- line parameters.
+ 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 can use multiple drugs database (FR, CA, USA, BE, PT, ZA).
- All drugs database can calculate the drug interactions through data
- issued from multiple sources.
+ FreeDiams is a pharmaceutical drug prescriptor assistant.
+ It can be used to creation complex prescription and to manage
+ drugs interactions.
  .
- FreeDiams is fully integrated in the FreeMedForms open source EMR
- and can be used as external prescriber by any EMR using its
- interoperability interface.
- .
  This package contains the French documentation of freediams.
 

Modified: trunk/packages/freediams/trunk/debian/copyright
===================================================================
--- trunk/packages/freediams/trunk/debian/copyright	2012-03-04 08:46:45 UTC (rev 9870)
+++ trunk/packages/freediams/trunk/debian/copyright	2012-03-04 08:54:17 UTC (rev 9871)
@@ -110,257 +110,11 @@
        "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
        own source and binary releases.
 
-Files: global_resources/pixmap/svg/{Gnome-applications-science.svg
-                                    Office-calendar-modified.svg
-                                    Printer.svg
-                                    unadvised.svg}
-Copyright: 2006-2008 Lapo Calamandrei, Jakub Steiner, Andreas Nilsson
-License: CC
-   Creative Commons Attribution-ShareAlike 2.0 License
- .
-   THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
-   CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
-   PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK
-   OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
-   PROHIBITED.
- .
-   BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND
-   AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU
-   THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH
-   TERMS AND CONDITIONS.
- .
-   1. Definitions
-    a. "Collective Work" means a work, such as a periodical issue,
-       anthology or encyclopedia, in which the Work in its entirety in
-       unmodified form, along with a number of other contributions,
-       constituting separate and independent works in themselves, are
-       assembled into a collective whole. A work that constitutes a
-       Collective Work will not be considered a Derivative Work (as
-       defined below) for the purposes of this License.
-    b. "Derivative Work" means a work based upon the Work or upon the Work
-       and other pre-existing works, such as a translation, musical
-       arrangement, dramatization, fictionalization, motion picture
-       version, sound recording, art reproduction, abridgment,
-       condensation, or any other form in which the Work may be recast,
-       transformed, or adapted, except that a work that constitutes a
-       Collective Work will not be considered a Derivative Work for the
-       purpose of this License. For the avoidance of doubt, where the Work
-       is a musical composition or sound recording, the synchronization of
-       the Work in timed-relation with a moving image ("synching") will be
-       considered a Derivative Work for the purpose of this License.
-    c. "Licensor" means the individual or entity that offers the Work
-       under the terms of this License.
-    d. "Original Author" means the individual or entity who created the
-       Work.
-    e. "Work" means the copyrightable work of authorship offered under the
-       terms of this License.
-    f. "You" means an individual or entity exercising rights under this
-       License who has not previously violated the terms of this License
-       with respect to the Work, or who has received express permission
-       from the Licensor to exercise rights under this License despite a
-       previous violation.
-    g. "License Elements" means the following high-level license
-       attributes as selected by Licensor and indicated in the title of
-       this License: Attribution, ShareAlike.
- .
-   2. Fair Use Rights. Nothing in this license is intended to reduce,
-   limit, or restrict any rights arising from fair use, first sale or
-   other limitations on the exclusive rights of the copyright owner under
-   copyright law or other applicable laws.
- .
-   3. License Grant. Subject to the terms and conditions of this License,
-   Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-   perpetual (for the duration of the applicable copyright) license to
-   exercise the rights in the Work as stated below:
-    a. to reproduce the Work, to incorporate the Work into one or more
-       Collective Works, and to reproduce the Work as incorporated in the
-       Collective Works;
-    b. to create and reproduce Derivative Works;
-    c. to distribute copies or phonorecords of, display publicly, perform
-       publicly, and perform publicly by means of a digital audio
-       transmission the Work including as incorporated in Collective
-       Works;
-    d. to distribute copies or phonorecords of, display publicly, perform
-       publicly, and perform publicly by means of a digital audio
-       transmission Derivative Works.
-    e. For the avoidance of doubt, where the work is a musical
-       composition:
-         i. Performance Royalties Under Blanket Licenses. Licensor waives
-            the exclusive right to collect, whether individually or via a
-            performance rights society (e.g. ASCAP, BMI, SESAC), royalties
-            for the public performance or public digital performance (e.g.
-            webcast) of the Work.
-        ii. Mechanical Rights and Statutory Royalties. Licensor waives the
-            exclusive right to collect, whether individually or via a
-            music rights society or designated agent (e.g. Harry Fox
-            Agency), royalties for any phonorecord You create from the
-            Work ("cover version") and distribute, subject to the
-            compulsory license created by 17 USC Section 115 of the US
-            Copyright Act (or the equivalent in other jurisdictions).
-    f. Webcasting Rights and Statutory Royalties. For the avoidance of
-       doubt, where the Work is a sound recording, Licensor waives the
-       exclusive right to collect, whether individually or via a
-       performance-rights society (e.g. SoundExchange), royalties for the
-       public digital performance (e.g. webcast) of the Work, subject to
-       the compulsory license created by 17 USC Section 114 of the US
-       Copyright Act (or the equivalent in other jurisdictions).
- .
-   The above rights may be exercised in all media and formats whether now
-   known or hereafter devised. The above rights include the right to make
-   such modifications as are technically necessary to exercise the rights
-   in other media and formats. All rights not expressly granted by
-   Licensor are hereby reserved.
- .
-   4. Restrictions.The license granted in Section 3 above is expressly
-   made subject to and limited by the following restrictions:
-    a. You may distribute, publicly display, publicly perform, or publicly
-       digitally perform the Work only under the terms of this License,
-       and You must include a copy of, or the Uniform Resource Identifier
-       for, this License with every copy or phonorecord of the Work You
-       distribute, publicly display, publicly perform, or publicly
-       digitally perform. You may not offer or impose any terms on the
-       Work that alter or restrict the terms of this License or the
-       recipients' exercise of the rights granted hereunder. You may not
-       sublicense the Work. You must keep intact all notices that refer to
-       this License and to the disclaimer of warranties. You may not
-       distribute, publicly display, publicly perform, or publicly
-       digitally perform the Work with any technological measures that
-       control access or use of the Work in a manner inconsistent with the
-       terms of this License Agreement. The above applies to the Work as
-       incorporated in a Collective Work, but this does not require the
-       Collective Work apart from the Work itself to be made subject to
-       the terms of this License. If You create a Collective Work, upon
-       notice from any Licensor You must, to the extent practicable,
-       remove from the Collective Work any reference to such Licensor or
-       the Original Author, as requested. If You create a Derivative Work,
-       upon notice from any Licensor You must, to the extent practicable,
-       remove from the Derivative Work any reference to such Licensor or
-       the Original Author, as requested.
-    b. You may distribute, publicly display, publicly perform, or publicly
-       digitally perform a Derivative Work only under the terms of this
-       License, a later version of this License with the same License
-       Elements as this License, or a Creative Commons iCommons license
-       that contains the same License Elements as this License (e.g.
-       Attribution-ShareAlike 2.0 Japan). You must include a copy of, or
-       the Uniform Resource Identifier for, this License or other license
-       specified in the previous sentence with every copy or phonorecord
-       of each Derivative Work You distribute, publicly display, publicly
-       perform, or publicly digitally perform. You may not offer or impose
-       any terms on the Derivative Works that alter or restrict the terms
-       of this License or the recipients' exercise of the rights granted
-       hereunder, and You must keep intact all notices that refer to this
-       License and to the disclaimer of warranties. You may not
-       distribute, publicly display, publicly perform, or publicly
-       digitally perform the Derivative Work with any technological
-       measures that control access or use of the Work in a manner
-       inconsistent with the terms of this License Agreement. The above
-       applies to the Derivative Work as incorporated in a Collective
-       Work, but this does not require the Collective Work apart from the
-       Derivative Work itself to be made subject to the terms of this
-       License.
-    c. If you distribute, publicly display, publicly perform, or publicly
-       digitally perform the Work or any Derivative Works or Collective
-       Works, You must keep intact all copyright notices for the Work and
-       give the Original Author credit reasonable to the medium or means
-       You are utilizing by conveying the name (or pseudonym if
-       applicable) of the Original Author if supplied; the title of the
-       Work if supplied; to the extent reasonably practicable, the Uniform
-       Resource Identifier, if any, that Licensor specifies to be
-       associated with the Work, unless such URI does not refer to the
-       copyright notice or licensing information for the Work; and in the
-       case of a Derivative Work, a credit identifying the use of the Work
-       in the Derivative Work (e.g., "French translation of the Work by
-       Original Author," or "Screenplay based on original Work by Original
-       Author"). Such credit may be implemented in any reasonable manner;
-       provided, however, that in the case of a Derivative Work or
-       Collective Work, at a minimum such credit will appear where any
-       other comparable authorship credit appears and in a manner at least
-       as prominent as such other comparable authorship credit.
- .
-   5. Representations, Warranties and Disclaimer
- .
-   UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS
-   THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND
-   CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-   INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-   FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-   LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF
-   ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW
-   THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO
-   YOU.
- .
-   6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-   LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-   ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-   ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR
-   HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- .
-   7. Termination
-    a. This License and the rights granted hereunder will terminate
-       automatically upon any breach by You of the terms of this License.
-       Individuals or entities who have received Derivative Works or
-       Collective Works from You under this License, however, will not
-       have their licenses terminated provided such individuals or
-       entities remain in full compliance with those licenses. Sections 1,
-       2, 5, 6, 7, and 8 will survive any termination of this License.
-    b. Subject to the above terms and conditions, the license granted here
-       is perpetual (for the duration of the applicable copyright in the
-       Work). Notwithstanding the above, Licensor reserves the right to
-       release the Work under different license terms or to stop
-       distributing the Work at any time; provided, however that any such
-       election will not serve to withdraw this License (or any other
-       license that has been, or is required to be, granted under the
-       terms of this License), and this License will continue in full
-       force and effect unless terminated as stated above.
- .
-   8. Miscellaneous
-    a. Each time You distribute or publicly digitally perform the Work or
-       a Collective Work, the Licensor offers to the recipient a license
-       to the Work on the same terms and conditions as the license granted
-       to You under this License.
-    b. Each time You distribute or publicly digitally perform a Derivative
-       Work, Licensor offers to the recipient a license to the original
-       Work on the same terms and conditions as the license granted to You
-       under this License.
-    c. If any provision of this License is invalid or unenforceable under
-       applicable law, it shall not affect the validity or enforceability
-       of the remainder of the terms of this License, and without further
-       action by the parties to this agreement, such provision shall be
-       reformed to the minimum extent necessary to make such provision
-       valid and enforceable.
-    d. No term or provision of this License shall be deemed waived and no
-       breach consented to unless such waiver or consent shall be in
-       writing and signed by the party to be charged with such waiver or
-       consent.
-    e. This License constitutes the entire agreement between the parties
-       with respect to the Work licensed here. There are no
-       understandings, agreements or representations with respect to the
-       Work not specified here. Licensor shall not be bound by any
-       additional provisions that may appear in any communication from
-       You. This License may not be modified without the mutual written
-       agreement of the Licensor and You.
- .
-   Creative Commons is not a party to this License, and makes no warranty
-   whatsoever in connection with the Work. Creative Commons will not be
-   liable to You or any party on any legal theory for any damages
-   whatsoever, including without limitation any general, special,
-   incidental or consequential damages arising in connection to this
-   license. Notwithstanding the foregoing two (2) sentences, if Creative
-   Commons has expressly identified itself as the Licensor hereunder, it
-   shall have all rights and obligations of Licensor.
- .
-   Except for the limited purpose of indicating to the public that the
-   Work is licensed under the CCPL, neither party will use the trademark
-   "Creative Commons" or any related trademark or logo of Creative Commons
-   without the prior written consent of Creative Commons. Any permitted
-   use will be in compliance with Creative Commons' then-current trademark
-   usage guidelines, as may be published on its website or otherwise made
-   available upon request from time to time.
-
 Files: global_resources/pixmaps/16x16
        global_resources/pixmaps/32x32
        global_resources/pixmaps/48x48
        global_resources/pixmaps/64x64
+       global_resources/pixmaps/svg
 Copyright: Tango Desktop Project, Eric Maeker
 License: PD
  These icons are in Public Domain

Modified: trunk/packages/freediams/trunk/debian/freediams-doc-en.doc-base
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc-en.doc-base	2012-03-04 08:46:45 UTC (rev 9870)
+++ trunk/packages/freediams/trunk/debian/freediams-doc-en.doc-base	2012-03-04 08:54:17 UTC (rev 9871)
@@ -2,20 +2,15 @@
 Title: FreeDiams user's manual in English language
 Author: Eric Maeker
 Abstract: Pharmaceutical drugs prescriptor and interactions checker
- 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 drugs interactions within a
- prescription.  It can be linked to any application thanks to its command
- line parameters.
+ 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 can use multiple drugs database (FR, CA, USA, BE, PT, ZA).
- All drugs database can calculate the drug interactions through data
- issued from multiple sources.
- .
- FreeDiams is fully integrated in the FreeMedForms open source EMR
- and can be used as external prescriber by any EMR using its
- interoperability interface.
+ 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

Modified: trunk/packages/freediams/trunk/debian/freediams-doc-fr.doc-base
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc-fr.doc-base	2012-03-04 08:46:45 UTC (rev 9870)
+++ trunk/packages/freediams/trunk/debian/freediams-doc-fr.doc-base	2012-03-04 08:54:17 UTC (rev 9871)
@@ -2,20 +2,15 @@
 Title: FreeDiams user's manual in French language
 Author: Eric Maeker
 Abstract: Pharmaceutical drugs prescriptor and interactions checker
- 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 drugs interactions within a
- prescription.  It can be linked to any application thanks to its command
- line parameters.
+ 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 can use multiple drugs database (FR, CA, USA, BE, PT, ZA).
- All drugs database can calculate the drug interactions through data
- issued from multiple sources.
- .
- FreeDiams is fully integrated in the FreeMedForms open source EMR
- and can be used as external prescriber by any EMR using its
- interoperability interface.
+ 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

Modified: trunk/packages/freediams/trunk/debian/rules
===================================================================
--- trunk/packages/freediams/trunk/debian/rules	2012-03-04 08:46:45 UTC (rev 9870)
+++ trunk/packages/freediams/trunk/debian/rules	2012-03-04 08:54:17 UTC (rev 9871)
@@ -1,39 +1,52 @@
 #!/usr/bin/make -f
+# (c) 2012, Eric Maeker, MD (fr), The FreeMedForms project, BSD revised license
+# The @ in front of a command prevents make from displaying
 
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+# var: keep the project order (should begin with freemedforms) 
+#FREEMEDFORMS_PROJECTS := freemedforms freediams freeicd freeaccount
+PROJECT := freediams
+QMAKE := qmake-qt4
+QMAKE_CONFIG := "CONFIG+=release" "CONFIG+=LINUX_INTEGRATED" -r
+QMAKE_IPATH := "INSTALL_ROOT_PATH=$(CURDIR)/debian/tmp/usr/"
+# func
+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
 
 %:
-	dh $@ --with quilt
+	dh $@
 
+# 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
-	qmake-qt4 -r "CONFIG+=release" "CONFIG+=LINUX_INTEGRATED" "INSTALL_ROOT_PATH=$(CURDIR)/debian/tmp/usr/" LOWERED_APPNAME="$(pkg)" $(pkg).pro
-
-# Upstream does not seem to provide a proper clean target - clean up here
+#	lrelease global_resources/translations/*.ts
+	$(call QMAKE_PROJ,$(PROJECT))
+#	$(foreach PROJECT,$(call reverse,$(FREEMEDFORMS_PROJECTS)),$(QMAKE_PROJ) && ) echo .
+	
+# Clean build path
 override_dh_auto_clean:
-	rm -rf bin/plugins/* bin/$(pkg)
-	find build -type d -name "\.*" -exec rm -rf \{\} \; 2> /dev/null || true
+	rm -Rf bin
+	rm -Rf build
 	rm -f global_resources/translations/[a-ps-z]*.qm
 	dh_auto_clean
 
+# Make all projects
+override_dh_auto_build:
+	$(call MAKE_PROJ,$(PROJECT))
+#	$(foreach PROJECT,$(FREEMEDFORMS_PROJECTS),$(MAKE_PROJ) && ) echo .
+
+# Install all projects
 override_dh_auto_install:
-	make install
+	$(call MAKEINSTALL_PROJ,$(PROJECT))
+#	$(foreach PROJECT,$(FREEMEDFORMS_PROJECTS),$(MAKEINSTALL_PROJ) && ) echo .
 
-override_dh_install:
-	# Remove those Links to dynamic libraries which have no version number (this should only
-	# be provided in -dev packages.  But some *.so files are real files without version number
-	# FIXME
-	# find $(CURDIR)/debian/tmp/usr/lib/$(pkg) -type l -name "*.so" -exec rm -f \{\} \;
-	
-	# remove doc files from /usr/bin
-	rm -f debian/tmp/usr/bin/[CR]*
-
+override_dh_install:	
 	dh_install
 
-override_dh_shlibdeps::
-	LD_LIBRARY_PATH=debian/tmp/usr/lib/$(pkg) dh_shlibdeps -l/usr/lib/$(pkg)
+#override_dh_shlibdeps:
+#	LD_LIBRARY_PATH=debian/tmp/usr/lib/freemedforms dh_shlibdeps -l/usr/lib/freemedforms
 
-override_dh_installdeb:
-	# remove extra license file
-	rm -f $(CURDIR)/debian/$(pkg)/usr/share/freediams/textfiles/COPYING.txt
-	dh_installdeb
+
+

Modified: trunk/packages/freediams/trunk/debian/watch
===================================================================
--- trunk/packages/freediams/trunk/debian/watch	2012-03-04 08:46:45 UTC (rev 9870)
+++ trunk/packages/freediams/trunk/debian/watch	2012-03-04 08:54:17 UTC (rev 9871)
@@ -6,6 +6,6 @@
 
 # rather using the redirector
 # http://googlecode.debian.net/p/freemedforms/freediams_(.+)\.orig\.tar\.gz
-opts="uversionmangle=s/%7E/~/" \
-  http://googlecode.debian.net/p/freemedforms/freediamsfullsources-(.+)\.tgz
+#opts="uversionmangle=s/%7E/~/" \
+  http://googlecode.debian.net/p/freemedforms/freemedformsfullsources-(.+)\.tgz
 ##  http://googlecode.debian.net/p/freemedforms/freediams.*_(.+)\.tgz




More information about the debian-med-commit mailing list