Author: twerner
Date: 2008-11-19 07:44:07 +0000 (Wed, 19 Nov 2008)
New Revision: 7387
Added:
trunk/libjboss-buildmagic-java/debian/patches/
trunk/libjboss-buildmagic-java/debian/patches/ant.diff
trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
trunk/libjboss-buildmagic-java/debian/patches/series
trunk/libjboss-buildmagic-java/debian/watch
Modified:
trunk/libjboss-buildmagic-java/debian/ant.properties
trunk/libjboss-buildmagic-java/debian/build.xml
trunk/libjboss-buildmagic-java/debian/changelog
trunk/libjboss-buildmagic-java/debian/control
trunk/libjboss-buildmagic-java/debian/copyright
trunk/libjboss-buildmagic-java/debian/orig-tar.sh
trunk/libjboss-buildmagic-java/debian/rules
Log:
switch to version 2.0.1
Modified: trunk/libjboss-buildmagic-java/debian/ant.properties
===================================================================
--- trunk/libjboss-buildmagic-java/debian/ant.properties 2008-11-19
06:31:42 UTC (rev 7386)
+++ trunk/libjboss-buildmagic-java/debian/ant.properties 2008-11-19
07:44:07 UTC (rev 7387)
@@ -1 +1 @@
-project.name=jboss-build
+project.name=jboss-buildmagic
Modified: trunk/libjboss-buildmagic-java/debian/build.xml
===================================================================
--- trunk/libjboss-buildmagic-java/debian/build.xml 2008-11-19 06:31:42 UTC
(rev 7386)
+++ trunk/libjboss-buildmagic-java/debian/build.xml 2008-11-19 07:44:07 UTC
(rev 7387)
@@ -3,13 +3,13 @@
<project default="jar" name="${project.name}" basedir="..">
<target name="clean">
- <ant dir="jbossbuild" target="clean"/>
- <ant dir="buildmagic/tasks" target="clean"/>
+ <ant dir="common" target="clean"/>
+ <ant dir="tasks" target="clean"/>
</target>
<target name="jar" description="o Create the jars">
- <ant dir="jbossbuild"/>
- <ant dir="buildmagic/tasks"/>
+ <ant dir="common"/>
+ <ant dir="tasks"/>
</target>
</project>
Modified: trunk/libjboss-buildmagic-java/debian/changelog
===================================================================
--- trunk/libjboss-buildmagic-java/debian/changelog 2008-11-19 06:31:42 UTC
(rev 7386)
+++ trunk/libjboss-buildmagic-java/debian/changelog 2008-11-19 07:44:07 UTC
(rev 7387)
@@ -1,5 +1,5 @@
-libjboss-build-java (20071201-1) unstable; urgency=low
+libjboss-buildmagic-java (2.0.1-1) unstable; urgency=low
* initial version (Closes: #385500)
- -- Torsten Werner <[EMAIL PROTECTED]> Sat, 01 Dec 2007 12:23:34 +0100
+ -- Torsten Werner <[EMAIL PROTECTED]> Wed, 19 Nov 2008 07:33:15 +0100
Modified: trunk/libjboss-buildmagic-java/debian/control
===================================================================
--- trunk/libjboss-buildmagic-java/debian/control 2008-11-19 06:31:42 UTC
(rev 7386)
+++ trunk/libjboss-buildmagic-java/debian/control 2008-11-19 07:44:07 UTC
(rev 7387)
@@ -1,16 +1,17 @@
-Source: libjboss-build-java
+Source: libjboss-buildmagic-java
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Torsten Werner <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev, junit4,
- libjboss-common-java
-Standards-Version: 3.7.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-build-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-build-java
+Build-Depends: debhelper (>= 5), cdbs, quilt, libxerces2-java, junit4
+Build-Depends-Indep: ant, default-jdk
+Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-buildmagic-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-buildmagic-java
-Package: libjboss-build-java
+Package: libjboss-buildmagic-java
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
-Description: FIXME
+Depends: ${misc:Depends}, default-java | java2-runtime
+Description: JBoss buildmagic module
+ This package ships the buildmagic common and tasks module which is needed to
+ build the JBoss application server.
Modified: trunk/libjboss-buildmagic-java/debian/copyright
===================================================================
--- trunk/libjboss-buildmagic-java/debian/copyright 2008-11-19 06:31:42 UTC
(rev 7386)
+++ trunk/libjboss-buildmagic-java/debian/copyright 2008-11-19 07:44:07 UTC
(rev 7387)
@@ -1,12 +1,24 @@
-FIXME
This package was debianized by Torsten Werner <[EMAIL PROTECTED]> on
-Mon, 26 Nov 2007 16:31:34 +0100.
+Wed Nov 19 07:35:18 CET 2008.
-It was downloaded from http://www.picocontainer.org
+It was downloaded from
+<http://anonsvn.labs.jboss.com/labs/jbossbuild/buildmagic/>.
-Upstream Authors: Paul Hammant, Konstantin Pribluda, Jörg Schaible,
-Mauro Talevi, Michael Ward, Michael Rimov, Jose Peleteiro
+Copyright: (C) 2005-2007 JBoss Inc.
+ (C) 2008 Red Hat Middleware, LLC. All rights reserved.
-Picocontainer is licensed under the BSD license which can be found in
-/usr/share/common-licenses/BSD on Debian GNU/Linux systems.
+License:
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+On Debian systems, full text of the LGPL license can be found at
+`/usr/share/common-licenses/LGPL-2.1'.
+
+MORE FIXME
Modified: trunk/libjboss-buildmagic-java/debian/orig-tar.sh
===================================================================
--- trunk/libjboss-buildmagic-java/debian/orig-tar.sh 2008-11-19 06:31:42 UTC
(rev 7386)
+++ trunk/libjboss-buildmagic-java/debian/orig-tar.sh 2008-11-19 07:44:07 UTC
(rev 7387)
@@ -1,17 +1,12 @@
#!/bin/sh -e
-VERSION=$(dpkg-parsechangelog | sed -ne 's,^Version: \(.*\)-.*,\1,p')
-SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p')
-DIR=${SOURCE}-${VERSION}
-TAR=../${SOURCE}_${VERSION}.orig.tar.gz
+DIR=buildmagic-$2
+TAR=../libjboss-buildmagic-java_$2.orig.tar.gz
-export CVSROOT=:pserver:[EMAIL PROTECTED]:/cvsroot/jboss
-mkdir $DIR
-(cd $DIR &&
- cvs export -D $VERSION buildmagic &&
- cvs export -D $VERSION jbossbuild)
-tar -c -z -f $TAR --exclude '*.class' --exclude '*.jar' $DIR
-rm -rf $DIR
+# clean up the upstream tarball
+svn export http://anonsvn.labs.jboss.com/labs/jbossbuild/buildmagic/tags/$DIR
$DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR $3
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
@@ -20,4 +15,3 @@
echo "moved $TAR to $origDir"
fi
-exit 0
Added: trunk/libjboss-buildmagic-java/debian/patches/ant.diff
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/ant.diff
(rev 0)
+++ trunk/libjboss-buildmagic-java/debian/patches/ant.diff 2008-11-19
07:44:07 UTC (rev 7387)
@@ -0,0 +1,21 @@
+Index: libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/buildmagic.ent
+===================================================================
+--- libjboss-buildmagic-java-2.0.1.orig/tools/etc/buildmagic/buildmagic.ent
2008-11-19 08:07:46.000000000 +0100
++++ libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/buildmagic.ent
2008-11-19 08:08:06.000000000 +0100
+@@ -10,6 +10,7 @@
+ <!-- Make sure we have the right version of Ant -->
+ <property name="buildmagic.ant15.baseversion" value="1.5"/>
+ <property name="buildmagic.ant16.baseversion" value="1.6"/>
++ <property name="buildmagic.ant17.baseversion" value="1.7"/>
+
+ <!--
+ | Add new conditions for other supported Ant versions when they
+@@ -22,6 +23,8 @@
+ substring="Ant version ${buildmagic.ant15.baseversion}"/>
+ <contains string="${ant.version}"
+ substring="Ant version ${buildmagic.ant16.baseversion}"/>
++ <contains string="${ant.version}"
++ substring="Ant version ${buildmagic.ant17.baseversion}"/>
+ </or>
+ </condition>
+
Added: trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
(rev 0)
+++ trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
2008-11-19 07:44:07 UTC (rev 7387)
@@ -0,0 +1,13 @@
+Index: libjboss-buildmagic-java-2.0.1/tasks/build.xml
+===================================================================
+--- libjboss-buildmagic-java-2.0.1.orig/tasks/build.xml 2008-11-19
08:14:21.000000000 +0100
++++ libjboss-buildmagic-java-2.0.1/tasks/build.xml 2008-11-19
08:19:15.000000000 +0100
+@@ -75,8 +75,6 @@
+ version="1.2.4"/>
+ <dependency groupId="bsf" artifactId="bsf"
+ version="2.2" />
+- <dependency groupId="jboss" artifactId="jboss-common"
+- version="1.0.3.GA" />
+ </artifact:dependencies>
+
+ <!--<dependency-manager
Added: trunk/libjboss-buildmagic-java/debian/patches/series
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/series
(rev 0)
+++ trunk/libjboss-buildmagic-java/debian/patches/series 2008-11-19
07:44:07 UTC (rev 7387)
@@ -0,0 +1,2 @@
+ant.diff
+no-common.diff
Modified: trunk/libjboss-buildmagic-java/debian/rules
===================================================================
--- trunk/libjboss-buildmagic-java/debian/rules 2008-11-19 06:31:42 UTC (rev
7386)
+++ trunk/libjboss-buildmagic-java/debian/rules 2008-11-19 07:44:07 UTC (rev
7387)
@@ -1,16 +1,20 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS := ant junit4 jboss-common
+DEB_JARS := ant-nodeps xercesImpl junit4 ant-junit
+DEB_CLASSPATH := $(DEB_CLASSPATH):common/output/classes/
-#FIXME
-install/libpicocontainer-java::
- install -m644 -D picocontainer.jar
$(DEB_DESTDIR)/usr/share/java/picocontainer-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibpicocontainer-java
/usr/share/java/picocontainer-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/picocontainer.jar
+install/libjboss-buildmagic-java::
+ install -m644 -D tasks/output/lib/buildmagic-tasks.jar \
+
$(DEB_DESTDIR)/usr/share/java/buildmagic-tasks-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -plibjboss-buildmagic-java \
+ /usr/share/java/buildmagic-tasks-$(DEB_UPSTREAM_VERSION).jar \
+ /usr/share/java/buildmagic-tasks.jar
get-orig-source:
sh debian/orig-tar.sh
Added: trunk/libjboss-buildmagic-java/debian/watch
===================================================================
--- trunk/libjboss-buildmagic-java/debian/watch (rev 0)
+++ trunk/libjboss-buildmagic-java/debian/watch 2008-11-19 07:44:07 UTC (rev
7387)
@@ -0,0 +1,4 @@
+version=3
+
+http://anonsvn.labs.jboss.com/labs/jbossbuild/buildmagic/tags/ \
+ buildmagic-([\d.]+)/ debian debian/orig-tar.sh
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
