This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 67cb11b2daba79a0950943f3fcdfa8dd4bd6431b Author: Gilles Filippini <[email protected]> Date: Sun May 11 16:28:58 2014 +0200 Drop useless patch parent-pom.patch Fixed upstream. --- debian/patches/parent-pom.patch | 140 ---------------------------------------- debian/patches/series | 1 - 2 files changed, 141 deletions(-) diff --git a/debian/patches/parent-pom.patch b/debian/patches/parent-pom.patch deleted file mode 100644 index 3346e09..0000000 --- a/debian/patches/parent-pom.patch +++ /dev/null @@ -1,140 +0,0 @@ -Description: One pom.xml to rule them all - The Sikuli source tree is composed of five distinct subprojects. This patch - aggregates theses subprojects into one Maven parent project. -Author: Gilles Filippini <[email protected]> -Index: sikuli/api/pom.xml -=================================================================== ---- sikuli.orig/api/pom.xml 2013-11-03 22:08:51.000000000 +0100 -+++ sikuli/api/pom.xml 2013-11-03 22:08:51.000000000 +0100 -@@ -8,6 +8,12 @@ - * - * RaiMan 2013 - --> -+ <parent> -+ <groupId>org.sikuli</groupId> -+ <artifactId>SikuliX</artifactId> -+ <version>1.0.1</version> -+ </parent> -+ - - <modelVersion>4.0.0</modelVersion> - -Index: sikuli/basics/pom.xml -=================================================================== ---- sikuli.orig/basics/pom.xml 2013-11-03 22:08:51.000000000 +0100 -+++ sikuli/basics/pom.xml 2013-11-03 22:08:51.000000000 +0100 -@@ -7,6 +7,11 @@ - * - * RaiMan 2013 - --> -+ <parent> -+ <groupId>org.sikuli</groupId> -+ <artifactId>SikuliX</artifactId> -+ <version>1.0.1</version> -+ </parent> - - <modelVersion>4.0.0</modelVersion> - -Index: sikuli/ide/pom.xml -=================================================================== ---- sikuli.orig/ide/pom.xml 2013-11-03 22:08:51.000000000 +0100 -+++ sikuli/ide/pom.xml 2013-11-03 22:08:51.000000000 +0100 -@@ -8,6 +8,12 @@ - * - * RaiMan 2013 - --> -+ <parent> -+ <groupId>org.sikuli</groupId> -+ <artifactId>SikuliX</artifactId> -+ <version>1.0.1</version> -+ </parent> -+ - - <modelVersion>4.0.0</modelVersion> - -Index: sikuli/pom.xml -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ sikuli/pom.xml 2013-11-03 22:09:53.000000000 +0100 -@@ -0,0 +1,49 @@ -+<?xml version="1.0"?> -+<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/xsd/maven-4.0.0.xsd";> -+ -+ <modelVersion>4.0.0</modelVersion> -+ -+ <groupId>org.sikuli</groupId> -+ <artifactId>SikuliX</artifactId> -+ <version>1.0.1</version> -+ <packaging>pom</packaging> -+ -+ <name>SikuliX</name> -+ <url>http://www.sikuli.org</url> -+ -+ <licenses> -+ <license> -+ <name>MIT License</name> -+ <url>http://www.sikuli.org/LICENSE.txt</url> -+ <distribution>repo</distribution> -+ </license> -+ </licenses> -+ -+ <developers> -+ <developer> -+ <id>RaiMan</id> -+ <name>RaiMan</name> -+ <email>[email protected]</email> -+ </developer> -+ </developers> -+ -+ <properties> -+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -+ </properties> -+ -+ <modules> -+ <module>vision-proxy</module> -+ <module>basics</module> -+ <module>jython</module> -+ <module>api</module> -+ <module>ide</module> -+ </modules> -+ -+ <dependencies> -+ </dependencies> -+ -+ <build> -+ <finalName>sikulix</finalName> -+ </build> -+</project> -Index: sikuli/jython/pom.xml -=================================================================== ---- sikuli.orig/jython/pom.xml 2013-11-03 22:08:51.000000000 +0100 -+++ sikuli/jython/pom.xml 2013-11-03 22:08:51.000000000 +0100 -@@ -8,6 +8,11 @@ - * - * kelthuzad, RaiMan 2013 - --> -+ <parent> -+ <groupId>org.sikuli</groupId> -+ <artifactId>SikuliX</artifactId> -+ <version>1.0.1</version> -+ </parent> - - <modelVersion>4.0.0</modelVersion> - -Index: sikuli/vision-proxy/pom.xml -=================================================================== ---- sikuli.orig/vision-proxy/pom.xml 2013-11-03 22:08:51.000000000 +0100 -+++ sikuli/vision-proxy/pom.xml 2013-11-03 22:08:51.000000000 +0100 -@@ -7,6 +7,11 @@ - * - * RaiMan 2013 - --> -+ <parent> -+ <groupId>org.sikuli</groupId> -+ <artifactId>SikuliX</artifactId> -+ <version>1.0.1</version> -+ </parent> - - <modelVersion>4.0.0</modelVersion> - diff --git a/debian/patches/series b/debian/patches/series index c91c069..32671be 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,7 +4,6 @@ install-extension.patch setTextAndMnemonic.patch autotoolize-vision-proxy.patch -#parent-pom.patch #add-classpath.patch #preserve-source-utf-8.patch basics-exclude-windows-mac.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
