[mvel] 02/42: [svn-inject] Applying Debian modifications to trunk
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jan 18 17:01:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository mvel.
commit 0c1ca5eeb273563489da2f935063e3e8419b00c6
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed Feb 24 21:27:13 2010 +0000
[svn-inject] Applying Debian modifications to trunk
---
debian/README.source | 16 ++
debian/changelog | 5 +
debian/compat | 1 +
debian/control | 39 +++++
debian/copyright | 19 ++
debian/libmvel-java-doc.doc-base.api | 10 ++
debian/libmvel-java-doc.install | 2 +
debian/libmvel-java.poms | 1 +
debian/maven.properties | 1 +
debian/maven.rules | 5 +
debian/orig-tar.exclude | 3 +
debian/orig-tar.sh | 22 +++
debian/patches/pom.diff | 327 +++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/patches/use_system_asm.diff | 42 +++++
debian/rules | 10 ++
debian/watch | 3 +
17 files changed, 508 insertions(+)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..d2e990f
--- /dev/null
+++ b/debian/README.source
@@ -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.
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..a9d3f8e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+mvel (2.0.16-1) UNRELEASED; urgency=low
+
+ * Initial release (Closes: #571260)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 21 Feb 2010 01:59:03 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..4347a87
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,39 @@
+Source: mvel
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at 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.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..ee1198f
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,19 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: MVEL
+Maintainer: Mike Brock <mbrock at 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 <drazzib at 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'
+
diff --git a/debian/libmvel-java-doc.doc-base.api b/debian/libmvel-java-doc.doc-base.api
new file mode 100644
index 0000000..8dce2a5
--- /dev/null
+++ b/debian/libmvel-java-doc.doc-base.api
@@ -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/*
diff --git a/debian/libmvel-java-doc.install b/debian/libmvel-java-doc.install
new file mode 100644
index 0000000..b8f7d5b
--- /dev/null
+++ b/debian/libmvel-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmvel-java/api
+
diff --git a/debian/libmvel-java.poms b/debian/libmvel-java.poms
new file mode 100644
index 0000000..d4f7111
--- /dev/null
+++ b/debian/libmvel-java.poms
@@ -0,0 +1 @@
+pom.xml
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..d2f1b82
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1 @@
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..9af8564
--- /dev/null
+++ b/debian/maven.rules
@@ -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/ *
diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
new file mode 100644
index 0000000..a5d74c9
--- /dev/null
+++ b/debian/orig-tar.exclude
@@ -0,0 +1,3 @@
+ASM-LICENSE.txt
+src/main/java/org/mvel2/asm/*
+lib/*
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100644
index 0000000..d393d07
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -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
+
diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff
new file mode 100644
index 0000000..2111df9
--- /dev/null
+++ b/debian/patches/pom.diff
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1502484
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+#pom.diff
+use_system_asm.diff
diff --git a/debian/patches/use_system_asm.diff b/debian/patches/use_system_asm.diff
new file mode 100644
index 0000000..8908813
--- /dev/null
+++ b/debian/patches/use_system_asm.diff
@@ -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;
+
+ /**
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..c01d551
--- /dev/null
+++ b/debian/rules
@@ -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)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..fdf05c2
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://svn.codehaus.org/mvel/tags/ mvel2-([\d\.]+)/
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git
More information about the pkg-java-commits
mailing list