Author: tille
Date: 2011-12-05 21:29:26 +0000 (Mon, 05 Dec 2011)
New Revision: 8772
Added:
trunk/packages/ensembl/ensembl/trunk/debian/get-orig-source
Removed:
trunk/packages/ensembl/ensembl/trunk/debian/prepare_ensembl_source_packages.sh
Modified:
trunk/packages/ensembl/ensembl/trunk/debian/changelog
trunk/packages/ensembl/ensembl/trunk/debian/rules
Log:
New upstream version was just released
Modified: trunk/packages/ensembl/ensembl/trunk/debian/changelog
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/changelog 2011-12-05
21:06:15 UTC (rev 8771)
+++ trunk/packages/ensembl/ensembl/trunk/debian/changelog 2011-12-05
21:29:26 UTC (rev 8772)
@@ -1,4 +1,4 @@
-ensembl (64-1) UNRELEASED; urgency=low
+ensembl (65-1) UNRELEASED; urgency=low
* New upstream release
* debian/control:
@@ -20,6 +20,8 @@
issues
* ensembl.dirs: Do not create directories in /var/tmp which are created
in postinst anyway
+ * rename debian/prepare_ensembl_source_packages.sh to get-orig-source
+ to comply with other packages
-- Andreas Tille <[email protected]> Wed, 30 Nov 2011 13:30:15 +0100
Added: trunk/packages/ensembl/ensembl/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/get-orig-source
(rev 0)
+++ trunk/packages/ensembl/ensembl/trunk/debian/get-orig-source 2011-12-05
21:29:26 UTC (rev 8772)
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# bail out upon error
+set -e
+
+FORCE_ENSEMBL_VERSION=64
+destdir=`pwd`/../tarballs
+ensemblversion=""
+
+PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
+
+if [ -d debian ]; then
+ echo "I: Found debian directory, retrieving Ensembl version from
debian/changelog"
+ if ! echo $@ | grep -q upstream-version ; then
+ # if called manually run uscan to obtain file and version number
+ # ensemblversion=`dpkg-parsechangelog | awk '/^Version:/ { print $2
}' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
+ ensemblversion=`uscan --verbose --force-download | \
+ grep "Newest version on remote site is .* local version is .*"
| \
+ head -n 1 | \
+ sed "s/Newest version on remote site is \([-0-9.]\+\),.*/\1/"`
+ # remove fake download file again
+ rm -f ../release-$ensemblversion
+ else
+ # If called by uscan
+ ensemblversion=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\)
.*${PKG}.*?\1?"`
+ if echo "$ensemblversion" | grep -q "upstream-version" ; then
+ echo "Unable to parse version number"
+ exit
+ fi
+ fi
+fi
+
+# All libraries must be of the same version - update them all or none
+if [ -z "$ensemblversion" ]; then
+ echo "W: Ensembl version previously unset, setting to
'$FORCE_ENSEMBL_VERSION'."
+ ensemblversion=$FORCE_ENSEMBL_VERSION
+fi
+
+downloaddir="$destdir/ensembl-$ensemblversion"
+mkdir -p "$downloaddir"
+cd "$downloaddir"
+
+export CVSROOT=":pserver:[email protected]:/cvsroot/ensembl"
+
+echo " * Logging in to Sanger CVS, type password CVSUSER"
+cvs login
+
+for package in ensembl-api ensembl-website
+do
+ echo "I: Performing checkout of $package"
+ if [ -d "$dname" ]; then
+ echo "W: Skipping fetch of package '$dname', directory is
already existing."
+ #(cd $i && cvs -z 3 update .)
+ else
+ cvs -z 3 checkout -r branch-ensembl-${ensemblversion}
${package} > /dev/null 2> /dev/null
+ fi
+ echo
+done
+
+# set -x
+find . -name CVS -a -type d | xargs -r rm -rf
+find . -name .cvsignore -type f -delete
+
+# Removing a series of files for better DFSG compliance
+find . -name "*.pdf" | grep -v ComparaTutorial | xargs -r rm
+rm -f ensembl-compara/scripts/synteny/BuildSynteny.jar
+# jalview is now in Debian and can be removed from the source tree
+rm -rf htdocs/jalview
+
+cd "$destdir"
+GZIP="--best --no-name" tar czf ensembl_${ensemblversion}.orig.tar.gz
ensembl-$ensemblversion
Deleted:
trunk/packages/ensembl/ensembl/trunk/debian/prepare_ensembl_source_packages.sh
===================================================================
---
trunk/packages/ensembl/ensembl/trunk/debian/prepare_ensembl_source_packages.sh
2011-12-05 21:06:15 UTC (rev 8771)
+++
trunk/packages/ensembl/ensembl/trunk/debian/prepare_ensembl_source_packages.sh
2011-12-05 21:29:26 UTC (rev 8772)
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# bail out upon error
-set -e
-
-FORCE_ENSEMBL_VERSION=64
-destdir=`pwd`/../tarballs
-ensemblversion=""
-
-PKG=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
-
-if [ -d debian ]; then
- echo "I: Found debian directory, retrieving Ensembl version from
debian/changelog"
- if ! echo $@ | grep -q upstream-version ; then
- # if called manually run uscan to obtain file and version number
- # ensemblversion=`dpkg-parsechangelog | awk '/^Version:/ { print $2
}' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
- ensemblversion=`uscan --verbose --force-download | \
- grep "Newest version on remote site is .* local version is .*"
| \
- head -n 1 | \
- sed "s/Newest version on remote site is \([-0-9.]\+\),.*/\1/"`
- # remove fake download file again
- rm -f ../release-$ensemblversion
- else
- # If called by uscan
- ensemblversion=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\)
.*${PKG}.*?\1?"`
- if echo "$ensemblversion" | grep -q "upstream-version" ; then
- echo "Unable to parse version number"
- exit
- fi
- fi
-fi
-
-# All libraries must be of the same version - update them all or none
-if [ -z "$ensemblversion" ]; then
- echo "W: Ensembl version previously unset, setting to
'$FORCE_ENSEMBL_VERSION'."
- ensemblversion=$FORCE_ENSEMBL_VERSION
-fi
-
-downloaddir="$destdir/ensembl-$ensemblversion"
-mkdir -p "$downloaddir"
-cd "$downloaddir"
-
-export CVSROOT=":pserver:[email protected]:/cvsroot/ensembl"
-
-echo " * Logging in to Sanger CVS, type password CVSUSER"
-cvs login
-
-for package in ensembl-api ensembl-website
-do
- echo "I: Performing checkout of $package"
- if [ -d "$dname" ]; then
- echo "W: Skipping fetch of package '$dname', directory is
already existing."
- #(cd $i && cvs -z 3 update .)
- else
- cvs -z 3 checkout -r branch-ensembl-${ensemblversion}
${package} > /dev/null 2> /dev/null
- fi
- echo
-done
-
-# set -x
-find . -name CVS -a -type d | xargs -r rm -rf
-find . -name .cvsignore -type f -delete
-
-# Removing a series of files for better DFSG compliance
-find . -name "*.pdf" | grep -v ComparaTutorial | xargs -r rm
-rm -f ensembl-compara/scripts/synteny/BuildSynteny.jar
-# jalview is now in Debian and can be removed from the source tree
-rm -rf htdocs/jalview
-
-cd "$destdir"
-GZIP="--best --no-name" tar czf ensembl_${ensemblversion}.orig.tar.gz
ensembl-$ensemblversion
Modified: trunk/packages/ensembl/ensembl/trunk/debian/rules
===================================================================
--- trunk/packages/ensembl/ensembl/trunk/debian/rules 2011-12-05 21:06:15 UTC
(rev 8771)
+++ trunk/packages/ensembl/ensembl/trunk/debian/rules 2011-12-05 21:29:26 UTC
(rev 8772)
@@ -110,7 +110,7 @@
configure-stamp
get-orig-source:
- ./debian/prepare_ensembl_source_packages.sh
+ . debian/get-orig-source
# To update po files as recommended in po-debconf(7)
debian/po/templates.pot: debian/ensembl.templates
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
