[shimdandy] 18/21: Updated to approach to getting libclojure-java

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository shimdandy.

commit 55e4640c8c44548873c4b91a30b22882a03f4180
Author: Tom Marble <tmarble at info9.net>
Date:   Sat Aug 12 11:00:19 2017 -0500

    Updated to approach to getting libclojure-java
    
    Signed-off-by: Tom Marble <tmarble at info9.net>
---
 debian/libshimdandy-java.poms        |  4 ++--
 debian/maven.rules                   |  2 +-
 debian/patches/fix-clojure-dep.patch | 13 -------------
 debian/patches/series                |  1 -
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/libshimdandy-java.poms b/debian/libshimdandy-java.poms
index a5b6fd3..3e74caf 100644
--- a/debian/libshimdandy-java.poms
+++ b/debian/libshimdandy-java.poms
@@ -26,5 +26,5 @@
 #     Empty by default. [mh_install]
 #
 pom.xml --no-parent --has-package-version
-api/pom.xml --no-parent --has-package-version
-impl/pom.xml --no-parent --has-package-version
+api/pom.xml --has-package-version
+impl/pom.xml --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index f3553d4..0431f1b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1 @@
-org.clojure clojure * s/.*/1.8.0/g * *
+org.clojure clojure * s/.*/1.8.x/g * *
diff --git a/debian/patches/fix-clojure-dep.patch b/debian/patches/fix-clojure-dep.patch
deleted file mode 100644
index 73ccdb3..0000000
--- a/debian/patches/fix-clojure-dep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: shimdandy/impl/pom.xml
-===================================================================
---- shimdandy.orig/impl/pom.xml	2017-08-11 13:36:17.000000000 -0500
-+++ shimdandy/impl/pom.xml	2017-08-11 15:27:26.485870156 -0500
-@@ -22,7 +22,7 @@
-     <dependency>
-       <groupId>org.clojure</groupId>
-       <artifactId>clojure</artifactId>
--      <scope>provided</scope>
-+      <version>1.8.0</version>
-     </dependency>
-     <dependency>
-       <groupId>junit</groupId>
diff --git a/debian/patches/series b/debian/patches/series
index 8b52a94..c1ae343 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-clojure-dep.patch
 exclude-parent-pom.patch

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