[med-svn] r12023 - in trunk/packages/cain/trunk/debian: . patches

[Ivo Maintz]

Author: ivomaintz-guest
Date: 2012-08-10 11:04:02 +0000 (Fri, 10 Aug 2012)
New Revision: 12023

Added:
   trunk/packages/cain/trunk/debian/patches/help.patch
Modified:
   trunk/packages/cain/trunk/debian/changelog
   trunk/packages/cain/trunk/debian/patches/series
   trunk/packages/cain/trunk/debian/rules
Log:
fixed some broken links; ready for upload


Modified: trunk/packages/cain/trunk/debian/changelog
===================================================================
--- trunk/packages/cain/trunk/debian/changelog	2012-08-10 10:34:36 UTC (rev 12022)
+++ trunk/packages/cain/trunk/debian/changelog	2012-08-10 11:04:02 UTC (rev 12023)
@@ -1,3 +1,11 @@
+cain (1.9-5) unstable; urgency=low
+
+  * debian/rules: remove lots of superfluos files in help/ and gui/
+  * fixed broken links in the help
+    Closes: #1032304
+
+ -- Ivo Maintz <ivo at maintz.de>  Fri, 10 Aug 2012 11:40:11 +0200
+
 cain (1.9-4) unstable; urgency=low
 
   * debian/rules: Enable binary only builds

Added: trunk/packages/cain/trunk/debian/patches/help.patch
===================================================================
--- trunk/packages/cain/trunk/debian/patches/help.patch	                        (rev 0)
+++ trunk/packages/cain/trunk/debian/patches/help.patch	2012-08-10 11:04:02 UTC (rev 12023)
@@ -0,0 +1,49 @@
+Description: b0rken links
+This patch fixes some broken links in the documentation.
+ .
+ cain (1.9-2) unstable; urgency=low
+ .
+   * changed the partitioning of the package
+Author: Ivo Maintz <ivo at maintz.de>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- cain-1.9.orig/help/UserSolvers.htm
++++ cain-1.9/help/UserSolvers.htm
+@@ -221,14 +221,14 @@ The methods that require exponential dev
+ 	is generated by a linear search on the groups followed by selecting
+ 	a reaction within a group with the method of rejection.
+ 	This solver implements a slightly modified version of the composition
+-	rejection method presented in [<a href="slepoy2008">Slepoy 2008</a>].
++	rejection method presented in [<a href="Bibliography.htm#slepoy2008">Slepoy 2008</a>].
+ 	<li>
+ 	<tt>Binary search, full CMF</tt>
+ 	- Generate O(log <em>M</em>). Modify O(<em>M</em>).
+ 	The cumulative mass function (CMF) is stored in an array. This allows
+ 	one to generate a discrete deviate with a binary search on that array.
+ 	At each time step the CMF is regenerated. This is an implementation
+-	of the logarithmic direct method [<a href="li2006">Li 2006</a>].
++	of the logarithmic direct method [<a href="Bibliography.htm#li2006">Li 2006</a>].
+ 	<li>
+ 	<tt>Binary search, sorted CMF</tt>
+ 	- Generate O(log <em>M</em>). Modify O(<em>M</em>).
+@@ -244,7 +244,7 @@ The methods that require exponential dev
+         - Generate O(log <em>M</em>). Modify O(log <em>M</em>).
+         Instead of storing the full CMF, a partial, recursive CMF is used.
+         This approach is equivalent to the method presented in
+-        [<a href="gibson2000">Gibson 2000</a>]. A deviate can be generated
++        [<a href="Bibliography.htm#gibson2000">Gibson 2000</a>]. A deviate can be generated
+         with a binary search. Modifying a propensity affects at most
+         log<sub>2</sub> <em>M</em> elements of the partial, recursive CMF.
+         <li>

Modified: trunk/packages/cain/trunk/debian/patches/series
===================================================================
--- trunk/packages/cain/trunk/debian/patches/series	2012-08-10 10:34:36 UTC (rev 12022)
+++ trunk/packages/cain/trunk/debian/patches/series	2012-08-10 11:04:02 UTC (rev 12023)
@@ -2,3 +2,4 @@
 eigen.patch
 gcc-4.7.patch
 hardening.patch
+help.patch

Modified: trunk/packages/cain/trunk/debian/rules
===================================================================
--- trunk/packages/cain/trunk/debian/rules	2012-08-10 10:34:36 UTC (rev 12022)
+++ trunk/packages/cain/trunk/debian/rules	2012-08-10 11:04:02 UTC (rev 12023)
@@ -14,7 +14,8 @@
 
 override_dh_install:
 	dh_install
-	rm -f debian/$(pkg)/usr/share/cain/help/Licen*
+	rm -rf debian/$(pkg)/usr/share/cain/help/* debian/$(pkg)/usr/share/cain/gui/help.htm*
+	cd help && zip ../debian/$(pkg)/usr/share/cain/help/cain.htb * -r -q -x *.htb *.htd
 	if [ -d debian/$(pkg)/usr/share/cain/ ] ; then \
 	    find debian/$(pkg)/usr/share/cain/ -type f -executable -exec chmod 644 {} + ; \
 	fi