[SCM] UNNAMED PROJECT branch, master, updated. debian/2.1.0-1-8-gfefa63b

[Jakub Adam]

The following commit has been merged in the master branch:
commit ed9490fa7570946858e6fa8a66dd06a2b3601ca2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Dec 20 21:17:50 2012 +0100

    Move JGit Ant tasks into separate binary package
    
    Avoids in most use cases unnecessary dependency on Ant.

diff --git a/debian/changelog b/debian/changelog
index c06dfa0..6731168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ jgit (2.2.0-1) UNRELEASED; urgency=low
   * New Upstream release.
   * Remove /usr/share/java prefix from Class-Path entries.
   * Add dependency on libcommon-compress-java.
+  * Move JGit Ant tasks into separate binary package. Avoids in most
+    use cases unnecessary dependency on Ant.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Thu, 20 Dec 2012 20:12:19 +0100
 
diff --git a/debian/control b/debian/control
index cd9838a..eed0694 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,21 @@ Description: Java implementation of GIT version control
   * Network protocols
   * Core version control algorithms
 
+Package: libjgit-ant-java
+Architecture: all
+Depends: libjgit-java (= ${source:Version}),
+         ${java:Depends},
+         ${misc:Depends}
+Description: Java implementation of GIT version control (Ant interface)
+ JGit is a lightweight, pure Java library implementing the Git version control
+ system:
+  * Repository access routines
+  * Network protocols
+  * Core version control algorithms
+ .
+ This package contains Ant tasks allowing build scripts to manipulate with
+ Git repositories through JGit library.
+
 Package: libjgit-java-doc
 Architecture: all
 Section: doc
diff --git a/debian/libjgit-ant-java.classpath b/debian/libjgit-ant-java.classpath
new file mode 100644
index 0000000..e8c27d4
--- /dev/null
+++ b/debian/libjgit-ant-java.classpath
@@ -0,0 +1 @@
+usr/share/java/org.eclipse.jgit.ant.jar org.eclipse.jgit.jar ant.jar
diff --git a/debian/libjgit-ant-java.lintian-overrides b/debian/libjgit-ant-java.lintian-overrides
new file mode 100644
index 0000000..f5528c0
--- /dev/null
+++ b/debian/libjgit-ant-java.lintian-overrides
@@ -0,0 +1 @@
+libjgit-ant-java: copyright-should-refer-to-common-license-file-for-gpl
diff --git a/debian/libjgit-ant-java.poms b/debian/libjgit-ant-java.poms
new file mode 100644
index 0000000..73f5cf8
--- /dev/null
+++ b/debian/libjgit-ant-java.poms
@@ -0,0 +1 @@
+org.eclipse.jgit.ant/pom.xml
diff --git a/debian/libjgit-java.classpath b/debian/libjgit-java.classpath
index a59d5b0..52c1a0a 100644
--- a/debian/libjgit-java.classpath
+++ b/debian/libjgit-java.classpath
@@ -1,4 +1,3 @@
 usr/share/java/org.eclipse.jgit.jar jsch.jar
-usr/share/java/org.eclipse.jgit.ant.jar org.eclipse.jgit.jar ant.jar
 usr/share/java/org.eclipse.jgit.http.server.jar org.eclipse.jgit.jar servlet-api-2.5.jar
 usr/share/java/org.eclipse.jgit.junit.jar org.eclipse.jgit.jar junit4.jar
diff --git a/debian/libjgit-java.poms b/debian/libjgit-java.poms
index 134777f..dfb0ea1 100644
--- a/debian/libjgit-java.poms
+++ b/debian/libjgit-java.poms
@@ -1,6 +1,6 @@
 pom.xml
 org.eclipse.jgit/pom.xml
-org.eclipse.jgit.ant/pom.xml
+org.eclipse.jgit.ant/pom.xml --ignore-pom
 org.eclipse.jgit.http.server/pom.xml
 org.eclipse.jgit.junit/pom.xml
 
diff --git a/debian/rules b/debian/rules
index 7ce7127..d55c43f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,11 +13,15 @@ DEB_MAVEN_INSTALL_DOC_TARGET :=
 install/libjgit-java::
 	mh_installpoms -plibjgit-java
 	mh_installjar -plibjgit-java -l org.eclipse.jgit/pom.xml org.eclipse.jgit/target/org.eclipse.jgit-*-r.jar
-	mh_installjar -plibjgit-java -l org.eclipse.jgit.ant/pom.xml org.eclipse.jgit.ant/target/org.eclipse.jgit.ant-*-r.jar
 	mh_installjar -plibjgit-java -l org.eclipse.jgit.http.server/pom.xml org.eclipse.jgit.http.server/target/org.eclipse.jgit.http.server-*-r.jar
 	mh_installjar -plibjgit-java -l org.eclipse.jgit.junit/pom.xml org.eclipse.jgit.junit/target/org.eclipse.jgit.junit-*-r.jar
 	mh_unpatchpoms -plibjgit-java
 
+install/libjgit-ant-java::
+	mh_installpoms -plibjgit-ant-java
+	mh_installjar -plibjgit-ant-java -l org.eclipse.jgit.ant/pom.xml org.eclipse.jgit.ant/target/org.eclipse.jgit.ant-*-r.jar
+	mh_unpatchpoms -plibjgit-ant-java
+
 install/jgit-cli::
 	mh_installpoms -pjgit-cli
 	mh_installjar -pjgit-cli -l org.eclipse.jgit.console/pom.xml org.eclipse.jgit.console/target/org.eclipse.jgit.console-*-r.jar

-- 
UNNAMED PROJECT