Author: tille Date: 2011-11-18 08:52:40 +0000 (Fri, 18 Nov 2011) New Revision: 8603
Modified: trunk/packages/imagej/trunk/debian/changelog trunk/packages/imagej/trunk/debian/copyright trunk/packages/imagej/trunk/debian/imagej.sh Log: New upstream version; applied patch to fix #649119 Modified: trunk/packages/imagej/trunk/debian/changelog =================================================================== --- trunk/packages/imagej/trunk/debian/changelog 2011-11-18 07:49:01 UTC (rev 8602) +++ trunk/packages/imagej/trunk/debian/changelog 2011-11-18 08:52:40 UTC (rev 8603) @@ -1,3 +1,13 @@ +imagej (1.46a-1) unstable; urgency=low + + * New upstream version + * Set may-mem variable (Thanks for the patch to Witold Baryluk + <[email protected]>) + Closes: #649119 + * debian/copyright: DEP5 changes + + -- Andreas Tille <[email protected]> Fri, 18 Nov 2011 09:38:02 +0100 + imagej (1.45k-1) unstable; urgency=low * New upstream version Modified: trunk/packages/imagej/trunk/debian/copyright =================================================================== --- trunk/packages/imagej/trunk/debian/copyright 2011-11-18 07:49:01 UTC (rev 8602) +++ trunk/packages/imagej/trunk/debian/copyright 2011-11-18 08:52:40 UTC (rev 8603) @@ -3,15 +3,8 @@ Source: http://imagej.nih.gov/ij/download/src/ Upstream-Contact: Wayne Rasband <[email protected]>, for the NIH -Files: debian/* -Copyright: © 2006-2007 Paolo Ariano <[email protected]> - © 2008 Paolo Ariano <[email protected]>, Andreas Tille <[email protected]> -License: GPL -X-Comment: On Debian systems, the complete text of the GNU General - Public License can be found in `/usr/share/common-licenses/GPL'. - Files: * -Copyright: © 1999-2008 Wayne Rasband <[email protected]> +Copyright: © 1999-2011 Wayne Rasband <[email protected]> License: Public Domain http://imagej.nih.gov/ij/disclaimer.html says: . @@ -23,3 +16,10 @@ responsibility whatsoever for its use by other parties, and makes no guarantees, expressed or implied, about its quality, reliability, or any other characteristic. + +Files: debian/* +Copyright: © 2006-2008 Paolo Ariano <[email protected]> + © 2008-2011 Andreas Tille <[email protected]> +License: GPL + On Debian systems, the complete text of the GNU General + Public License can be found in `/usr/share/common-licenses/GPL'. Modified: trunk/packages/imagej/trunk/debian/imagej.sh =================================================================== --- trunk/packages/imagej/trunk/debian/imagej.sh 2011-11-18 07:49:01 UTC (rev 8602) +++ trunk/packages/imagej/trunk/debian/imagej.sh 2011-11-18 08:52:40 UTC (rev 8603) @@ -107,7 +107,7 @@ else arch='-d32' java_path="${ij_path}/jre/bin/java" - free_mem=`free | awk 'NR == 2 {fmem=int($2 / 1024); if (fmem < 1800) {print fmem} else {print 1800}}'` + max_mem=`free | awk 'NR == 2 {fmem=int($2 / 1024); if (fmem < 1800) {print fmem} else {print 1800}}'` free_mem=`free | awk 'NR == 3 {fmem=int($4 / 1024); if (fmem < 1800) {print fmem} else {print 1800}}'` mem=${free_mem}/3*2 if (( $mem > $default_mem || $mem < $min_mem )) ; then mem=$default_mem ; fi _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
