[libtwelvemonkeys-java] 01/08: Drop use-local-jars.patch and build-depend on libtwelvemonkeys-java instead.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository libtwelvemonkeys-java.

commit 4d8e2e797f631791f0d595058788b4bdc99cbf3a
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jul 21 20:27:57 2017 +0200

    Drop use-local-jars.patch and build-depend on libtwelvemonkeys-java instead.
---
 debian/control                      |  3 +-
 debian/patches/series               |  1 -
 debian/patches/use-local-jars.patch | 60 -------------------------------------
 3 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/debian/control b/debian/control
index 6552896..66f9187 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends:
  libcommons-fileupload-java,
  libjmagick6-java,
  libmaven-javadoc-plugin-java,
- libservlet3.1-java
+ libservlet3.1-java,
+ libtwelvemonkeys-java
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libtwelvemonkeys-java.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-java/libtwelvemonkeys-java.git
diff --git a/debian/patches/series b/debian/patches/series
index 868765f..b54f2de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-use-local-jars.patch
 servlet3.1.patch
diff --git a/debian/patches/use-local-jars.patch b/debian/patches/use-local-jars.patch
deleted file mode 100644
index 38b8d67..0000000
--- a/debian/patches/use-local-jars.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 25 Jun 2017 00:24:24 +0200
-Subject: use local jars
-
-For bootstrapping reasons we use the local jars for the first time.
-
-Forwarded: not-needed
----
- common/common-image/pom.xml | 4 ++++
- common/common-io/pom.xml    | 3 ++-
- pom.xml                     | 1 +
- 3 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/common/common-image/pom.xml b/common/common-image/pom.xml
-index ef807bb..bef7cf8 100644
---- a/common/common-image/pom.xml
-+++ b/common/common-image/pom.xml
-@@ -17,11 +17,15 @@
-         <dependency>
-             <groupId>${project.groupId}</groupId>
-             <artifactId>common-lang</artifactId>
-+            <scope>system</scope>
-+            <systemPath>${user.dir}/lib/twelvemonkeys-common-lang-3.3.2.jar</systemPath>
-         </dependency>
- 
-         <dependency>
-             <groupId>${project.groupId}</groupId>
-             <artifactId>common-io</artifactId>
-+            <scope>system</scope>
-+            <systemPath>${user.dir}/lib/twelvemonkeys-common-io-3.3.2.jar</systemPath>
-         </dependency>
- 
-         <dependency>
-diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml
-index 511a045..9fc0af8 100644
---- a/common/common-io/pom.xml
-+++ b/common/common-io/pom.xml
-@@ -17,8 +17,9 @@
-         <dependency>
-             <groupId>${project.groupId}</groupId>
-             <artifactId>common-lang</artifactId>
-+            <scope>system</scope>
-+            <systemPath>${user.dir}/lib/twelvemonkeys-common-lang-3.3.2.jar</systemPath>
-         </dependency>
--
-         <dependency>
-             <groupId>${project.groupId}</groupId>
-             <artifactId>common-lang</artifactId>
-diff --git a/pom.xml b/pom.xml
-index 1a27c5b..c56bea2 100755
---- a/pom.xml
-+++ b/pom.xml
-@@ -91,6 +91,7 @@
-     </properties>
- 
-     <build>
-+        <directory>${user.dir}/lib</directory>
-         <finalName>twelvemonkeys-${project.artifactId}-${project.version}</finalName>
-         <plugins>
-             <plugin>

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