[med-svn] r16449 - in trunk/packages/cytoscape/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-03-16 20:44:14 +0000 (Sun, 16 Mar 2014)
New Revision: 16449

Modified:
   trunk/packages/cytoscape/trunk/debian/changelog
   trunk/packages/cytoscape/trunk/debian/get-orig-source
   trunk/packages/cytoscape/trunk/debian/patches/MPL.patch
   trunk/packages/cytoscape/trunk/debian/patches/shell.patch
Log:
New upstream versio, updated patches


Modified: trunk/packages/cytoscape/trunk/debian/changelog
===================================================================
--- trunk/packages/cytoscape/trunk/debian/changelog	2014-03-15 20:36:41 UTC (rev 16448)
+++ trunk/packages/cytoscape/trunk/debian/changelog	2014-03-16 20:44:14 UTC (rev 16449)
@@ -1,4 +1,4 @@
-cytoscape (2.8.4-1) UNRELEASED; urgency=low
+cytoscape (3.1.0-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #465331).
 

Modified: trunk/packages/cytoscape/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/cytoscape/trunk/debian/get-orig-source	2014-03-15 20:36:41 UTC (rev 16448)
+++ trunk/packages/cytoscape/trunk/debian/get-orig-source	2014-03-16 20:44:14 UTC (rev 16449)
@@ -4,6 +4,7 @@
 set -e
 NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
 ORIGNAME=cytoscape
+COMPRESSION=xz
 
 if ! echo $@ | grep -q upstream-version ; then
     VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
@@ -23,7 +24,7 @@
 mkdir -p ../tarballs
 cd ../tarballs
 # svn export conserves time stamps of the files, checkout does not
-LC_ALL=C svn export http://chianti.ucsd.edu/svn/cytoscape/trunk ${TARDIR}
+LC_ALL=C svn  --quiet export http://chianti.ucsd.edu/svn/cytoscape/trunk ${TARDIR}
 
-GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION".orig.tar.gz "${TARDIR}"
+GZIP="--best --no-name" XZ_OPT="-6v" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESSION} "${TARDIR}"
 rm -rf "${NAME}"-"$VERSION"

Modified: trunk/packages/cytoscape/trunk/debian/patches/MPL.patch
===================================================================
--- trunk/packages/cytoscape/trunk/debian/patches/MPL.patch	2014-03-15 20:36:41 UTC (rev 16448)
+++ trunk/packages/cytoscape/trunk/debian/patches/MPL.patch	2014-03-16 20:44:14 UTC (rev 16449)
@@ -1,16 +1,9 @@
 Description: added the text for the Mozilla Public License
- .
 Author: Ivo Maintz <ivo at maintz.de>
+Last-Update: 2013-02-01
 
----
-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:
-
-Last-Update: <2013-02-01>
-
 --- /dev/null
-+++ cytoscape-2.8.4distribution/src/main/licenses/MOZILLA_PUBLIC_LICENSE.txt
++++ b/src/main/licenses/MOZILLA_PUBLIC_LICENSE.txt
 @@ -0,0 +1,373 @@
 +Mozilla Public License Version 2.0
 +==================================

Modified: trunk/packages/cytoscape/trunk/debian/patches/shell.patch
===================================================================
--- trunk/packages/cytoscape/trunk/debian/patches/shell.patch	2014-03-15 20:36:41 UTC (rev 16448)
+++ trunk/packages/cytoscape/trunk/debian/patches/shell.patch	2014-03-16 20:44:14 UTC (rev 16449)
@@ -1,16 +1,9 @@
 Description: repaired the handling of a softlinked startup script
- .
 Author: Ivo Maintz <ivo at maintz.de>
+Last-Update: 2013-02-01
 
----
-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:
-
-Last-Update: <2013-02-01>
-
---- cytoscape-2.8.4.orig/distribution/src/main/bin/cytoscape.sh
-+++ cytoscape-2.8.4/distribution/src/main/bin/cytoscape.sh
+--- a/distribution/src/main/bin/cytoscape.sh
++++ b/distribution/src/main/bin/cytoscape.sh
 @@ -4,10 +4,7 @@
  # This script is a UNIX-only (i.e. Linux, Mac OS, etc.) version
  #-------------------------------------------------------------------------------