Author: drazzib-guest
Date: 2009-08-10 23:43:37 +0000 (Mon, 10 Aug 2009)
New Revision: 9929
Modified:
trunk/aspectj/debian/README.source
trunk/aspectj/debian/aspectj-doc.docs
trunk/aspectj/debian/bootstrap.xml
trunk/aspectj/debian/changelog
trunk/aspectj/debian/compat
trunk/aspectj/debian/control
trunk/aspectj/debian/copyright
trunk/aspectj/debian/cvs-get.sh
trunk/aspectj/debian/jar_from_src_zip.xml
trunk/aspectj/debian/rules
trunk/aspectj/debian/watch
Log:
[aspectj]
* Create a DFSG orig tarballs (see debian/README.source and debian/cvs-get.sh)
* debian/watch: mangle debian version to remove "+dfsg"
* Complete review of debian/copyright
* Use Debhelper >= 7
Modified: trunk/aspectj/debian/README.source
===================================================================
--- trunk/aspectj/debian/README.source 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/README.source 2009-08-10 23:43:37 UTC (rev 9929)
@@ -8,16 +8,63 @@
See /usr/share/doc/quilt/README.source for a detailed explanation.
-Building AspectJ from source
-============================
+Original AspectJ tarball repack
+===============================
The shell script cvs-get.sh (or debian/rules get-orig-source) retrieves
-the sources from CVS, and removes binary jars, except:
- * various tests jars
- * empty jars:
- o org.aspectj/modules/build/products/tools/dist/lib/aspectjtools.jar
- o org.aspectj/modules/build/products/tools/dist/lib/aspectjweaver.jar
- o org.aspectj/modules/build/products/tools/dist/lib/aspectjrt.jar
- o org.aspectj/modules/build/products/tools/dist/lib/aspectjlib.jar
- * bootstrap jars (rebuild and overwritten by "bootstrap" target):
- o org.aspectj/modules/lib/build/build.jar
+the sources from CVS and apply the following rules:
+
+Remove
+------
+Remove unlicenced files:
+ * all "testsrc" and "testdata" from orig tarball
+ * org.aspectj/modules/tests/
+ * org.aspectj/modules/testing/
+ * org.aspectj/modules/docs/test/
+ * org.aspectj/org.aspectj.ajdt.core/scripts/*.py
+
+Remove non-free docs:
+ * org.aspectj/modules/docs/dist/doc/examples
+ * org.aspectj/modules/docs/sandbox/
+ * org.aspectj/modules/docs/teaching/
+ * all *.ppt/*.vsd/*.doc/*.pdf binary files
+
+Remove binary libs : #1 we use Debian version of them
+ * org.aspectj/modules/lib/ant
+ * org.aspectj/modules/lib/junit
+ * org.aspectj/modules/lib/commons
+ * org.aspectj/modules/lib/asm
+
+Remove binary libs : #2 rebuild them during "bootstrap" target
+(see bootstrap.xml)
+ * org.aspectj/modules/bcel-builder/
+ * org.aspectj/modules/lib/bcel/bcel*.jar
+ * org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj*.jar
+
+Remove binary libs : #3 uneeded
+ * org.aspectj/modules/lib/docbook
+ * org.aspectj/modules/lib/jdiff
+ * org.aspectj/modules/lib/jython
+ * org.aspectj/modules/lib/regexp
+ * org.aspectj/modules/lib/saxon
+ * org.aspectj/modules/lib/test
+
+Remove binary copy of AspectJ (bootstrap using symlink to existing aspectj):
+ * org.aspectj/modules/lib/aspectj/lib/aspectj*.jar
+
+Remove (JRockit is non-free JVM):
+ * org.aspectj/modules/lib/ext/jrockit
+ *
org.aspectj/modules/loadtime/src/org/aspectj/weaver/loadtime/JRockitAgent.java
+
+
+Keep
+------
+Empty jars (needed by upstream build but made empty):
+ * org.aspectj/modules/build/products/tools/dist/lib/org.aspectj.matcher.jar
+ * org.aspectj/modules/build/products/tools/dist/lib/aspectjweaver.jar
+ * org.aspectj/modules/build/products/tools/dist/lib/aspectjtools.jar
+ * org.aspectj/modules/build/products/tools/dist/lib/aspectjrt.jar
+
+Bootstrap jars (rebuild and overwritten during "bootstrap" target):
+(see bootstrap.xml)
+ * org.aspectj/modules/lib/build/build.jar
Modified: trunk/aspectj/debian/aspectj-doc.docs
===================================================================
--- trunk/aspectj/debian/aspectj-doc.docs 2009-08-10 22:25:31 UTC (rev
9928)
+++ trunk/aspectj/debian/aspectj-doc.docs 2009-08-10 23:43:37 UTC (rev
9929)
@@ -2,7 +2,6 @@
org.aspectj/modules/aj-build/dist/docs/doc/devguide
org.aspectj/modules/aj-build/dist/docs/doc/progguide
org.aspectj/modules/aj-build/dist/docs/doc/pdguide
-org.aspectj/modules/aj-build/dist/docs/doc/examples
org.aspectj/modules/aj-build/dist/docs/doc/adk15notebook
org.aspectj/modules/aj-build/dist/docs/doc/aspectj5rt-api
org.aspectj/modules/aj-build/dist/docs/doc/runtime-api
Modified: trunk/aspectj/debian/bootstrap.xml
===================================================================
--- trunk/aspectj/debian/bootstrap.xml 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/bootstrap.xml 2009-08-10 23:43:37 UTC (rev 9929)
@@ -10,8 +10,8 @@
</ant>
<ant antfile="debian/jar_from_src_zip.xml" target="clean">
- <property name="module.dir" value="org.aspectj/modules/lib/ext/jrockit"/>
- <property name="module.name" value="jrockit"/>
+ <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
+ <property name="module.name" value="bcel-verifier"/>
</ant>
<ant antfile="debian/jar_from_src_zip.xml" target="clean">
@@ -21,7 +21,10 @@
</target>
<target name="all">
- <!-- rebuild bcel jar ... -->
+ <!--
+ Build org.aspectj/modules/lib/bcel/bcel.jar
+ from org.aspectj/modules/lib/bcel/bcel-src.zip
+ -->
<ant antfile="debian/jar_from_src_zip.xml">
<property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
<property name="module.name" value="bcel"/>
@@ -29,17 +32,23 @@
<target name="compile"/>
<target name="jar"/>
</ant>
-
- <!-- ... and jrockit -->
+
+ <!--
+ Build org.aspectj/modules/lib/bcel/bcel-verifier.jar
+ from org.aspectj/modules/lib/bcel/bcel-verifier-src.zip
+ -->
<ant antfile="debian/jar_from_src_zip.xml">
- <property name="module.dir" value="org.aspectj/modules/lib/ext/jrockit"/>
- <property name="module.name" value="jrockit"/>
- <property name="module.srcdeps"
value="org.aspectj/modules/loadtime/testsrc"/>
+ <property name="module.dir" value="org.aspectj/modules/lib/bcel"/>
+ <property name="module.name" value="bcel-verifier"/>
+ <property name="module.deps"
value="org.aspectj/modules/lib/bcel/bcel.jar:/usr/share/java/regexp.jar"/>
<target name="compile"/>
<target name="jar"/>
</ant>
- <!-- rebuild jdtcore with aspect -->
+ <!--
+ Build org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
+ from
org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
+ -->
<path id="classpath.jdtcore">
<fileset dir="/usr/lib/eclipse/plugins/">
<include name="org.eclipse.osgi_*.jar"/>
@@ -69,7 +78,10 @@
<target name="jar-aj"/>
</ant>
- <!-- rebuild and overwrite build.jar -->
+ <!--
+ Rebuild and overwrite org.aspectj/modules/lib/build/build.jar
+ from org.aspectj/modules/build/**/*.java
+ -->
<ant antfile="build.xml"
dir="org.aspectj/modules/build"
target="build"/>
Modified: trunk/aspectj/debian/changelog
===================================================================
--- trunk/aspectj/debian/changelog 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/changelog 2009-08-10 23:43:37 UTC (rev 9929)
@@ -1,8 +1,8 @@
-aspectj (1.6.5-1) unstable; urgency=low
+aspectj (1.6.5+dfsg-1) unstable; urgency=low
[ Thomas Girard ]
* Move to main. Closes: #480132.
- * Build-depend on openjdk-6.
+ * Build-Depend on default-jdk.
[ Damien Raude-Morvan ]
* Add myself to Uploaders
@@ -20,9 +20,13 @@
Build-Depends on aspectj
- Rebuild and overwrite build.jar
* New 05_build_classpath patch to build AJDT
- * Add Build-Depends on libasm3-java, eclipse-platform, gjdoc and lynx-cur
+ * Add Build-Depends on libasm3-java, eclipse-platform, gjdoc and html2text
+ * Create a DFSG orig tarballs (see debian/README.source and
debian/cvs-get.sh)
+ * debian/watch: mangle debian version to remove "+dfsg"
+ * Complete review of debian/copyright
+ * Use Debhelper >= 7
- -- Damien Raude-Morvan <[email protected]> Sun, 26 Jul 2009 23:56:53 +0200
+ -- Damien Raude-Morvan <[email protected]> Mon, 10 Aug 2009 20:03:20 +0200
aspectj (1.5.4-1) unstable; urgency=low
Modified: trunk/aspectj/debian/compat
===================================================================
--- trunk/aspectj/debian/compat 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/compat 2009-08-10 23:43:37 UTC (rev 9929)
@@ -1 +1 @@
-5
+7
Modified: trunk/aspectj/debian/control
===================================================================
--- trunk/aspectj/debian/control 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/control 2009-08-10 23:43:37 UTC (rev 9929)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java maintainers
<[email protected]>
Uploaders: Thomas Girard <[email protected]>, Michael Koch
<[email protected]>, Damien Raude-Morvan <[email protected]>
-Build-Depends: debhelper (>> 5), openjdk-6-jdk, ant, ant-optional, cdbs, quilt
+Build-Depends: debhelper (>= 7), default-jdk, ant, ant-optional, cdbs, quilt
Build-Depends-Indep: libxalan2-java, libcommons-logging-java, libregexp-java,
docbook-xml, docbook-xsl, xsltproc, docbook-to-man,
- junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, gjdoc,
lynx-cur
+ junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, gjdoc,
html2text
Standards-Version: 3.8.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj/
Modified: trunk/aspectj/debian/copyright
===================================================================
--- trunk/aspectj/debian/copyright 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/copyright 2009-08-10 23:43:37 UTC (rev 9929)
@@ -7,18 +7,48 @@
using the script debian/cvs-get.sh.
Authors:
- Contributors
+ Adrian Colyer <[email protected]>
+ Alexandre Vasseur <[email protected]>
+ Andrew Clement (aka Andy Clement) <[email protected]>
+ Andrew Huff <[email protected]>
+ David Knibb <[email protected]>
+ Erik Hilsdale <[email protected]>
+ George Harley <[email protected]>
+ Helen Hawkins <hawkins.ibm.com>
+ Jim Hugunin <[email protected]>
+ Linton Ye <[email protected]>
+ Matthew Webster <[email protected]>
+ Martin Lippert <[email protected]>
+ Mik Kersten <[email protected]>
+ Ron Bodkin <[email protected]>
+ Weston Isberg <[email protected]>
Copyright Holders:
1997-2002 Xerox Corporation
1998-2002 Palo Alto Research Center, Incorporated (PARC)
2000-2006 IBM Corporation and others
- 2002-2006 Contributors
- 2000-2005 INRIA, France Telecom
- 2005 John D. Heintz
- 2001-2002 The Apache Software Foundation
+ 2001-2002 The Apache Software Foundation (for BCEL source code)
+ 2005-2008 Adrian Colyer
+ 2005-2008 Alexandre Vasseur
+ 2002-2009 Andrew Clement (aka Andy Clement)
+ 2005 Andrew Huff
+ 2005 David Knibb
+ 2002 Erik Hilsdale
+ 2003-2005 George Harley
+ 2003-2007 Helen Hawkins
+ 2004-2006 Jim Hugunin
+ 2007 Linton Ye
+ 2005-2006 Matthew Webster
+ 2004 Martin Lippert
+ 2003,2005 Mik Kersten
+ 2002,2005 Ron Bodkin
+ 2003-2005 Weston Isberg
-License (AspectJ):
+License applicable to "AspectJ"
+(all files in org.aspectj/modules/)
+and to "modified JDT Core for AspectJ"
+(org.aspectj/modules/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip):
+
Eclipse Public License - v 1.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -236,37 +266,10 @@
a jury trial in any resulting litigation.
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
+License applicable to "modified BCEL for AspectJ"
+(in org.aspectj/modules/lib/bcel/bcel-src.zip
+and org.aspectj/modules/lib/bcel/bcel-verifier-src.zip):
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
-
-License (bcel):
The Apache Software License, Version 1.1
Copyright (c) 2001 The Apache Software Foundation. All rights
Modified: trunk/aspectj/debian/cvs-get.sh
===================================================================
--- trunk/aspectj/debian/cvs-get.sh 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/cvs-get.sh 2009-08-10 23:43:37 UTC (rev 9929)
@@ -12,9 +12,8 @@
TMPDIR=`mktemp -t -d aspectj-cvs.XXXXXXXXXX` || exit 1
trap "rm -Rf $TMPDIR" 0
-
-VERSION=`head -1 debian/changelog | cut -d ' ' -f 2 | sed -e
's#(\([^-]\+\)-.*)#\1#'`
-TAG="V`echo $VERSION | tr . _`"
+VERSION=$(dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed
"s/-\(.*\)$//")
+TAG="V`echo $VERSION | sed "s/\+dfsg//" | tr . _`"
ORIGDIR="$TMPDIR/aspectj-$VERSION"
CVSROOT=":pserver:[email protected]:/cvsroot/tools"
@@ -28,8 +27,23 @@
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
@@ -38,9 +52,10 @@
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
- # this jar is rebuild after initial bootstrap
+ # NOTE:this jar is rebuild after initial bootstrap
#rm -f $ORIGDIR/org.aspectj/modules/lib/build/build.jar
# Bootstrap using symlink to existing aspectj
@@ -48,7 +63,8 @@
# 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)
+ (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
@@ -57,9 +73,6 @@
rm -Rf $ORIGDIR/org.aspectj/modules/lib/regexp
rm -Rf $ORIGDIR/org.aspectj/modules/lib/saxon
rm -Rf $ORIGDIR/org.aspectj/modules/lib/test
- rm -f $ORIGDIR/org.aspectj/modules/docs/sandbox/aopalliance/aopalliance.jar
- rm -f
$ORIGDIR/org.aspectj/modules/docs/sandbox/aopalliance/lib/aj-aopalliance.jar
- rm -f $ORIGDIR/org.aspectj/modules/docs/teaching/exercises/junit.jar
fi
echo "generating ../aspectj_$VERSION.orig.tar.gz"
Modified: trunk/aspectj/debian/jar_from_src_zip.xml
===================================================================
--- trunk/aspectj/debian/jar_from_src_zip.xml 2009-08-10 22:25:31 UTC (rev
9928)
+++ trunk/aspectj/debian/jar_from_src_zip.xml 2009-08-10 23:43:37 UTC (rev
9929)
@@ -2,8 +2,8 @@
<!-- Written by Thomas Girard <[email protected]> -->
<!-- and Damien Raude-Morvan <[email protected]> for Debian -->
<project name="jar-from-src-zip" default="jar" basedir="..">
- <property name="src.dir" location="${module.dir}/extracted"/>
- <property name="bin.dir" location="${module.dir}/classes"/>
+ <property name="src.dir" location="${module.dir}/${module.name}-extracted"/>
+ <property name="bin.dir" location="${module.dir}/${module.name}-classes"/>
<property name="src.jar" location="${module.dir}/${module.name}-src.zip"/>
<property name="bin.jar" location="${module.dir}/${module.name}.jar"/>
@@ -42,7 +42,7 @@
<target name="extract" depends="checkExtracted" unless="extract.notRequired">
<delete dir="${src.dir}" quiet="true"/>
- <mkdir dir="${src.dir}"/>
+ <mkdir dir="${src.dir}"/>
<unzip src="${src.jar}" dest="${src.dir}"/>
</target>
Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/rules 2009-08-10 23:43:37 UTC (rev 9929)
@@ -4,11 +4,10 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := /usr/lib/jvm/default-java
MODULES := org.aspectj/modules
DEB_BUILDDIR = $(MODULES)/build
DEB_ANT_BUILD_TARGET = aspectj
-DEB_ANT_CHECK_TARGET = test
DEB_JARS = xalan2 ant-junit
DEB_COMPRESS_EXCLUDE = .pdf .java .xml
@@ -115,7 +114,7 @@
install/aspectj-doc::
mv org.aspectj/modules/docs/dist/doc/changes.html
org.aspectj/modules/docs/dist/doc/changelog.html
- lynx -dump -nolist org.aspectj/modules/docs/dist/doc/changelog.html >
org.aspectj/modules/docs/dist/doc/changelog.txt
+ html2text -o org.aspectj/modules/docs/dist/doc/changelog.txt
org.aspectj/modules/docs/dist/doc/changelog.html
dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.html
dh_installchangelogs org.aspectj/modules/docs/dist/doc/changelog.txt
Modified: trunk/aspectj/debian/watch
===================================================================
--- trunk/aspectj/debian/watch 2009-08-10 22:25:31 UTC (rev 9928)
+++ trunk/aspectj/debian/watch 2009-08-10 23:43:37 UTC (rev 9929)
@@ -1,2 +1,3 @@
version=3
+opts=dversionmangle=s/\+dfsg// \
http://www.eclipse.org/aspectj/downloads.php
.*/tools/aspectj/aspectj-([\d\.]+).jar
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
