Author: tille
Date: 2011-11-17 13:13:46 +0000 (Thu, 17 Nov 2011)
New Revision: 8593
Added:
trunk/packages/freediams/trunk/debian/freediams-drugs.install
Removed:
trunk/packages/freediams/trunk/debian/freediams-data.install
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.install
trunk/packages/freediams/trunk/debian/rules
Log:
Move freediams-data to freediams-drugs package and keeping only the database there while other content is kept in the main package
Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog 2011-11-17 12:49:50 UTC (rev 8592)
+++ trunk/packages/freediams/trunk/debian/changelog 2011-11-17 13:13:46 UTC (rev 8593)
@@ -5,8 +5,13 @@
* debian/control: Suggests: ttf-mscorefonts-installer msttcorefonts
* debian/copyright: Details for databases
- -- Eric Maeker <eric.maeker at gmail.com> Wed, 16 Nov 2011 17:00:00 +0100
+ [ Andreas Tille ]
+ * debian/control: Removed suggested msttcorefonts
+ * debian/{control,rules}: rename freediams-data to freediams-drugs
+ * debian/rules: use calculated $(pkg) name instead of "freediams" string
+ -- Andreas Tille <tille at debian.org> Thu, 17 Nov 2011 11:22:54 +0100
+
freediams (0.6.0-1) unstable; urgency=low
[ Eric Maeker ]
Modified: trunk/packages/freediams/trunk/debian/control
===================================================================
--- trunk/packages/freediams/trunk/debian/control 2011-11-17 12:49:50 UTC (rev 8592)
+++ trunk/packages/freediams/trunk/debian/control 2011-11-17 13:13:46 UTC (rev 8593)
@@ -14,8 +14,8 @@
Package: freediams
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libqtcore4 (>= 4.4.3), libqtgui4 (>= 4.4.3), libqt4-sql-sqlite, libqt4-xml,
- libqt4-network, libqt4-svg, freediams-data (= ${source:Version})
-Suggests: freediams-doc, ttf-mscorefonts-installer, msttcorefonts
+ libqt4-network, libqt4-svg, freediams-drugs (= ${source:Version})
+Suggests: freediams-doc, ttf-mscorefonts-installer
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
@@ -32,7 +32,7 @@
and can be used as external prescriber by any EMR using its
interoperability interface.
-Package: freediams-data
+Package: freediams-drugs
Architecture: all
Depends: ${misc:Depends}
Recommends: freediams
@@ -52,7 +52,7 @@
and can be used as external prescriber by any EMR using its
interoperability interface.
.
- This package contains the architecture independent data.
+ This package contains the drugs database.
Package: freediams-doc-en
Architecture: all
Modified: trunk/packages/freediams/trunk/debian/copyright
===================================================================
--- trunk/packages/freediams/trunk/debian/copyright 2011-11-17 12:49:50 UTC (rev 8592)
+++ trunk/packages/freediams/trunk/debian/copyright 2011-11-17 13:13:46 UTC (rev 8593)
@@ -375,7 +375,7 @@
License: public domain like
License terms: http://www.hc-sc.gc.ca/home-accueil/important-fra.php
2) FDA drugs database: http://www.fda.gov/Drugs/InformationOnDrugs/ucm079750.htm
- License: public domain © FDA
+ License: public domain FDA
3) French drugs database and drug-drug interaction (starting point): http://afssaps-prd.afssaps.fr/php/ecodex
License: free for non commercial use © AFSSAPS
License terms: http://www.afssaps.fr/Mentions-legales
Deleted: trunk/packages/freediams/trunk/debian/freediams-data.install
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-data.install 2011-11-17 12:49:50 UTC (rev 8592)
+++ trunk/packages/freediams/trunk/debian/freediams-data.install 2011-11-17 13:13:46 UTC (rev 8593)
@@ -1 +0,0 @@
-usr/share/freediams
Copied: trunk/packages/freediams/trunk/debian/freediams-drugs.install (from rev 8587, trunk/packages/freediams/trunk/debian/freediams-data.install)
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-drugs.install (rev 0)
+++ trunk/packages/freediams/trunk/debian/freediams-drugs.install 2011-11-17 13:13:46 UTC (rev 8593)
@@ -0,0 +1 @@
+usr/share/freediams/databases/drugs
Modified: trunk/packages/freediams/trunk/debian/freediams.install
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams.install 2011-11-17 12:49:50 UTC (rev 8592)
+++ trunk/packages/freediams/trunk/debian/freediams.install 2011-11-17 13:13:46 UTC (rev 8593)
@@ -2,4 +2,7 @@
usr/lib
usr/share/applications
usr/share/pixmaps
-
+usr/share/freediams/package_helpers
+usr/share/freediams/pixmap
+usr/share/freediams/textfiles
+usr/share/freediams/translations
Modified: trunk/packages/freediams/trunk/debian/rules
===================================================================
--- trunk/packages/freediams/trunk/debian/rules 2011-11-17 12:49:50 UTC (rev 8592)
+++ trunk/packages/freediams/trunk/debian/rules 2011-11-17 13:13:46 UTC (rev 8593)
@@ -1,15 +1,17 @@
#!/usr/bin/make -f
+pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+
%:
dh $@ --with quilt
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="freediams" freediams.pro
+ 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
override_dh_auto_clean:
- rm -rf bin/plugins/* bin/freediams
+ rm -rf bin/plugins/* bin/$(pkg)
find build -type d -name "\.*" -exec rm -rf \{\} \; 2> /dev/null || true
rm -rf contrib/quazip/libz.a
rm -f global_resources/translations/[a-ps-z]*.qm
@@ -22,7 +24,7 @@
# 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/freediams -type l -name "*.so" -exec rm -f \{\} \;
+ # 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]*
@@ -30,9 +32,9 @@
dh_install
override_dh_shlibdeps::
- LD_LIBRARY_PATH=debian/tmp/usr/lib/freediams dh_shlibdeps -l/usr/lib/freediams
+ LD_LIBRARY_PATH=debian/tmp/usr/lib/$(pkg) dh_shlibdeps -l/usr/lib/$(pkg)
override_dh_installdeb:
# remove extra license file
- rm -f $(CURDIR)/debian/freediams-data/usr/share/freediams/textfiles/COPYING.txt
+ rm -f $(CURDIR)/debian/$(pkg)/usr/share/freediams/textfiles/COPYING.txt
dh_installdeb