The following commit has been merged in the master branch:
commit d40a885f4ec678a0acf16c80a9c29302dc46be1a
Author: Jakub Adam <jakub.a...@ktknet.cz>
Date:   Thu Nov 10 22:59:47 2011 +0100

    Use Maven for build

diff --git a/debian/changelog b/debian/changelog
index 979e8fe..c3223d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jgit (1.1.0-2) UNRELEASED; urgency=low
+
+  * Rename source package to "jgit" as it is not dependent on Eclipse.
+  * Use Maven for building.
+  * Build org.eclipse.jgit.http.server. (Closes: #647930)
+  * Rename eclipse-jgit binary package to libjgit-java and install its jars 
into
+    /usr/share/java. (Closes: #647071)
+  * Build jgit console and package as jgit-cli.
+
+ -- Jakub Adam <jakub.a...@ktknet.cz>  Tue, 08 Nov 2011 21:16:30 +0100
+
 eclipse-jgit (1.1.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #600171)
diff --git a/debian/control b/debian/control
index 6e4ab7b..d0b5929 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,65 @@
-Source: eclipse-jgit
+Source: jgit
 Priority: optional
-Section: devel
+Section: java
 Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Niels Thykier <ni...@thykier.net>,
            Benjamin Drung <bdr...@ubuntu.com>,
            Jakub Adam <jakub.a...@ktknet.cz>
 Build-Depends: debhelper (>= 8~),
+               cdbs,
+               javahelper,
                default-jdk,
-               eclipse-pde (>= 3.7~exp),
-               javahelper (>= 0.32~),
-               unzip,
-               zip
+               libargs4j-java,
+               libbuild-helper-maven-plugin-java,
+               libhamcrest-java,
+               libjsch-java,
+               libmaven-antrun-plugin-java,
+               libmaven-javadoc-plugin-java,
+               libmaven-shade-plugin-java,
+               maven-debian-helper,
+               maven-repo-helper
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-java/eclipse-jgit.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/eclipse-jgit.git
 Homepage: http://www.eclipse.org/jgit/
 
-Package: eclipse-jgit
+Package: libjgit-java
 Architecture: all
-Depends: eclipse-platform (>= 3.7~exp),
+Depends: ${java:Depends},
          ${misc:Depends}
+Suggests: libjgit-java-doc
+Replaces: eclipse-jgit (<< 1.1.0-2~)
+Breaks: eclipse-jgit (<< 1.1.0-2~)
 Description: Java implementation of GIT for Eclipse
  JGit is a lightweight, pure Java library implementing the Git version control
  system:
   * Repository access routines
   * Network protocols
   * Core version control algorithms
+
+Package: libjgit-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libjgit-java
+Description: Java implementation of GIT for Eclipse
+ 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 the Javadoc API documentation.
+
+Package: jgit-cli
+Architecture: all
+Section: devel
+Depends: libjgit-java (= ${source:Version}),
+         ${java:Depends},
+         ${misc:Depends}
+Description: Java implementation of GIT for Eclipse - Command line interface
+ JGit is a lightweight, pure Java library implementing the Git version control
+ system.
+ .
+ This package provides command line interface for user interaction with jgit.
+
diff --git a/debian/eclipse-jgit.eh-install b/debian/eclipse-jgit.eh-install
deleted file mode 100644
index 2bb8804..0000000
--- a/debian/eclipse-jgit.eh-install
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.jgit
diff --git a/debian/eclipse.features b/debian/eclipse.features
deleted file mode 100644
index 2bb8804..0000000
--- a/debian/eclipse.features
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.jgit
diff --git a/debian/jgit-cli.classpath b/debian/jgit-cli.classpath
new file mode 100644
index 0000000..44aa1a1
--- /dev/null
+++ b/debian/jgit-cli.classpath
@@ -0,0 +1,4 @@
+usr/share/java/org.eclipse.jgit.console.jar 
/usr/share/java/org.eclipse.jgit.jar /usr/share/java/jsch.jar
+usr/share/java/org.eclipse.jgit.iplog.jar /usr/share/java/org.eclipse.jgit.jar
+usr/share/java/org.eclipse.jgit.pgm.jar /usr/share/java/org.eclipse.jgit.jar 
/usr/share/java/org.eclipse.jgit.ui.jar /usr/share/java/args4j.jar 
/usr/share/java/org.eclipse.jgit.iplog.jar
+usr/share/java/org.eclipse.jgit.ui.jar /usr/share/java/org.eclipse.jgit.jar 
/usr/share/java/jsch.jar
diff --git a/debian/jgit-cli.manpages b/debian/jgit-cli.manpages
new file mode 100644
index 0000000..ad65b65
--- /dev/null
+++ b/debian/jgit-cli.manpages
@@ -0,0 +1 @@
+debian/jgit.1
diff --git a/debian/jgit-cli.poms b/debian/jgit-cli.poms
new file mode 100644
index 0000000..6460a70
--- /dev/null
+++ b/debian/jgit-cli.poms
@@ -0,0 +1,5 @@
+org.eclipse.jgit.console/pom.xml
+org.eclipse.jgit.iplog/pom.xml
+org.eclipse.jgit.pgm/pom.xml
+org.eclipse.jgit.ui/pom.xml
+
diff --git a/debian/jgit.1 b/debian/jgit.1
new file mode 100644
index 0000000..935760f
--- /dev/null
+++ b/debian/jgit.1
@@ -0,0 +1,78 @@
+.TH JGIT 1 "November  11, 2011"
+.\" Please adjust this date whenever revising the manpage.
+.SH NAME
+jgit \- Pure Java GIT version control system implementation
+.SH SYNOPSIS
+.B jgit --git-dir GIT_DIR --help (-h) --show-stack-trace command [ARG ...]
+.SH DESCRIPTION
+.B JGit 
+is an implementaion of GIT VCS written in Java language.
+.PP
+.B Git 
+is a fast, scalable, distributed revision control system with an unusually rich
+command set that provides both high-level operations and full access to 
internals.
+.SH OPTIONS
+.TP
+.B \-\-git\-dir GIT_DIR
+Set the git repository to operate on
+.TP
+.B \-\-help (\-h)
+Display help text
+.TP
+.B \-\-show\-stack\-trace
+display the Java stack trace on exceptions
+.PP
+The most commonly used commands are:
+.TP 10
+.B add
+Add file contents to the index
+.TP 10
+.B branch
+List, create, or delete branches
+.TP 10
+.B checkout
+Checkout a branch to the working tree
+.TP 10
+.B clone
+Clone a repository into a new directory
+.TP 10
+.B commit
+Record changes to the repository
+.TP 10
+.B daemon
+Export repositories over git://
+.TP 10
+.B diff
+Show diffs
+.TP 10
+.B fetch
+Update remote refs from another repository
+.TP 10
+.B init
+Create an empty git repository
+.TP 10
+.B log
+View commit history
+.TP 10
+.B merge
+Merges two developement histories
+.TP 10
+.B push
+Update remote repository from local refs
+.TP 10
+.B rm
+Stop tracking a file
+.TP 10
+.B tag
+Create a tag
+.TP 10
+.B version
+Display the version of jgit
+.PP
+.SH AUTHOR
+JGit was written by Eclipse JGIT Project contributors,
+.B http://www.eclipse.org/jgit
+.PP
+This manual page was written by Jakub Adam <jakub.a...@ktknet.cz>,
+for the Debian project (but may be used by others).
+
diff --git a/debian/libjgit-java.classpath b/debian/libjgit-java.classpath
new file mode 100644
index 0000000..49c5134
--- /dev/null
+++ b/debian/libjgit-java.classpath
@@ -0,0 +1,4 @@
+usr/share/java/org.eclipse.jgit.jar /usr/share/java/jsch.jar
+usr/share/java/org.eclipse.jgit.ant.jar /usr/share/java/org.eclipse.jgit.jar 
/usr/share/java/ant.jar
+usr/share/java/org.eclipse.jgit.http.server.jar 
/usr/share/java/org.eclipse.jgit.jar /usr/share/java/servlet-api.jar
+usr/share/java/org.eclipse.jgit.junit.jar /usr/share/java/org.eclipse.jgit.jar 
/usr/share/java/junit4.jar
diff --git a/debian/libjgit-java.poms b/debian/libjgit-java.poms
new file mode 100644
index 0000000..134777f
--- /dev/null
+++ b/debian/libjgit-java.poms
@@ -0,0 +1,6 @@
+pom.xml
+org.eclipse.jgit/pom.xml
+org.eclipse.jgit.ant/pom.xml
+org.eclipse.jgit.http.server/pom.xml
+org.eclipse.jgit.junit/pom.xml
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..210139b
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,23 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+#   in this case, elements that match are transformed using
+#   the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+#   junit junit jar s/3\\..*/3.x/
+
+args4j args4j-site pom 2.0.16 * *
+args4j args4j jar 2.0.16 * *
+junit junit jar s/4\..*/4.x/ * *
+s/ant/org.apache.ant/ * * s/.*/debian/ * *
+s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * *
diff --git a/debian/rules b/debian/rules
index 24e9f72..84025a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,32 @@
 #!/usr/bin/make -f
 
-# Note: We use forceContextQualifier because the docs plugins use custom build
-#       scripts and don't work otherwise.
-BUILD_OPTIONS := -DjavacTarget=1.5 -DjavacSource=1.5 
-DforceContextQualifier=v20101002
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-export JAVA_HOME := /usr/lib/jvm/default-java
+VER := 1.1.0.201109151100-r
 
-%:
-       dh $@ --with eclipse-helper
+JAVA_HOME := /usr/lib/jvm/default-java
+
+DEB_MAVEN_DOC_TARGET :=
+DEB_MAVEN_INSTALL_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-$(VER).jar
+       mh_installjar -plibjgit-java -l org.eclipse.jgit.ant/pom.xml 
org.eclipse.jgit.ant/target/org.eclipse.jgit.ant-$(VER).jar
+       mh_installjar -plibjgit-java -l org.eclipse.jgit.http.server/pom.xml 
org.eclipse.jgit.http.server/target/org.eclipse.jgit.http.server-$(VER).jar
+       mh_installjar -plibjgit-java -l org.eclipse.jgit.junit/pom.xml 
org.eclipse.jgit.junit/target/org.eclipse.jgit.junit-$(VER).jar
+       mh_unpatchpoms -plibjgit-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-$(VER).jar
+       mh_installjar -pjgit-cli -l org.eclipse.jgit.iplog/pom.xml 
org.eclipse.jgit.iplog/target/org.eclipse.jgit.iplog-$(VER).jar
+       mh_installjar -pjgit-cli -l org.eclipse.jgit.pgm/pom.xml 
org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-$(VER).jar
+       mh_installjar -pjgit-cli -l org.eclipse.jgit.ui/pom.xml 
org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-$(VER).jar
+       mh_unpatchpoms -pjgit-cli
+
+       dh_install -pjgit-cli org.eclipse.jgit.pgm/jgit.sh /usr/bin
+       mv debian/jgit-cli/usr/bin/jgit.sh debian/jgit-cli/usr/bin/jgit
 
-override_jh_compilefeatures:
-       jh_compilefeatures --build-opts '$(BUILD_OPTIONS)'

-- 
UNNAMED PROJECT

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to