[pkg-java] r11459 - in trunk/stringtemplate/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Sun Jan 31 15:03:41 UTC 2010
Author: ludovicc-guest
Date: 2010-01-31 15:03:36 +0000 (Sun, 31 Jan 2010)
New Revision: 11459
Added:
trunk/stringtemplate/debian/ant.properties
trunk/stringtemplate/debian/libstringtemplate-java.poms
trunk/stringtemplate/debian/maven.rules
trunk/stringtemplate/debian/patches/pom-version.patch
trunk/stringtemplate/debian/patches/series
trunk/stringtemplate/debian/pom.xml
Modified:
trunk/stringtemplate/debian/
trunk/stringtemplate/debian/changelog
trunk/stringtemplate/debian/control
trunk/stringtemplate/debian/rules
Log:
* New upstream version
* Add the Maven POM to the package
* Add a patch to force the version of stringtemplate in the
POM to be 3.2, instead of 3.3-SNAPSHOT (update or remove
this patch on a new upstream release), add a dependency on
quilt.
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Use mh_installpom and mh_installjar to install the POM and the jar to the
Maven repository
Property changes on: trunk/stringtemplate/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/stringtemplate/debian/ant.properties
===================================================================
--- trunk/stringtemplate/debian/ant.properties (rev 0)
+++ trunk/stringtemplate/debian/ant.properties 2010-01-31 15:03:36 UTC (rev 11459)
@@ -0,0 +1,2 @@
+language.dir=build/src/org/antlr/stringtemplate/language
+
Modified: trunk/stringtemplate/debian/changelog
===================================================================
--- trunk/stringtemplate/debian/changelog 2010-01-31 13:53:02 UTC (rev 11458)
+++ trunk/stringtemplate/debian/changelog 2010-01-31 15:03:36 UTC (rev 11459)
@@ -1,8 +1,20 @@
-stringtemplate (3.1-5) UNRELEASED; urgency=low
+stringtemplate (3.2.1-1) unstable; urgency=low
+ [Ludovic Claude]
+ * New upstream version
+ * Add the Maven POM to the package
+ * Add a patch to force the version of stringtemplate in the
+ POM to be 3.2, instead of 3.3-SNAPSHOT (update or remove
+ this patch on a new upstream release), add a dependency on
+ quilt.
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+
+ [Thierry Carrez]
* debian/control: Also depend on a JRE to follow policy
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Fri, 13 Nov 2009 13:44:14 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 10 Jan 2010 16:31:59 +0100
stringtemplate (3.1-4) unstable; urgency=low
Modified: trunk/stringtemplate/debian/control
===================================================================
--- trunk/stringtemplate/debian/control 2010-01-31 13:53:02 UTC (rev 11458)
+++ trunk/stringtemplate/debian/control 2010-01-31 15:03:36 UTC (rev 11459)
@@ -2,8 +2,8 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Florian Weimer <fw at deneb.enyo.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), default-jdk, ant-optional
+Uploaders: Florian Weimer <fw at deneb.enyo.de>, Michael Koch <konqueror at gmx.de>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 7), quilt, default-jdk, ant-optional, antlr (>= 2.7.7), maven-repo-helper
Build-Depends-Indep: libantlr-java, junit
Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/stringtemplate
Added: trunk/stringtemplate/debian/libstringtemplate-java.poms
===================================================================
--- trunk/stringtemplate/debian/libstringtemplate-java.poms (rev 0)
+++ trunk/stringtemplate/debian/libstringtemplate-java.poms 2010-01-31 15:03:36 UTC (rev 11459)
@@ -0,0 +1 @@
+pom.xml
Added: trunk/stringtemplate/debian/maven.rules
===================================================================
--- trunk/stringtemplate/debian/maven.rules (rev 0)
+++ trunk/stringtemplate/debian/maven.rules 2010-01-31 15:03:36 UTC (rev 11459)
@@ -0,0 +1,2 @@
+antlr antlr jar s/2\..*/2.x/
+org.antlr stringtemplate jar s/3\..*/3.x/
Added: trunk/stringtemplate/debian/patches/pom-version.patch
===================================================================
--- trunk/stringtemplate/debian/patches/pom-version.patch (rev 0)
+++ trunk/stringtemplate/debian/patches/pom-version.patch 2010-01-31 15:03:36 UTC (rev 11459)
@@ -0,0 +1,11 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -12,7 +12,7 @@
+ will be deplyed to the ANTLR snapshot repository at antlr.org with the word
+ SNAPSHOT replaced with the the data, time and unique number.
+ -->
+- <version>3.3-SNAPSHOT</version>
++ <version>3.2.1</version>
+
+ <!--
+ The name of the project as seen by IDEs and release documentation etc.
Added: trunk/stringtemplate/debian/patches/series
===================================================================
--- trunk/stringtemplate/debian/patches/series (rev 0)
+++ trunk/stringtemplate/debian/patches/series 2010-01-31 15:03:36 UTC (rev 11459)
@@ -0,0 +1,2 @@
+stringtemplate-manifest.patch
+pom-version.patch
Added: trunk/stringtemplate/debian/pom.xml
===================================================================
--- trunk/stringtemplate/debian/pom.xml (rev 0)
+++ trunk/stringtemplate/debian/pom.xml 2010-01-31 15:03:36 UTC (rev 11459)
@@ -0,0 +1,197 @@
+<?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.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <packaging>jar</packaging>
+
+ <!--
+ The version number defined here in the version tag indicates how the
+ jar is named and released. When it ends with SNAPSHOT, it will be stored
+ in your local repository (~/m2 on UNIX) as stringtemplate-X.Y-SNAPSHOT, but
+ will be deplyed to the ANTLR snapshot repository at antlr.org with the word
+ SNAPSHOT replaced with the the data, time and unique number.
+ -->
+ <version>3.2.1</version>
+
+ <!--
+ The name of the project as seen by IDEs and release documentation etc.
+ -->
+ <name>ANTLR StringTemplate</name>
+
+ <description>StringTemplate is a java template engine for generating source code,
+web pages, emails, or any other formatted text output.
+
+StringTemplate is particularly good at multi-targeted code generators,
+multiple site skins, and internationalization/localization.
+
+It evolved over years of effort developing jGuru.com.
+
+StringTemplate also generates the stringtemplate website: http://www.stringtemplate.org
+and powers the ANTLR v3 code generator. Its distinguishing characteristic
+is that unlike other engines, it strictly enforces model-view separation.
+
+Strict separation makes websites and code generators more flexible
+and maintainable; it also provides an excellent defense against malicious
+template authors.
+
+There are currently about 600 StringTemplate source downloads a month.
+ </description>
+
+ <!--
+ The URL of the ANTLR base project
+ -->
+ <url>http://www.stringtemplate.org</url>
+ <developers>
+ <developer>
+ <name>Terence Parr</name>
+ <organization>USFCA</organization>
+ <organizationUrl>http://www.cs.usfca.edu</organizationUrl>
+ <email>parrt at antlr.org</email>
+ <roles>
+ <role>Project Leader</role>
+ <role>Developer - Java Target</role>
+ </roles>
+ <timezone>PST</timezone>
+ </developer>
+ <developer>
+ <name>Jim Idle</name>
+ <organization>Temporal Wave LLC</organization>
+ <organizationUrl>http://www.temporal-wave.com</organizationUrl>
+ <email>jimi at temporal-wave.com</email>
+ <roles>
+ <role>Developer - Maven stuff</role>
+ </roles>
+ <timezone>PST</timezone>
+ </developer>
+ </developers>
+
+ <licenses>
+ <license>
+ <name>BSD licence</name>
+ <url>http://antlr.org/license.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://fisheye2.cenqua.com/browse/stringtemplate</url>
+ <connection>http://fisheye2.cenqua.com/browse/stringtemplate</connection>
+ </scm>
+
+ <!--
+ Definition of the ANTLR repositories. Note that you can only deploy
+ to the repositories via scp, and so the server must already know about
+ your public key. ONly ANTLR developers are allowed to deploy to the
+ release and snapshot repositories, which are synced with the Maven central
+ repository.
+ -->
+ <distributionManagement>
+ <repository>
+ <id>antlr-repo</id>
+ <name>ANTLR Testing repository</name>
+ <url>scpexe://antlr.org/home/mavensync/antlr-repo</url>
+ </repository>
+
+ <snapshotRepository>
+ <id>antlr-snapshot</id>
+ <name>ANTLR Testing Snapshot Repository</name>
+ <url>scpexe://antlr.org/home/mavensync/antlr-snapshot</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+
+ <defaultGoal>install</defaultGoal>
+
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+
+
+ <!--
+ The root of the source code for StringTemplate
+ -->
+ <sourceDirectory>src</sourceDirectory>
+
+ <!--
+ The root of the test source code for StringTemplate.
+ -->
+ <testSourceDirectory>test</testSourceDirectory>
+
+ <!--
+ All the resources that should be on the classpath, when
+ the junit tests are run. Here we need to include the test
+ source code directory as the .st files loaded dynamically
+ by the tests, are located underneath this tree.
+ -->
+ <testResources>
+ <testResource>
+ <directory>test</directory>
+ </testResource>
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <configuration>
+ <sourceDirectory>src/org/antlr/stringtemplate/language</sourceDirectory>
+ <grammars>template.g, angle.bracket.template.g, action.g, eval.g, group.g, interface.g</grammars>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>jsr14</target>
+ <sourceDirectory>src</sourceDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/src</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+ <xmlOutput>true</xmlOutput>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Modified: trunk/stringtemplate/debian/rules
===================================================================
--- trunk/stringtemplate/debian/rules 2010-01-31 13:53:02 UTC (rev 11458)
+++ trunk/stringtemplate/debian/rules 2010-01-31 15:03:36 UTC (rev 11459)
@@ -2,19 +2,25 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_JARS := antlr ant-antlr junit
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := antlr ant-antlr junit
DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_CLEAN_TARGET := clean-all
build:
fmt README.txt > README
-install/libstringtemplate-java::
- install -m 644 -D build/stringtemplate.jar debian/libstringtemplate-java/usr/share/java/stringtemplate-$(DEB_UPSTREAM_VERSION).jar
- dh_link -p libstringtemplate-java usr/share/java/stringtemplate-$(DEB_UPSTREAM_VERSION).jar usr/share/java/stringtemplate.jar
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE).jar
clean::
rm -rf build README
+
+get-orig-pom:
+ wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/antlr/stringtemplate/$(DEB_UPSTREAM_VERSION)/stringtemplate-$(DEB_UPSTREAM_VERSION).pom
+
More information about the pkg-java-commits
mailing list