[pkg-java] r18071 - trunk/aspectj/debian
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Apr 25 14:39:40 UTC 2014
Author: ebourg-guest
Date: 2014-04-25 14:39:40 +0000 (Fri, 25 Apr 2014)
New Revision: 18071
Added:
trunk/aspectj/debian/orig-tar.sh
Removed:
trunk/aspectj/debian/cvs-get.sh
Modified:
trunk/aspectj/debian/changelog
trunk/aspectj/debian/watch
Log:
Renamed debian/cvs-get.sh to debian/orig-tar.sh and made it work with uscan
debian/watch: Watch the Git tags and download the real source tarball
Use XZ compression for the upstream tarball
Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog 2014-04-25 09:34:33 UTC (rev 18070)
+++ trunk/aspectj/debian/changelog 2014-04-25 14:39:40 UTC (rev 18071)
@@ -5,6 +5,9 @@
- Standards-Version updated to 3.9.5 (no changes)
- Use canonical URLs for the Vcs-* fields
* Switch to debhelper level 9
+ * debian/watch: Watch the Git tags and download the real source tarball
+ * Renamed debian/cvs-get.sh to debian/orig-tar.sh and made it work with uscan
+ * Use XZ compression for the upstream tarball
-- Emmanuel Bourg <ebourg at apache.org> Sat, 15 Mar 2014 22:29:04 +0100
Deleted: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh 2014-04-25 09:34:33 UTC (rev 18070)
+++ trunk/aspectj/debian/cvs-get.sh 2014-04-25 14:39:40 UTC (rev 18071)
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# AspectJ make no source release; so we need to check sources from CVS.
-#
-# This scripts retrieves the version specified in debian/changelog,
-# transforming it into an AspectJ CVS tag. (For instance `1.5.3' is changed to
-# `V1_5_3_final'.) The script then removes stuff we don't need.
-#
-# To keep everything from the checkout invoke this script with `keep'
-#
-set -e
-
-TMPDIR=`mktemp -t -d aspectj-cvs.XXXXXXXXXX` || exit 1
-trap "rm -Rf $TMPDIR" 0
-VERSION=$(dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed "s/-\(.*\)$//")
-TAG="V`echo $VERSION | sed "s/\+dfsg//" | sed "s/~//" | tr . _`"
-ORIGDIR="$TMPDIR/aspectj-$VERSION"
-
-CVSROOT=":pserver:anonymous at dev.eclipse.org:/cvsroot/tools"
-
-echo "retrieving AspectJ sources tagged $TAG"
-mkdir $ORIGDIR || exit 1
-(cd $ORIGDIR && cvs -d $CVSROOT export -r$TAG org.aspectj/modules >/dev/null 2>&1)
-
-if test "a$1" = "akeep"; then
- echo "keeping all files"
-else
- echo "removing unneeded files"
- find $ORIGDIR/org.aspectj -name .cvsignore -delete
-
- # Remove unlicenced files
- find $ORIGDIR/org.aspectj -type d -name "testdata" | xargs rm -rf
- find $ORIGDIR/org.aspectj -type d -name "testsrc" | xargs rm -rf
- rm -rf $ORIGDIR/org.aspectj/modules/tests/
- rm -rf $ORIGDIR/org.aspectj/modules/testing/
- rm -rf $ORIGDIR/org.aspectj/modules/org.aspectj.ajdt.core/scripts/*.py
-
- # Remove non-free docs
- rm -rf $ORIGDIR/org.aspectj/modules/docs/dist/doc/examples
- rm -rf $ORIGDIR/org.aspectj/modules/docs/sandbox/
- rm -rf $ORIGDIR/org.aspectj/modules/docs/teaching/
- rm -rf $ORIGDIR/org.aspectj/modules/docs/test/
- find $ORIGDIR/org.aspectj -type f -name "*.doc" -delete
- find $ORIGDIR/org.aspectj -type f -name "*.pdf" -delete
- find $ORIGDIR/org.aspectj -type f -name "*.ppt" -delete
- find $ORIGDIR/org.aspectj -type f -name "*.vsd" -delete
-
- # We'll use Debian version of these
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/ant
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/junit
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/commons
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/asm
-
- # Keep sources only, rebuild them at package build time
- rm -rf $ORIGDIR/org.aspectj/modules/bcel-builder/
- rm -f $ORIGDIR/org.aspectj/modules/lib/bcel/bcel*.jar
- rm -f $ORIGDIR/org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
- # NOTE:this jar is rebuild after initial bootstrap
- #rm -f $ORIGDIR/org.aspectj/modules/lib/build/build.jar
-
- # Bootstrap using symlink to existing aspectj
- rm -f $ORIGDIR/org.aspectj/modules/lib/aspectj/lib/aspectj*.jar
-
- # The LICENSE.TXT here refers to managementapi-jrockit81.jar which is removed as well
- # See http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/modules/lib/ext/jrockit/LICENSE.TXT?root=Tools_Project&view=co
- (cd $ORIGDIR/org.aspectj/modules/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar jrockit-src.zip)
- rm -f $ORIGDIR/org.aspectj/modules/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
-
- # These ones are not needed
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/docbook
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/jdiff
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/jython
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/regexp
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/saxon
- rm -Rf $ORIGDIR/org.aspectj/modules/lib/test
-fi
-
-echo "generating ../aspectj_$VERSION.orig.tar.gz"
-tar -C $TMPDIR -czf ../aspectj_$VERSION.orig.tar.gz aspectj-$VERSION
Copied: trunk/aspectj/debian/orig-tar.sh (from rev 18070, trunk/aspectj/debian/cvs-get.sh)
===================================================================
--- trunk/aspectj/debian/orig-tar.sh (rev 0)
+++ trunk/aspectj/debian/orig-tar.sh 2014-04-25 14:39:40 UTC (rev 18071)
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# This script is called by uscan and filters out non-free elements
+#
+
+set -e
+
+VERSION=$2
+TAG="`echo $VERSION | tr . _`"
+DIR="org.aspectj-$TAG"
+TAR=../aspectj_$VERSION+dfsg.tar.xz
+
+# Extract the upstream tarball fetched by uscan
+rm -Rf $DIR
+tar -xf $3
+rm $3
+
+find $DIR -name .cvsignore -delete
+find $DIR -name .gitignore -delete
+
+# Remove unlicenced files
+find $DIR -type d -name "testdata" | xargs rm -rf
+find $DIR -type d -name "testsrc" | xargs rm -rf
+rm -rf $DIR/tests/
+rm -rf $DIR/testing/
+rm -rf $DIR/org.aspectj.ajdt.core/scripts/*.py
+
+# Remove non-free docs
+rm -rf $DIR/docs/dist/doc/examples
+rm -rf $DIR/docs/sandbox/
+rm -rf $DIR/docs/teaching/
+rm -rf $DIR/docs/test/
+find $DIR -type f -name "*.doc" -delete
+find $DIR -type f -name "*.pdf" -delete
+find $DIR -type f -name "*.ppt" -delete
+find $DIR -type f -name "*.vsd" -delete
+
+# We'll use Debian version of these
+rm -Rf $DIR/lib/ant
+rm -Rf $DIR/lib/junit
+rm -Rf $DIR/lib/commons
+rm -Rf $DIR/lib/asm
+
+# Keep sources only, rebuild them at package build time
+rm -rf $DIR/bcel-builder/
+rm -f $DIR/lib/bcel/bcel*.jar
+rm -f $DIR/org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
+# NOTE:this jar is rebuild after initial bootstrap
+#rm -f $DIR/lib/build/build.jar
+
+# Bootstrap using symlink to existing aspectj
+rm -f $DIR/lib/aspectj/lib/aspectj*.jar
+
+# The LICENSE.TXT here refers to managementapi-jrockit81.jar which is removed as well
+# See http://dev.eclipse.org/viewcvs/index.cgi/org.aspectj/modules/lib/ext/jrockit/LICENSE.TXT?root=Tools_Project&view=co
+(cd $DIR/lib/ext/jrockit && rm -f jrockit.jar LICENSE.TXT managementapi-jrockit81.jar jrockit-src.zip)
+rm -f $DIR/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
+
+# These ones are not needed
+rm -Rf $DIR/lib/docbook
+rm -Rf $DIR/lib/jdiff
+rm -Rf $DIR/lib/jython
+rm -Rf $DIR/lib/regexp
+rm -Rf $DIR/lib/saxon
+rm -Rf $DIR/lib/test
+
+
+echo "Generating $TAR"
+XZ_OPT=--best tar -cJf $TAR $DIR
+
+rm -Rf $DIR
Modified: trunk/aspectj/debian/watch
===================================================================
--- trunk/aspectj/debian/watch 2014-04-25 09:34:33 UTC (rev 18070)
+++ trunk/aspectj/debian/watch 2014-04-25 14:39:40 UTC (rev 18071)
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\+dfsg// \
-http://www.eclipse.org/aspectj/downloads.php .*/tools/aspectj/aspectj-([\d\.]+).jar
+opts=dversionmangle=s/\+dfsg//,uversionmangle=s/_/./g \
+http://git.eclipse.org/c/aspectj/org.aspectj.git/refs/tags .*org.aspectj-([\d_]+).tar.gz debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list