[sikuli] 04/06: Fix patch drop-useless-resources.patch

Gilles Filippini pini at moszumanska.debian.org
Thu Sep 11 17:42:25 UTC 2014


This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository sikuli.

commit caf04781ef3ef63fcf3a3963d905077e2259c7ea
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Jun 30 00:00:31 2014 +0200

    Fix patch drop-useless-resources.patch
    
    which introduced a second tag <resources> into Basics/pom.xml.
---
 debian/patches/drop-useless-resources.patch | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/patches/drop-useless-resources.patch b/debian/patches/drop-useless-resources.patch
index e3da34b..49893be 100644
--- a/debian/patches/drop-useless-resources.patch
+++ b/debian/patches/drop-useless-resources.patch
@@ -4,20 +4,16 @@ Index: sikuli/Basics/pom.xml
 ===================================================================
 --- sikuli.orig/Basics/pom.xml
 +++ sikuli/Basics/pom.xml
-@@ -115,5 +115,13 @@
- 				</configuration>
- 			</plugin>
- 		</plugins>
-+		<resources>
-+			<resource>
-+				<directory>src/main/resources</directory>
+@@ -78,6 +78,9 @@
+ 			<resource>
+ 				<directory>src/main/resources</directory>
+ 				<filtering>true</filtering>
 +				<excludes>
 +					<exclude>Commands/**</exclude>
 +				</excludes>
-+			</resource>
-+		</resources>
- 	</build>
- </project>
+ 			</resource>
+ 		</resources>
+ 		<plugins>
 Index: sikuli/API/pom.xml
 ===================================================================
 --- sikuli.orig/API/pom.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git



More information about the pkg-java-commits mailing list