[pkg-java] r10913 - in trunk/libgettext-commons-java/debian: . patches
Giovanni Mascellani
gmascellani-guest at alioth.debian.org
Mon Oct 26 15:46:09 UTC 2009
Author: gmascellani-guest
Date: 2009-10-26 15:46:09 +0000 (Mon, 26 Oct 2009)
New Revision: 10913
Added:
trunk/libgettext-commons-java/debian/README.source
trunk/libgettext-commons-java/debian/libgettext-commons-java.poms
trunk/libgettext-commons-java/debian/maven.properties
trunk/libgettext-commons-java/debian/maven.rules
trunk/libgettext-commons-java/debian/orig-tar.sh
trunk/libgettext-commons-java/debian/patches/
trunk/libgettext-commons-java/debian/patches/00list
trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch
Removed:
trunk/libgettext-commons-java/debian/patches/
Modified:
trunk/libgettext-commons-java/debian/changelog
trunk/libgettext-commons-java/debian/compat
trunk/libgettext-commons-java/debian/control
trunk/libgettext-commons-java/debian/rules
Log:
Moving package to maven-debian-helper (WIP)
Added: trunk/libgettext-commons-java/debian/README.source
===================================================================
--- trunk/libgettext-commons-java/debian/README.source (rev 0)
+++ trunk/libgettext-commons-java/debian/README.source 2009-10-26 15:46:09 UTC (rev 10913)
@@ -0,0 +1,9 @@
+Information about libgettext-commons-java
+------------------------------
+
+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.
Modified: trunk/libgettext-commons-java/debian/changelog
===================================================================
--- trunk/libgettext-commons-java/debian/changelog 2009-10-26 13:27:05 UTC (rev 10912)
+++ trunk/libgettext-commons-java/debian/changelog 2009-10-26 15:46:09 UTC (rev 10913)
@@ -1,12 +1,14 @@
-libgettext-commons-java (0.9-2) UNRELEASED; urgency=low
+libgettext-commons-java (0.9.6-1) UNRELEASED; urgency=low
[ Andreas Putzo ]
* Added a debian/doc-base file
- [ Michael Koch ]
- * Updated watch file to match only on version number
+ [ Giovanni Mascellani ]
+ * Packaged new upstream release
+ * debian/watch: fixed
+ * debian/*: adapted in order to use maven-debian-helper
- -- Michael Koch <konqueror at gmx.de> Thu, 27 Dec 2007 23:42:28 +0100
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it> Sun, 25 Oct 2009 18:11:47 +0100
libgettext-commons-java (0.9-1) unstable; urgency=low
Modified: trunk/libgettext-commons-java/debian/compat
===================================================================
--- trunk/libgettext-commons-java/debian/compat 2009-10-26 13:27:05 UTC (rev 10912)
+++ trunk/libgettext-commons-java/debian/compat 2009-10-26 15:46:09 UTC (rev 10913)
@@ -1 +0,0 @@
-5
Modified: trunk/libgettext-commons-java/debian/control
===================================================================
--- trunk/libgettext-commons-java/debian/control 2009-10-26 13:27:05 UTC (rev 10912)
+++ trunk/libgettext-commons-java/debian/control 2009-10-26 15:46:09 UTC (rev 10913)
@@ -3,15 +3,16 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Andreas Putzo <andreas at putzo.net>,
Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
-Build-Depends: cdbs, debhelper (>= 5), java-gcj-compat-dev, ant
+Build-Depends: cdbs, debhelper (>=7), default-jdk, maven-debian-helper
+Build-Depends-Indep: libmaven-assembly-plugin-java, libsurefire-java
Standards-Version: 3.7.2
Section: java
Homepage: http://xnap-commons.sourceforge.net/gettext-commons/
Package: libgettext-commons-java
-Section: java
Architecture: all
-Depends: java-gcj-compat | java2-runtime
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
Description: Java classes for internationalization (i18n)
Lightweight library combining the power of the unix-style gettext tools
with the widely used Java ResourceBundles.
Added: trunk/libgettext-commons-java/debian/libgettext-commons-java.poms
===================================================================
--- trunk/libgettext-commons-java/debian/libgettext-commons-java.poms (rev 0)
+++ trunk/libgettext-commons-java/debian/libgettext-commons-java.poms 2009-10-26 15:46:09 UTC (rev 10913)
@@ -0,0 +1 @@
+pom.xml
Added: trunk/libgettext-commons-java/debian/maven.properties
===================================================================
--- trunk/libgettext-commons-java/debian/maven.properties (rev 0)
+++ trunk/libgettext-commons-java/debian/maven.properties 2009-10-26 15:46:09 UTC (rev 10913)
@@ -0,0 +1 @@
+maven.test.skip=true
Added: trunk/libgettext-commons-java/debian/maven.rules
===================================================================
--- trunk/libgettext-commons-java/debian/maven.rules (rev 0)
+++ trunk/libgettext-commons-java/debian/maven.rules 2009-10-26 15:46:09 UTC (rev 10913)
@@ -0,0 +1 @@
+junit junit jar s/3\..*/3.x/ *
Added: trunk/libgettext-commons-java/debian/orig-tar.sh
===================================================================
--- trunk/libgettext-commons-java/debian/orig-tar.sh (rev 0)
+++ trunk/libgettext-commons-java/debian/orig-tar.sh 2009-10-26 15:46:09 UTC (rev 10913)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../libgettext-commons-java_$VERSION.orig.tar.gz
+DIR=libgettext-commons-java-$VERSION
+TAG=$(echo "libgettext-commons-java-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
+
+svn export http://gettext-commons.googlecode.com/svn/tags/${TAG} $DIR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi
Property changes on: trunk/libgettext-commons-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch
===================================================================
--- trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch (rev 0)
+++ trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch 2009-10-26 15:46:09 UTC (rev 10913)
@@ -0,0 +1,166 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_pom.xml.dpatch by <mascellani at poisson.phc.unipi.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libgettext-commons-java~/pom.xml libgettext-commons-java/pom.xml
+--- libgettext-commons-java~/pom.xml 2009-10-26 16:30:10.000000000 +0100
++++ libgettext-commons-java/pom.xml 2009-10-26 16:30:47.000000000 +0100
+@@ -1,17 +1,20 @@
+-<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">
++<?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.xnap.commons</groupId>
+ <artifactId>gettext-commons</artifactId>
+- <packaging>jar</packaging>
+ <version>0.9.6</version>
++ <packaging>jar</packaging>
++ <properties>
++ <debian.originalVersion>0.9.6</debian.originalVersion>
++ <debian.package>libgettext-commons-java</debian.package>
++ <debian.mavenRules><![CDATA[org.xnap.commons gettext-commons jar 0.9.6 *]]></debian.mavenRules>
++ </properties>
++
+ <name>Gettext Commons</name>
+ <url>http://code.google.com/p/gettext-commons/</url>
+- <description>
+- A library that supports gettext-based internationalization
+- (i18n) of Java applications.
+- </description>
++ <description>A library that supports gettext-based internationalization
++ (i18n) of Java applications.</description>
+ <developers>
+ <developer>
+ <name>Felix Berger</name>
+@@ -43,17 +46,13 @@
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+- <version>3.8.1</version>
++ <version>3.x</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <scm>
+- <connection>
+- scm:svn:http://gettext-commons.googlecode.com/svn/trunk
+- </connection>
+- <developerConnection>
+- scm:cvs:https://gettext-commons.googlecode.com/svn/trunk
+- </developerConnection>
++ <connection>scm:svn:http://gettext-commons.googlecode.com/svn/trunk</connection>
++ <developerConnection>scm:cvs:https://gettext-commons.googlecode.com/svn/trunk</developerConnection>
+ <url>http://gettext-commons.googlecode.com/svn/trunk</url>
+ </scm>
+ <build>
+@@ -84,14 +83,10 @@
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <projectnatures>
+- <java.lang.String>
+- org.eclipse.jdt.core.javanature
+- </java.lang.String>
++ <java.lang.String>org.eclipse.jdt.core.javanature</java.lang.String>
+ </projectnatures>
+ <buildcommands>
+- <java.lang.String>
+- org.eclipse.jdt.core.javabuilder
+- </java.lang.String>
++ <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
+ </buildcommands>
+ </configuration>
+ </plugin>
+@@ -105,65 +100,49 @@
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+- <plugin>
+- <artifactId>maven-assembly-plugin</artifactId>
+- <configuration>
+- <descriptors>
+- <descriptor>src/assembly/bin.xml</descriptor>
+- <descriptor>src/assembly/src.xml</descriptor>
+- </descriptors>
+- </configuration>
+- <executions>
+- <execution>
+- <id>make-assembly</id> <!-- this is used for inheritance merges -->
+- <phase>package</phase> <!-- append to the packaging phase. -->
+- <goals>
+- <goal>attached</goal> <!-- goals == mojos -->
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+-
++ <plugin>
++ <artifactId>maven-assembly-plugin</artifactId>
++ <configuration>
++ <descriptors>
++ <descriptor>src/assembly/bin.xml</descriptor>
++ <descriptor>src/assembly/src.xml</descriptor>
++ </descriptors>
++ </configuration>
++ <executions>
++ <execution>
++ <id>make-assembly</id>
++ <phase>package</phase>
++ <goals>
++ <goal>attached</goal>
++ </goals>
++ </execution>
++ </executions>
++ </plugin>
+ </plugins>
+ </build>
+ <distributionManagement>
+ <site>
+ <id>xnap-commons</id>
+ <name>XNap Commons Site</name>
+- <url>
+- scp://shell.sf.net//home/groups/x/xn/xnap-commons/htdocs/gettext-commons/
+- </url>
++ <url>scp://shell.sf.net//home/groups/x/xn/xnap-commons/htdocs/gettext-commons/</url>
+ </site>
+ <repository>
+ <id>xnap-commons</id>
+ <name>XNap Commons Repository</name>
+- <url>
+- scp://shell.sf.net//home/groups/x/xn/xnap-commons/htdocs/repository
+- </url>
++ <url>scp://shell.sf.net//home/groups/x/xn/xnap-commons/htdocs/repository</url>
+ </repository>
+ </distributionManagement>
+ <reporting>
+ <plugins>
+- <!--
+- <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>changes-maven-plugin</artifactId>
+- <configuration>
+- <xmlPath>xdocs/changes.xml</xmlPath>
+- </configuration>
+- </plugin>
+- -->
+ <plugin>
+ <groupId>org.xnap.commons</groupId>
+ <artifactId>maven-gettext-plugin</artifactId>
+ <configuration>
+ <poDirectory>po</poDirectory>
+- <targetBundle>
+- org.xnap.commons.i18n.Messages
+- </targetBundle>
++ <targetBundle>org.xnap.commons.i18n.Messages</targetBundle>
+ <poDirectory>${basedir}/po</poDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+-</project>
++</project>
+\ No newline at end of file
Property changes on: trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/libgettext-commons-java/debian/rules
===================================================================
--- trunk/libgettext-commons-java/debian/rules 2009-10-26 13:27:05 UTC (rev 10912)
+++ trunk/libgettext-commons-java/debian/rules 2009-10-26 15:46:09 UTC (rev 10913)
@@ -1,20 +1,10 @@
-#! /usr/bin/make -f
-# debian/rules file for libgettext-commons-java (uses cdbs)
+#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
-DEB_ANT_BUILD_TARGET := dist-binaries
+JAVA_HOME := /usr/lib/jvm/default-java
-LIBRARY=gettext-commons
-VERSION=0.9
-
-clean::
- rm -rf Build Releases api
-
-install/libgettext-commons-java::
- install -m 644 Releases/${LIBRARY}-${VERSION}.jar ${CURDIR}/debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar
- dh_link usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar
+get-orig-source:
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
More information about the pkg-java-commits
mailing list