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

Andreas Tille tille at alioth.debian.org
Sat Jul 10 05:01:29 UTC 2010 

Author: tille
Date: 2010-07-10 05:01:28 +0000 (Sat, 10 Jul 2010)
New Revision: 5018

Added:
   trunk/packages/freediams/trunk/debian/freediams-doc.install
Removed:
   trunk/packages/freediams/trunk/debian/freediams-doc.install
   trunk/packages/freediams/trunk/debian/patches/20_use_cp-a_instead_of_install.patch
Modified:
   trunk/packages/freediams/trunk/debian/changelog
   trunk/packages/freediams/trunk/debian/control
   trunk/packages/freediams/trunk/debian/copyright
   trunk/packages/freediams/trunk/debian/patches/series
   trunk/packages/freediams/trunk/debian/rules
   trunk/packages/freediams/trunk/debian/watch
Log:
Adapt packaging to new upstream version


Modified: trunk/packages/freediams/trunk/debian/changelog
===================================================================
--- trunk/packages/freediams/trunk/debian/changelog	2010-07-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/changelog	2010-07-10 05:01:28 UTC (rev 5018)
@@ -1,10 +1,11 @@
-freediams (0.4.0-1) UNRELEASED; urgency=low
+freediams (0.4.2-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
+  * debian/watch: Adapt to new layout of code.google.com
 
  -- 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-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/control	2010-07-10 05:01:28 UTC (rev 5018)
@@ -5,7 +5,7 @@
 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 (>= 0.47)
+Build-Depends: debhelper (>= 7.1), libqt4-dev (>= 4.4.3), doxygen (>= 1.5.8), libxext-dev, quilt (>= 0.47), zlib1g-dev
 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

Modified: trunk/packages/freediams/trunk/debian/copyright
===================================================================
--- trunk/packages/freediams/trunk/debian/copyright	2010-07-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/copyright	2010-07-10 05:01:28 UTC (rev 5018)
@@ -5,10 +5,34 @@
 X-Upstream-Author: Eric Maeker <eric.maeker at free.fr>
 
 Copyright: © 2008-2009 by Eric Maeker, MD
-License: FreeDiam is released under the terms of the new BSD License.
-X-Comment: On Debian systems, the complete text of the BSD License can
- be found in `/usr/share/common-licenses/BSD'.
+License: 
+                        LICENCE BSD REVISED
 
+* Copyright (c) 1998, Regents of the University of California
+* All rights reserved.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the University of California, Berkeley nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 Files: debian/*
 Copyright: © 2009, Eric Maeker <eric.maeker at free.fr>
                    Andreas Tille <tille at debian.org>

Deleted: trunk/packages/freediams/trunk/debian/freediams-doc.install
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc.install	2010-07-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/freediams-doc.install	2010-07-10 05:01:28 UTC (rev 5018)
@@ -1,2 +0,0 @@
-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/freediams-doc.install
===================================================================
--- trunk/packages/freediams/trunk/debian/freediams-doc.install	                        (rev 0)
+++ trunk/packages/freediams/trunk/debian/freediams-doc.install	2010-07-10 05:01:28 UTC (rev 5018)
@@ -0,0 +1 @@
+usr/share/doc/freediams

Deleted: 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	2010-07-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/patches/20_use_cp-a_instead_of_install.patch	2010-07-10 05:01:28 UTC (rev 5018)
@@ -1,16 +0,0 @@
-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-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/patches/series	2010-07-10 05:01:28 UTC (rev 5018)
@@ -1,2 +1 @@
 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-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/rules	2010-07-10 05:01:28 UTC (rev 5018)
@@ -16,12 +16,19 @@
 
 override_dh_auto_install:
 	make install
-	# fix permission of some images, Eric, please try to apply this just in your upstream tarball
-	find $(CURDIR)/debian/tmp -name "*.png" -executable -exec chmod 644 \{\} \;
-	find $(CURDIR)/debian/tmp -name "*.qm" -executable -exec chmod 644 \{\} \;
 
 override_dh_install:
+	# Install documentation
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freediams/en
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/freediams/fr
+	mv global_resources/doc/freediams/en/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/en
+	mv global_resources/doc/freediams/fr/html/* $(CURDIR)/debian/tmp/usr/share/doc/freediams/fr
 	dh_install --autodest
 
 override_dh_shlibdeps::
 	LD_LIBRARY_PATH=debian/tmp/usr/lib/freediams dh_shlibdeps -l/usr/lib/freediams
+
+override_dh_installdeb:
+	# remove extra license file
+	rm -f $(CURDIR)/debian/freediams-data/usr/share/freediams/textfiles/COPYING.txt
+	dh_installdeb

Modified: trunk/packages/freediams/trunk/debian/watch
===================================================================
--- trunk/packages/freediams/trunk/debian/watch	2010-07-09 22:32:16 UTC (rev 5017)
+++ trunk/packages/freediams/trunk/debian/watch	2010-07-10 05:01:28 UTC (rev 5018)
@@ -1,3 +1,3 @@
 version=3
 http://code.google.com/p/freemedforms/downloads/list \
-  http://freemedforms.googlecode.com/files/freediams_([.\d]+).*\.tar\.gz
+  .*freediams_([.\d]+).*\.tar\.gz.*

More information about the debian-med-commit mailing list