Author: drazzib Date: 2010-02-24 21:27:13 +0000 (Wed, 24 Feb 2010) New Revision: 11702
Added: trunk/mvel/debian/ trunk/mvel/debian/README.source trunk/mvel/debian/changelog trunk/mvel/debian/compat trunk/mvel/debian/control trunk/mvel/debian/copyright trunk/mvel/debian/libmvel-java-doc.doc-base.api trunk/mvel/debian/libmvel-java-doc.install trunk/mvel/debian/libmvel-java.poms trunk/mvel/debian/maven.properties trunk/mvel/debian/maven.rules trunk/mvel/debian/orig-tar.exclude trunk/mvel/debian/orig-tar.sh trunk/mvel/debian/patches/ trunk/mvel/debian/patches/pom.diff trunk/mvel/debian/patches/series trunk/mvel/debian/patches/use_system_asm.diff trunk/mvel/debian/rules trunk/mvel/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: trunk/mvel/debian ___________________________________________________________________ Added: mergeWithUpstream + 1 Added: trunk/mvel/debian/README.source =================================================================== --- trunk/mvel/debian/README.source (rev 0) +++ trunk/mvel/debian/README.source 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,16 @@ +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. + +Patch System +============ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + Added: trunk/mvel/debian/changelog =================================================================== --- trunk/mvel/debian/changelog (rev 0) +++ trunk/mvel/debian/changelog 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,5 @@ +mvel (2.0.16-1) UNRELEASED; urgency=low + + * Initial release (Closes: #571260) + + -- Damien Raude-Morvan <draz...@debian.org> Sun, 21 Feb 2010 01:59:03 +0100 Added: trunk/mvel/debian/compat =================================================================== --- trunk/mvel/debian/compat (rev 0) +++ trunk/mvel/debian/compat 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1 @@ +7 Added: trunk/mvel/debian/control =================================================================== --- trunk/mvel/debian/control (rev 0) +++ trunk/mvel/debian/control 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,39 @@ +Source: mvel +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Uploaders: Damien Raude-Morvan <draz...@debian.org> +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper, quilt +Build-Depends-Indep: libmaven-compiler-plugin-java (>= 2.0.2), libmaven-jar-plugin-java (>= 2.2), + libsurefire-java (>= 2.4.3), junit, libxstream-java, default-jdk-doc, + libmaven-javadoc-plugin-java +Standards-Version: 3.8.4 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/mvel/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/mvel/ +Homepage: http://mvel.codehaus.org/ + +Package: libmvel-java +Architecture: all +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Description: expression language for Java-based applications + MVEL may be useful as an extension to anything from use in JSP Tag Libraries, + to the configuration facilities of your library/framework. + . + In addition to being an expression language, MVEL also comes packaged with an + templating system similar to Velocity and FreeMarker. + +Package: libmvel-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libmvel-java +Description: expression language for Java-based applications + MVEL may be useful as an extension to anything from use in JSP Tag Libraries, + to the configuration facilities of your library/framework. + . + In addition to being an expression language, MVEL also comes packaged with an + templating system similar to Velocity and FreeMarker. + . + This package provides the API documentation for libmvel-java. Added: trunk/mvel/debian/copyright =================================================================== --- trunk/mvel/debian/copyright (rev 0) +++ trunk/mvel/debian/copyright 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,19 @@ +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: MVEL +Maintainer: Mike Brock <mbr...@codehaus.org> +Source: http://mvel.codehaus.org/ + +Files: * +Copyright: Copyright (C) 2007 The Codehaus, Mike Brock, Dhanji Prasanna, John Graham, Mark Proctor +Copyright: Copyright (C) 2007 Christopher Brock +Copyright: Copyright (C) 2007 MVFLEX/Valhalla Project +License: Apache-2.0 + +Files: debian/* +Copyright: Copyright 2010, Damien Raude-Morvan <draz...@debian.org> +License: Apache-2.0 + +License: Apache-2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' + Added: trunk/mvel/debian/libmvel-java-doc.doc-base.api =================================================================== --- trunk/mvel/debian/libmvel-java-doc.doc-base.api (rev 0) +++ trunk/mvel/debian/libmvel-java-doc.doc-base.api 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,10 @@ +Document: libmvel-java +Title: API Javadoc for MVEL +Author: MVEL developers +Abstract: This is the API Javadoc provided for the + libmvel-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmvel-java/api/index.html +Files: /usr/share/doc/libmvel-java/api/* Added: trunk/mvel/debian/libmvel-java-doc.install =================================================================== --- trunk/mvel/debian/libmvel-java-doc.install (rev 0) +++ trunk/mvel/debian/libmvel-java-doc.install 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libmvel-java/api + Added: trunk/mvel/debian/libmvel-java.poms =================================================================== --- trunk/mvel/debian/libmvel-java.poms (rev 0) +++ trunk/mvel/debian/libmvel-java.poms 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1 @@ +pom.xml Added: trunk/mvel/debian/maven.properties =================================================================== --- trunk/mvel/debian/maven.properties (rev 0) +++ trunk/mvel/debian/maven.properties 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1 @@ +maven.test.skip=true Added: trunk/mvel/debian/maven.rules =================================================================== --- trunk/mvel/debian/maven.rules (rev 0) +++ trunk/mvel/debian/maven.rules 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,5 @@ +junit junit jar s/3\..*/3.x/ * +org.apache.maven.plugins maven-compiler-plugin maven-plugin s/.*/2.0.2/ +org.apache.maven.plugins maven-jar-plugin maven-plugin s/.*/2.2/ +org.apache.maven.plugins maven-surefire-report-plugin maven-plugin s/.*/2.4.3/ +asm asm jar s/.*/3.x/ * Added: trunk/mvel/debian/orig-tar.exclude =================================================================== --- trunk/mvel/debian/orig-tar.exclude (rev 0) +++ trunk/mvel/debian/orig-tar.exclude 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,3 @@ +ASM-LICENSE.txt +src/main/java/org/mvel2/asm/* +lib/* Added: trunk/mvel/debian/orig-tar.sh =================================================================== --- trunk/mvel/debian/orig-tar.sh (rev 0) +++ trunk/mvel/debian/orig-tar.sh 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,22 @@ +#!/bin/sh -e + +# $1 version +TAR=../mvel_$1.orig.tar.gz +DIR=mvel-$1.orig +VERSION=`echo $1 | sed -e 's/[+~].*//g'` +TAG=mvel2-$VERSION +SVN_ROOT=http://svn.codehaus.org/mvel/tags/ + +svn export $SVN_ROOT/$TAG $DIR +GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 + Added: trunk/mvel/debian/patches/pom.diff =================================================================== --- trunk/mvel/debian/patches/pom.diff (rev 0) +++ trunk/mvel/debian/patches/pom.diff 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,327 @@ +--- a/pom.xml ++++ b/pom.xml +@@ -1,152 +1,172 @@ ++<?xml version='1.0' encoding='UTF-8'?> + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +- <modelVersion>4.0.0</modelVersion> +- <groupId>org.mvel</groupId> +- <artifactId>mvel2</artifactId> +- <packaging>jar</packaging> +- <version>2.0.16</version> +- <name>mvel</name> +- <url>http://mvel.codehaus.org/</url> +- +- <scm> +- <developerConnection>scm:svn:https://svn.codehaus.org/mvel/tags/mvel2-2.0.16</developerConnection> +- </scm> +- +- <pluginRepositories> +- <pluginRepository> +- <id>apache-snapshots</id> +- <name>Apache Snapshot Repository</name> +- <url>http://repository.apache.org/snapshots/</url> +- <snapshots> +- <enabled>true</enabled> +- </snapshots> +- </pluginRepository> +- +- </pluginRepositories> +- +- <build> +- +- <plugins> +- <plugin> +- <groupId>org.apache.maven.plugins</groupId> +- <artifactId>maven-compiler-plugin</artifactId> +- <version>2.0.1</version> +- <configuration> +- <source>1.5</source> +- <target>1.5</target> +- <encoding>UTF-8</encoding> +- </configuration> +- </plugin> +- +- <plugin> +- <groupId>org.apache.maven.plugins</groupId> +- <artifactId>maven-jar-plugin</artifactId> +- <configuration> +- <archive> +- <manifest> +- <mainClass>org.mvel2.sh.Main</mainClass> +- <packageName>org.mvel2</packageName> +- </manifest> +- </archive> +- </configuration> +- </plugin> +- +- <plugin> +- <groupId>org.apache.maven.plugins</groupId> +- <artifactId>maven-surefire-plugin</artifactId> +- <configuration> +- <childDelegation>true</childDelegation> +- <systemProperties> +- <property> +- <name>mvel.disable.jit</name> +- <value>true</value> +- </property> +- <property> +- <name>file.encoding</name> +- <value>UTF-8</value> +- </property> +- </systemProperties> +- <includes> +- <include>**/*Test.java</include> +- <include>**/*Tests.java</include> +- <include>**/UsageDemos.java</include> +- </includes> +- <excludes> +- <exclude>**/CompiledUnitTestEx.java</exclude> +- <exclude>**/PerfTest.java</exclude> +- <exclude>**/DroolsTest.java</exclude> +- <exclude>**/FailureTests.java</exclude> +- <exclude>**/PerformanceTest.java</exclude> +- <exclude>**/CompiledPerformanceTests.java</exclude> +- <exclude>**/MVELThreadTest.java</exclude> +- </excludes> +- </configuration> +- </plugin> +- +- <plugin> +- <artifactId>maven-jar-plugin</artifactId> +- <configuration> +- <archive> +- <manifestFile>META-INF/MANIFEST.MF</manifestFile> +- </archive> +- </configuration> +- </plugin> +- +- </plugins> +- </build> +- +- +- <reporting> +- <plugins> +- <plugin> +- <groupId>org.apache.maven.plugins</groupId> +- <artifactId>maven-surefire-report-plugin</artifactId> +- </plugin> +- </plugins> +- </reporting> +- +- <dependencies> +- <dependency> +- <groupId>junit</groupId> +- <artifactId>junit</artifactId> +- <version>3.8.1</version> +- <scope>test</scope> +- </dependency> +- +- <dependency> +- <groupId>com.thoughtworks.xstream</groupId> +- <artifactId>xstream</artifactId> +- <version>1.3.1</version> +- <scope>test</scope> +- </dependency> +- +- <dependency> +- <groupId>asm</groupId> +- <artifactId>asm</artifactId> +- <version>3.x</version> +- </dependency> +- +- <!--<dependency>--> +- <!--<groupId>org.hibernate</groupId>--> +- <!--<artifactId>ejb3-persistence</artifactId>--> +- <!--<version>1.0.2.GA</version>--> +- <!--<scope>test</scope>--> +- <!--</dependency> --> +- </dependencies> +- +- +- <distributionManagement> +- <!-- use the following if you're not using a snapshot version. --> +- <repository> +- <id>codehaus.org</id> +- <name>Codehaus Maven Repository</name> +- <url>dav:https://dav.codehaus.org/repository/mvel/</url> +- </repository> +- <!-- use the following if you ARE using a snapshot version. --> +- <snapshotRepository> +- <id>codehaus.org</id> +- <name>Codehaus Snapshot Maven Repository</name> +- <url>dav:https://dav.codehaus.org/snapshots.repository/mvel/</url> +- <uniqueVersion>false</uniqueVersion> +- </snapshotRepository> +- </distributionManagement> +-</project> ++ <modelVersion>4.0.0</modelVersion> ++ <groupId>org.mvel</groupId> ++ <artifactId>mvel2</artifactId> ++ <version>2.0.16</version> ++ <packaging>jar</packaging> ++ <properties> ++ <debian.originalVersion>2.0.16</debian.originalVersion> ++ <debian.package>libmvel-java</debian.package> ++ <debian.mavenRules><![CDATA[org.mvel mvel2 jar 2.0.16 *]]></debian.mavenRules> ++ </properties> ++ ++ <name>mvel</name> ++ <url>http://mvel.codehaus.org/</url> ++ <scm> ++ <developerConnection>scm:svn:https://svn.codehaus.org/mvel/tags/mvel2-2.0.16</developerConnection> ++ </scm> ++ <pluginRepositories> ++ <pluginRepository> ++ <id>apache-snapshots</id> ++ <name>Apache Snapshot Repository</name> ++ <url>http://repository.apache.org/snapshots/</url> ++ <snapshots> ++ <enabled>true</enabled> ++ </snapshots> ++ </pluginRepository> ++ </pluginRepositories> ++ <build> ++ <extensions> ++ <extension> ++ <groupId>org.apache.maven.wagon</groupId> ++ <artifactId>wagon-webdav</artifactId> ++ <version>debian</version> ++ </extension> ++ </extensions> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <version>2.0.2</version> ++ <configuration> ++ <source>1.5</source> ++ <target>1.5</target> ++ <encoding>UTF-8</encoding> ++ </configuration> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <configuration> ++ <archive> ++ <manifest> ++ <mainClass>org.mvel2.sh.Main</mainClass> ++ <packageName>org.mvel2</packageName> ++ </manifest> ++ </archive> ++ </configuration> ++ <version>2.2</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-surefire-plugin</artifactId> ++ <configuration> ++ <childDelegation>true</childDelegation> ++ <systemProperties> ++ <property> ++ <name>mvel.disable.jit</name> ++ <value>true</value> ++ </property> ++ <property> ++ <name>file.encoding</name> ++ <value>UTF-8</value> ++ </property> ++ </systemProperties> ++ <includes> ++ <include>**/*Test.java</include> ++ <include>**/*Tests.java</include> ++ <include>**/UsageDemos.java</include> ++ </includes> ++ <excludes> ++ <exclude>**/CompiledUnitTestEx.java</exclude> ++ <exclude>**/PerfTest.java</exclude> ++ <exclude>**/DroolsTest.java</exclude> ++ <exclude>**/FailureTests.java</exclude> ++ <exclude>**/PerformanceTest.java</exclude> ++ <exclude>**/CompiledPerformanceTests.java</exclude> ++ <exclude>**/MVELThreadTest.java</exclude> ++ </excludes> ++ </configuration> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-release-plugin</artifactId> ++ <version>2.0-beta-9</version> ++ <configuration> ++ <tagBase>https://svn.codehaus.org/mvel/tags/</tagBase> ++ <remoteTagging>false</remoteTagging> ++ <preparationGoals>clean install</preparationGoals> ++ <autoVersionSubmodules>true</autoVersionSubmodules> ++ </configuration> ++ </plugin> ++ <plugin> ++ <artifactId>maven-jar-plugin</artifactId> ++ <configuration> ++ <archive> ++ <manifestFile>META-INF/MANIFEST.MF</manifestFile> ++ </archive> ++ </configuration> ++ <version>2.2</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.felix</groupId> ++ <artifactId>maven-bundle-plugin</artifactId> ++ <version>2.0.1</version> ++ <extensions>true</extensions> ++ <executions> ++ <execution> ++ <id>manifest</id> ++ <phase>process-classes</phase> ++ <goals> ++ <goal>manifest</goal> ++ </goals> ++ </execution> ++ </executions> ++ <configuration> ++ <manifestLocation>META-INF</manifestLocation> ++ <instructions> ++ <Bundle-SymbolicName>org.mvel2</Bundle-SymbolicName> ++ <Bundle-Name>mvel2</Bundle-Name> ++ </instructions> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++ <reporting> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-surefire-report-plugin</artifactId> ++ <version>2.4.3</version> ++ </plugin> ++ </plugins> ++ </reporting> ++ <dependencies> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>3.x</version> ++ <scope>test</scope> ++ </dependency> ++ <dependency> ++ <groupId>com.thoughtworks.xstream</groupId> ++ <artifactId>xstream</artifactId> ++ <version>debian</version> ++ <scope>test</scope> ++ </dependency> ++ </dependencies> ++ <distributionManagement> ++ <repository> ++ <id>codehaus.org</id> ++ <name>Codehaus Maven Repository</name> ++ <url>dav:https://dav.codehaus.org/repository/mvel/</url> ++ </repository> ++ <snapshotRepository> ++ <id>codehaus.org</id> ++ <name>Codehaus Snapshot Maven Repository</name> ++ <url>dav:https://dav.codehaus.org/snapshots.repository/mvel/</url> ++ <uniqueVersion>false</uniqueVersion> ++ </snapshotRepository> ++ </distributionManagement> ++</project> +\ No newline at end of file Added: trunk/mvel/debian/patches/series =================================================================== --- trunk/mvel/debian/patches/series (rev 0) +++ trunk/mvel/debian/patches/series 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,2 @@ +#pom.diff +use_system_asm.diff Added: trunk/mvel/debian/patches/use_system_asm.diff =================================================================== --- trunk/mvel/debian/patches/use_system_asm.diff (rev 0) +++ trunk/mvel/debian/patches/use_system_asm.diff 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,42 @@ +--- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java ++++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java +@@ -24,13 +24,13 @@ + import static org.mvel2.MVEL.eval; + import static org.mvel2.MVEL.isAdvancedDebugging; + +-import org.mvel2.asm.ClassWriter; +-import org.mvel2.asm.Label; +-import org.mvel2.asm.MethodVisitor; +-import org.mvel2.asm.Opcodes; ++import org.objectweb.asm.ClassWriter; ++import org.objectweb.asm.Label; ++import org.objectweb.asm.MethodVisitor; ++import org.objectweb.asm.Opcodes; + +-import static org.mvel2.asm.Opcodes.*; +-import static org.mvel2.asm.Type.*; ++import static org.objectweb.asm.Opcodes.*; ++import static org.objectweb.asm.Type.*; + + import org.mvel2.ast.Function; + import org.mvel2.ast.TypeDescriptor; +@@ -582,7 +582,7 @@ + + mv = cw.visitMethod(ACC_PUBLIC, "getKnownEgressType", "()Ljava/lang/Class;", null, null); + mv.visitCode(); +- mv.visitLdcInsn(org.mvel2.asm.Type.getType(returnType != null ? returnType : Object.class)); ++ mv.visitLdcInsn(org.objectweb.asm.Type.getType(returnType != null ? returnType : Object.class)); + mv.visitInsn(ARETURN); + + mv.visitMaxs(1, 1); +--- a/src/main/java/org/mvel2/optimizers/impl/asm/ProducesBytecode.java ++++ b/src/main/java/org/mvel2/optimizers/impl/asm/ProducesBytecode.java +@@ -18,7 +18,7 @@ + + package org.mvel2.optimizers.impl.asm; + +-import org.mvel2.asm.MethodVisitor; ++import org.objectweb.asm.MethodVisitor; + import org.mvel2.integration.VariableResolverFactory; + + /** Added: trunk/mvel/debian/rules =================================================================== --- trunk/mvel/debian/rules (rev 0) +++ trunk/mvel/debian/rules 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/maven.mk + +JAVA_HOME := /usr/lib/jvm/default-java + +get-orig-source: + sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) Property changes on: trunk/mvel/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/mvel/debian/watch =================================================================== --- trunk/mvel/debian/watch (rev 0) +++ trunk/mvel/debian/watch 2010-02-24 21:27:13 UTC (rev 11702) @@ -0,0 +1,3 @@ +version=3 +http://svn.codehaus.org/mvel/tags/ mvel2-([\d\.]+)/ + _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
