[med-svn] r14193 - trunk/packages/freemedforms-project/trunk/debian
Eric Maeker
ericmaeker-guest at alioth.debian.org
Sat Jul 20 23:06:36 UTC 2013
Author: ericmaeker-guest
Date: 2013-07-20 23:06:35 +0000 (Sat, 20 Jul 2013)
New Revision: 14193
Modified:
trunk/packages/freemedforms-project/trunk/debian/changelog
trunk/packages/freemedforms-project/trunk/debian/control
trunk/packages/freemedforms-project/trunk/debian/freediams.lintian-overrides
trunk/packages/freemedforms-project/trunk/debian/freemedforms-libs.lintian-overrides
trunk/packages/freemedforms-project/trunk/debian/rules
Log:
freemedforms: removing rpath draft code, enabling multiarch, some lintian overrides corrected
Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog 2013-07-19 21:11:31 UTC (rev 14192)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog 2013-07-20 23:06:35 UTC (rev 14193)
@@ -2,13 +2,11 @@
[ Eric Maeker ]
* debian/rules:
- * remove Qt translation files from the installation
+ * removed Qt translation files from the installation
* debian/watchfile:
* improved thanks to Bart Martens <bartm at debian.org>
- * debian/{rules,*install}:
- * managing MutliArch build
- * debian/{rules,freemedforms-wrapper.sh}
- * removing rpath, adding a bin wrapper to set the LD_LIBRARY_PATH
+ * debian/{rules,control,*.install}:
+ * multiarch enabled
[ Andreas Tille ]
* debian/rules: use xz compression
Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control 2013-07-19 21:11:31 UTC (rev 14192)
+++ trunk/packages/freemedforms-project/trunk/debian/control 2013-07-20 23:06:35 UTC (rev 14193)
@@ -14,7 +14,7 @@
libopencv-objdetect-dev (>= 2.3),
libquazip0-dev (>= 0.4.4)
Standards-Version: 3.9.4
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freemedforms-project/
+Vcs-Browser: http://svn.debian.org/svn/debian-med/trunk/packages/freemedforms-project/
Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/freemedforms-project/trunk/
Homepage: http://www.freemedforms.com/
@@ -151,6 +151,8 @@
Package: freemedforms-libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
libqt4-sql-mysql (>= 4:4.7.0),
Modified: trunk/packages/freemedforms-project/trunk/debian/freediams.lintian-overrides
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freediams.lintian-overrides 2013-07-19 21:11:31 UTC (rev 14192)
+++ trunk/packages/freemedforms-project/trunk/debian/freediams.lintian-overrides 2013-07-20 23:06:35 UTC (rev 14193)
@@ -6,18 +6,18 @@
# package. In that case, place those private shared libraries in
# /usr/lib/<package>.
# This is actually the case and so the lintian error is a false alarm
-freediams: binary-or-shlib-defines-rpath usr/bin/freediams /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libCore.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDataPackPlugin.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDrugInteractions.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDrugs.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDrugsBase.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libListView.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libMainWindow.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libPrinter.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libSaveRestore.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libTemplates.so /usr/lib/freemedforms-common
-freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libTextEditor.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/bin/freediams /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libCore.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDataPackPlugin.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDrugInteractions.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDrugs.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libDrugsBase.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libListView.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libMainWindow.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libPrinter.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libSaveRestore.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libTemplates.so /usr/lib/freemedforms-common
+#freediams: binary-or-shlib-defines-rpath usr/lib/freediams/libTextEditor.so /usr/lib/freemedforms-common
#########################################################################################
# Exclude false positives: These are no spelling errors but rather valid french words
Modified: trunk/packages/freemedforms-project/trunk/debian/freemedforms-libs.lintian-overrides
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/freemedforms-libs.lintian-overrides 2013-07-19 21:11:31 UTC (rev 14192)
+++ trunk/packages/freemedforms-project/trunk/debian/freemedforms-libs.lintian-overrides 2013-07-20 23:06:35 UTC (rev 14193)
@@ -11,21 +11,21 @@
# The only time a binary or shared library in a Debian package should set
# RPATH is if it is linked to private shared libraries in the same
# package. In that case, place those private shared libraries in
-# /usr/lib/<package>.
+# /usr/lib/{arch}/<package>.
# This is actually the case and so the lintian error is a false alarm
##### Upstream comment
# Whatever is these RPATH will be removed in future upstream version
#####
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libAggregation.so.* /usr/lib/freemedforms
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libCalendar.so.* /usr/lib/freemedforms
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libDataPackUtils.so.* /usr/lib/freemedforms
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libExtensionSystem.so.* /usr/lib/freemedforms
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libMedicalUtils.so.* /usr/lib/freemedforms
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libMedinTux.so.* /usr/lib/freemedforms
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libTranslationUtils.so.* /usr/lib/freemedforms
-freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/freemedforms-common/libUtils.so.* /usr/lib/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libAggregation.so.* /usr/lib/*/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libCalendar.so.* /usr/lib/*/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libDataPackUtils.so.* /usr/lib/*/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libExtensionSystem.so.* /usr/lib/*/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libMedicalUtils.so.* /usr/lib/*/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libMedinTux.so.* /usr/lib/*/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libTranslationUtils.so.* /usr/lib/*/freemedforms
+#freemedforms-libs: binary-or-shlib-defines-rpath usr/lib/*/freemedforms-common/libUtils.so.* /usr/lib/*/freemedforms
#########################################################################################
# Exclude false positives: These are no spelling errors but rather valid french words
-freemedforms-libs: spelling-error-in-binary usr/lib/freemedforms-common/libMedicalUtils.so.* dont don't
-freemedforms-libs: spelling-error-in-binary usr/lib/freemedforms-common/libMedinTux.so.* Ressources Resources
+freemedforms-libs: spelling-error-in-binary usr/lib/*/freemedforms-common/libMedicalUtils.so.* dont don't
+freemedforms-libs: spelling-error-in-binary usr/lib/*/freemedforms-common/libMedinTux.so.* Ressources Resources
Modified: trunk/packages/freemedforms-project/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/rules 2013-07-19 21:11:31 UTC (rev 14192)
+++ trunk/packages/freemedforms-project/trunk/debian/rules 2013-07-20 23:06:35 UTC (rev 14193)
@@ -28,14 +28,18 @@
# vars
FREEMEDFORMS_EMR:=freemedforms
FREEDIAMS:=freediams
-WRAPPER:=debian/freemedforms-wrapper.sh
-# WRAPPER:=global_resources/package_helpers/freemedforms-wrapper.sh # since 0.9.0~beta2
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
QMAKE:=qmake-qt4
-QMAKE_GLOBAL_CONFIG:="CONFIG+=LINUX_INTEGRATED" "CONFIG+=dontbuildquazip" "CONFIG+=norpath" LIBRARY_BASENAME="lib/$(DEB_HOST_MULTIARCH)"
-QMAKE_SUBPROJECT_CONFIG := "CONFIG+=dontbuildlibs" "CONFIG+=dontinstallresources" "CONFIG+=dontinstalllibs"
-QMAKE_IPATH := "INSTALL_ROOT_PATH=/usr/"
+QMAKE_GLOBAL_CONFIG:="CONFIG+=LINUX_INTEGRATED" \
+ "CONFIG+=dontbuildquazip" \
+ LIBRARY_BASENAME="lib/$(DEB_HOST_MULTIARCH)"
+
+QMAKE_SUBPROJECT_CONFIG:="CONFIG+=dontbuildlibs" \
+ "CONFIG+=dontinstallresources" \
+ "CONFIG+=dontinstalllibs"
+
+QMAKE_IPATH:="INSTALL_ROOT_PATH=/usr/"
QMAKE_COMPILING:=buildspecs/compiling.pri
# func
@@ -85,25 +89,13 @@
# Remove Qt translation files (FreeMedForms will use the Qt system translation files)
find $(CURDIR)/debian/tmp/usr/share/freemedforms/translations -name "qt*.qm" -delete
- # Install the bin wrappers
- # For FreeMedForms EMR
- mv $(CURDIR)/debian/tmp/usr/bin/freemedforms $(CURDIR)/debian/tmp/usr/bin/freemedforms.bin
- cp -a $(WRAPPER) $(CURDIR)/debian/tmp/usr/bin/freemedforms
- chmod 555 $(CURDIR)/debian/tmp/usr/bin/freemedforms
+override_dh_makeshlibs:
+ # Nothing to do
- # For FreeDiams
- mv $(CURDIR)/debian/tmp/usr/bin/freediams $(CURDIR)/debian/tmp/usr/bin/freediams.bin
- cp -a $(WRAPPER) $(CURDIR)/debian/tmp/usr/bin/freediams
- sed -i "s/\"freemedforms/\"freediams/" $(CURDIR)/debian/tmp/usr/bin/freediams
- sed -i "s/\"FreeMedForms/\"FreeDiams/" $(CURDIR)/debian/tmp/usr/bin/freediams
- chmod 555 $(CURDIR)/debian/tmp/usr/bin/freediams
-
-override_dh_shlibdeps:
- dh_shlibdeps -l$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/freemedforms-common:$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/freemedforms:$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/freediams
-
override_dh_builddeb:
dh_builddeb -- -Z xz
get-orig-source:
mkdir -p ../tarballs
uscan --verbose --force-download --destdir=../tarballs
+
More information about the debian-med-commit
mailing list