Author: gmascellani-guest Date: 2009-10-28 08:54:22 +0000 (Wed, 28 Oct 2009) New Revision: 10946
Removed: trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch Modified: trunk/libgettext-commons-java/debian/compat trunk/libgettext-commons-java/debian/docs trunk/libgettext-commons-java/debian/patches/00list Log: Still trying to make it work Modified: trunk/libgettext-commons-java/debian/compat =================================================================== --- trunk/libgettext-commons-java/debian/compat 2009-10-27 23:18:14 UTC (rev 10945) +++ trunk/libgettext-commons-java/debian/compat 2009-10-28 08:54:22 UTC (rev 10946) @@ -0,0 +1 @@ +7 Modified: trunk/libgettext-commons-java/debian/docs =================================================================== --- trunk/libgettext-commons-java/debian/docs 2009-10-27 23:18:14 UTC (rev 10945) +++ trunk/libgettext-commons-java/debian/docs 2009-10-28 08:54:22 UTC (rev 10946) @@ -1 +0,0 @@ -api Modified: trunk/libgettext-commons-java/debian/patches/00list =================================================================== --- trunk/libgettext-commons-java/debian/patches/00list 2009-10-27 23:18:14 UTC (rev 10945) +++ trunk/libgettext-commons-java/debian/patches/00list 2009-10-28 08:54:22 UTC (rev 10946) @@ -1 +0,0 @@ -10_pom.xml Deleted: trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch =================================================================== --- trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch 2009-10-27 23:18:14 UTC (rev 10945) +++ trunk/libgettext-commons-java/debian/patches/10_pom.xml.dpatch 2009-10-28 08:54:22 UTC (rev 10946) @@ -1,162 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_pom.xml.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@dpatch@ -diff -urNad libgettext-commons-java~/pom.xml libgettext-commons-java/pom.xml ---- libgettext-commons-java~/pom.xml 2009-10-26 22:36:44.000000000 +0100 -+++ libgettext-commons-java/pom.xml 2009-10-26 22:37:50.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,62 +100,47 @@ - <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> -+ <version>2.2-beta-4</version> -+ <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> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
