[med-svn] r9397 - trunk/packages/gnumed-client/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-01-23 22:47:02 +0000 (Mon, 23 Jan 2012)
New Revision: 9397

Added:
   trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees
Modified:
   trunk/packages/gnumed-client/trunk/debian/changelog
   trunk/packages/gnumed-client/trunk/debian/control
   trunk/packages/gnumed-client/trunk/debian/gnumed-doc.install
   trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links
   trunk/packages/gnumed-client/trunk/debian/rules
Log:
Make use of dh-linktree to handle copies of packaged JS-libraries


Modified: trunk/packages/gnumed-client/trunk/debian/changelog
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/changelog	2012-01-23 22:34:27 UTC (rev 9396)
+++ trunk/packages/gnumed-client/trunk/debian/changelog	2012-01-23 22:47:02 UTC (rev 9397)
@@ -1,11 +1,14 @@
-gnumed-client (1.1.10-1) UNRELEASED; urgency=low
+gnumed-client (1.1.10-1) unstable; urgency=low
 
-Not yet released because broken docs
   * New upstream version
   * debian/conf/gnumed-client.conf:
     Enable "name = GNUmed Default" as requested by upstream
+  * debian/control: Build-Depends: dh-linktree + JS dependencies
+  * debian/rules: --with linktree
+  * debian/gnumed-doc.linktrees: mention needed linking
+  * debian/gnumed-doc.links: Adapted to new upstream file locations
 
- -- Andreas Tille <tille at debian.org>  Mon, 23 Jan 2012 16:50:39 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 23 Jan 2012 22:58:47 +0100
 
 gnumed-client (1.1.7-1) unstable; urgency=low
 

Modified: trunk/packages/gnumed-client/trunk/debian/control
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/control	2012-01-23 22:34:27 UTC (rev 9396)
+++ trunk/packages/gnumed-client/trunk/debian/control	2012-01-23 22:47:02 UTC (rev 9397)
@@ -4,7 +4,8 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), quilt (>= 0.47), po-debconf, python (>= 2.6)
+Build-Depends: debhelper (>= 8), quilt (>= 0.47), po-debconf, python (>= 2.6),
+ dh-linktree, libjs-jquery, libjs-jquery-livequery
 Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gnumed-client/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/gnumed-client/trunk/

Modified: trunk/packages/gnumed-client/trunk/debian/gnumed-doc.install
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/gnumed-doc.install	2012-01-23 22:34:27 UTC (rev 9396)
+++ trunk/packages/gnumed-client/trunk/debian/gnumed-doc.install	2012-01-23 22:47:02 UTC (rev 9397)
@@ -1 +1 @@
-client/doc/user-manual/[A-Z]* usr/share/doc/gnumed/user-manual
+client/doc/user-manual/*	usr/share/doc/gnumed/user-manual

Modified: trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links	2012-01-23 22:34:27 UTC (rev 9396)
+++ trunk/packages/gnumed-client/trunk/debian/gnumed-doc.links	2012-01-23 22:47:02 UTC (rev 9397)
@@ -1 +1 @@
-usr/share/doc/gnumed/user-manual/GnumedManual.html usr/share/doc/gnumed/user-manual/index.html
+usr/share/doc/gnumed/user-manual/Gnumed/GnumedManual.html usr/share/doc/gnumed/user-manual/Gnumed/index.html

Added: trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees	                        (rev 0)
+++ trunk/packages/gnumed-client/trunk/debian/gnumed-doc.linktrees	2012-01-23 22:47:02 UTC (rev 9397)
@@ -0,0 +1,2 @@
+embed usr/share/javascript/jquery-livequery/jquery.livequery.js usr/share/doc/gnumed/user-manual/rsrc/System/JQueryPlugin/plugins/livequery/jquery.livequery.js
+embed usr/share/javascript/jquery/jquery.js			usr/share/doc/gnumed/user-manual/rsrc/System/JQueryPlugin/jquery-1.4.3.js

Modified: trunk/packages/gnumed-client/trunk/debian/rules
===================================================================
--- trunk/packages/gnumed-client/trunk/debian/rules	2012-01-23 22:34:27 UTC (rev 9396)
+++ trunk/packages/gnumed-client/trunk/debian/rules	2012-01-23 22:47:02 UTC (rev 9397)
@@ -3,7 +3,7 @@
 # Andreas Tille, GPL
 
 %:
-	dh $@ --with quilt --with python2
+	dh $@ --with quilt --with python2 --with linktree
 
 pkg=gnumed
 client=$(pkg)-client