[med-svn] r5001 - in trunk/packages/freediams/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2010-07-07 08:40:29 +0000 (Wed, 07 Jul 2010)
New Revision: 5001

Added:
   trunk/packages/freediams/trunk/debian/freediams-doc.install
   trunk/packages/freediams/trunk/debian/patches/20_use_cp-a_instead_of_install.patch
Removed:
   trunk/packages/freediams/trunk/debian/freediams-doc.docs
Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/control
   trunk/packages/freediams/trunk/debian/patches/series
   trunk/packages/freediams/trunk/debian/rules
Log:
New upstream version


Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog	2010-07-06 17:37:29 UTC (rev 5000)
+++ trunk/packages/freediams/trunk/debian/changelog	2010-07-07 08:40:29 UTC (rev 5001)
@@ -1,6 +1,10 @@
 freediams (0.4.0-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * debian/patches/20_use_cp-a_instead_of_install.patch: Make sure 
+    dynamic library versions will be installed as symlinks instead of
+    copies
+  * debian/freediams-doc.install: Install different languages docs
 
  -- Andreas Tille <tille at debian.org>  Tue, 06 Jul 2010 16:19:43 +0200
 

Modified: trunk/packages/freediams/trunk/debian/control
===================================================================
--- trunk/packages/freediams/trunk/debian/control	2010-07-06 17:37:29 UTC (rev 5000)
+++ trunk/packages/freediams/trunk/debian/control	2010-07-07 08:40:29 UTC (rev 5001)
@@ -5,8 +5,8 @@
 Uploaders: Eric Maeker <eric.maeker at free.fr>,
  Andreas Tille <tille at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.1), libqt4-dev (>= 4.4.3), doxygen (>= 1.5.8), libxext-dev, quilt
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.1), libqt4-dev (>= 4.4.3), doxygen (>= 1.5.8), libxext-dev,  quilt (>= 0.47)
+Standards-Version: 3.9.0
 Homepage: http://www.freemedforms.com/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/freediams/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/freediams/trunk/

Deleted: trunk/packages/freediams/trunk/debian/freediams-doc.docs
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc.docs	2010-07-06 17:37:29 UTC (rev 5000)
+++ trunk/packages/freediams/trunk/debian/freediams-doc.docs	2010-07-07 08:40:29 UTC (rev 5001)
@@ -1 +0,0 @@
-global_resources/doc/freediams/html

Added: trunk/packages/freediams/trunk/debian/freediams-doc.install
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc.install	                        (rev 0)
+++ trunk/packages/freediams/trunk/debian/freediams-doc.install	2010-07-07 08:40:29 UTC (rev 5001)
@@ -0,0 +1,2 @@
+global_resources/doc/freediams/en/html/* usr/share/doc/freediams/en
+global_resources/doc/freediams/fr/html/* usr/share/doc/freediams/fr

Added: trunk/packages/freediams/trunk/debian/patches/20_use_cp-a_instead_of_install.patch
===================================================================
--- trunk/packages/freediams/trunk/debian/patches/20_use_cp-a_instead_of_install.patch	                        (rev 0)
+++ trunk/packages/freediams/trunk/debian/patches/20_use_cp-a_instead_of_install.patch	2010-07-07 08:40:29 UTC (rev 5001)
@@ -0,0 +1,16 @@
+Author: Andreas Tille <tille at debian.org>
+Forwarded: yes
+Description: qmake uses "install -m 644 -p" to install dynamic libraries
+ which leads to copies of .so* files instead of symlinks.  Use "cp -a"
+ instead
+
+--- freediams-0.4.0.orig/buildspecs/install_linux.pri
++++ freediams-0.4.0/buildspecs/install_linux.pri
+@@ -6,6 +6,7 @@ else {
+  !CONFIG(LINUX_INTEGRATED):message(Preparing installation for Unix)
+  else:message(Preparing installation for integrated Linux)
+ 
++ QMAKE_INSTALL_FILE=cp -a
+  CONFIG(LINUX_INTEGRATED){
+    # Redefine the default install paths
+    isEmpty(INSTALL_ROOT_PATH):INSTALL_ROOT_PATH = $${SOURCES_ROOT_PATH}/packages/linux-integrated/usr

Modified: trunk/packages/freediams/trunk/debian/patches/series
===================================================================
--- trunk/packages/freediams/trunk/debian/patches/series	2010-07-06 17:37:29 UTC (rev 5000)
+++ trunk/packages/freediams/trunk/debian/patches/series	2010-07-07 08:40:29 UTC (rev 5001)
@@ -1 +1,2 @@
 20_no_rpath.patch
+20_use_cp-a_instead_of_install.patch

Modified: trunk/packages/freediams/trunk/debian/rules
===================================================================
--- trunk/packages/freediams/trunk/debian/rules	2010-07-06 17:37:29 UTC (rev 5000)
+++ trunk/packages/freediams/trunk/debian/rules	2010-07-07 08:40:29 UTC (rev 5001)
@@ -10,7 +10,8 @@
 override_dh_auto_clean:
 	rm -rf bin/plugins/* bin/freediams
 	find build -type d -name "\.*" -exec rm -rf \{\} \; 2> /dev/null || true
-	rm -rf global_resources/doc/FreeDiams global_resources/doc/freediams/html/*
+	rm -rf global_resources/doc/FreeDiams global_resources/doc/freediams/en/* global_resources/doc/freediams/fr/*
+	rm -rf contrib/quazip/libz.a
 	test ! -f Makefile || make distclean
 
 override_dh_auto_install: