[SCM] UNNAMED PROJECT branch, master, updated. debian/1.1.0-1-14-gaa122a8
The following commit has been merged in the master branch: commit cd20e6d5766c8330b5723f5affd90af401d9fdbe Author: Jakub Adam jakub.a...@ktknet.cz Date: Fri Dec 23 21:21:48 2011 +0100 Updated d/changelog diff --git a/debian/changelog b/debian/changelog index c3223d1..a04d3a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +jgit (1.2.0-1) UNRELEASED; urgency=low + + * New Upstream release. + + -- Jakub Adam jakub.a...@ktknet.cz Fri, 23 Dec 2011 21:21:25 +0100 + jgit (1.1.0-2) UNRELEASED; urgency=low * Rename source package to jgit as it is not dependent on Eclipse. -- 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
[SCM] UNNAMED PROJECT branch, master, updated. debian/1.1.0-1-14-gaa122a8
The following commit has been merged in the master branch: commit de251d3b50a13db1efc1da1e97fa338e09c1ffec Author: Jakub Adam jakub.a...@ktknet.cz Date: Fri Dec 23 21:42:45 2011 +0100 Add libclirr-maven-plugin-java to Build-Depends diff --git a/debian/control b/debian/control index c9fa1cd..78a616a 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ Build-Depends: debhelper (= 8~), libjsch-java, libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java, + libclirr-maven-plugin-java, maven-debian-helper, maven-repo-helper Standards-Version: 3.9.2 -- 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
[SCM] UNNAMED PROJECT branch, master, updated. debian/1.1.0-1-14-gaa122a8
The following commit has been merged in the master branch: commit f51cce92211fa9d1b4df445598047dbd611b1aba Merge: 5f0aa0564b88ad8e722c1b35ad254c9977e7db06 bf45f07aa8529a72308a0b5b17c61b8d81bd99ae Author: Jakub Adam jakub.a...@ktknet.cz Date: Fri Dec 23 21:12:56 2011 +0100 Merge commit 'upstream/1.2.0' -- 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
[SCM] UNNAMED PROJECT branch, master, updated. debian/1.1.0-1-14-gaa122a8
The following commit has been merged in the master branch: commit 11514af1a450b259d1d14f9136c3f4d0967ab9c5 Author: Jakub Adam jakub.a...@ktknet.cz Date: Fri Dec 23 21:34:51 2011 +0100 Updated build customization patch for new upstream release diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch index de49027..8f8bf43 100644 --- a/debian/patches/debian-custom-build.patch +++ b/debian/patches/debian-custom-build.patch @@ -15,12 +15,12 @@ Subject: debian-custom-build org.eclipse.jgit.pgm/jgit.sh |2 +- org.eclipse.jgit.pgm/pom.xml |4 +- org.eclipse.jgit.storage.dht/pom.xml | 12 - org.eclipse.jgit/pom.xml |8 ++-- - pom.xml| 31 ++- - 7 files changed, 33 insertions(+), 32 deletions(-) + org.eclipse.jgit/pom.xml |8 +++--- + pom.xml| 29 ++- + 7 files changed, 32 insertions(+), 31 deletions(-) diff --git a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml -index 5a1f6be..53c608a 100644 +index 0fcd4c4..03394a7 100644 --- a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml +++ b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml @@ -88,7 +88,7 @@ @@ -42,7 +42,7 @@ index 5a1f6be..53c608a 100644 plugin artifactIdmaven-jar-plugin/artifactId diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml -index 1b3315d..f2a6057 100644 +index a517ce9..41dfbe7 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -97,7 +97,7 @@ @@ -77,7 +77,7 @@ index f18e85f..b83f2b1 100644 java=java diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml -index 7730f46..6b595e8 100644 +index e315b14..2c2d208 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -118,7 +118,7 @@ @@ -99,7 +99,7 @@ index 7730f46..6b595e8 100644 /build /project diff --git a/org.eclipse.jgit.storage.dht/pom.xml b/org.eclipse.jgit.storage.dht/pom.xml -index 50f5ea7..d80e986 100644 +index 3de3f80..e4579b7 100644 --- a/org.eclipse.jgit.storage.dht/pom.xml +++ b/org.eclipse.jgit.storage.dht/pom.xml @@ -95,7 +95,7 @@ @@ -147,11 +147,11 @@ index 50f5ea7..d80e986 100644 /executions - /plugin + /plugin-- - /plugins - /build - /project + + plugin + groupIdorg.codehaus.mojo/groupId diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml -index a99f1e4..77e518d 100644 +index f4ad4b6..2e963c3 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -114,7 +114,7 @@ @@ -172,8 +172,8 @@ index a99f1e4..77e518d 100644 plugin artifactIdmaven-jar-plugin/artifactId -@@ -145,13 +145,13 @@ - /plugins +@@ -151,13 +151,13 @@ + pluginManagement plugins -plugin @@ -189,38 +189,38 @@ index a99f1e4..77e518d 100644 /pluginManagement /build diff --git a/pom.xml b/pom.xml -index 9bba656..d3ca0f8 100644 +index b9223f0..ef2d0fe 100644 --- a/pom.xml +++ b/pom.xml -@@ -168,11 +168,11 @@ - version2.2/version +@@ -177,11 +177,11 @@ + version2.4.1/version /plugin -plugin +!--plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-shade-plugin/artifactId - version1.2/version + version1.5/version -/plugin +/plugin-- plugin groupIdorg.apache.maven.plugins/groupId -@@ -186,11 +186,11 @@ - version2.1/version +@@ -195,11 +195,11 @@ + version2.3/version /plugin -plugin +!--plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-source-plugin/artifactId - version2.1.1/version + version2.1.2/version -/plugin +/plugin-- plugin groupIdorg.apache.maven.plugins/groupId -@@ -210,7 +210,7 @@ +@@ -219,7 +219,7 @@ version1.5/version /plugin @@ -229,7 +229,7 @@ index 9bba656..d3ca0f8 100644 groupIdorg.codehaus.mojo/groupId artifactIdfindbugs-maven-plugin/artifactId version2.3.2/version -@@ -225,9 +225,9 @@ +@@ -234,9 +234,9 @@ /goals /execution /executions @@ -240,26 +240,17 @@ index 9bba656..d3ca0f8 100644 +!--plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-pmd-plugin/artifactId - version2.5/version -@@ -245,7 +245,7 @@ + version2.6/version +@@ -254,7 +254,7 @@ /goals /execution /executions -/plugin +/plugin-- -
[SCM] UNNAMED PROJECT branch, master, updated. debian/1.1.0-1-14-gaa122a8
The following commit has been merged in the master branch: commit aa122a8e0ace63bd692481462624713fe842484f Author: Jakub Adam jakub.a...@ktknet.cz Date: Fri Dec 23 22:17:31 2011 +0100 Remove VER variable from d/rules diff --git a/debian/rules b/debian/rules index ac37939..b0d4532 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/maven.mk -VER := 1.1.0.201109151100-r - JAVA_HOME := /usr/lib/jvm/default-java DEB_MAVEN_DOC_TARGET := @@ -14,18 +12,18 @@ 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-$(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_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/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_installjar -pjgit-cli -l org.eclipse.jgit.console/pom.xml org.eclipse.jgit.console/target/org.eclipse.jgit.console-*-r.jar + mh_installjar -pjgit-cli -l org.eclipse.jgit.iplog/pom.xml org.eclipse.jgit.iplog/target/org.eclipse.jgit.iplog-*-r.jar + mh_installjar -pjgit-cli -l org.eclipse.jgit.pgm/pom.xml org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-*-r.jar + mh_installjar -pjgit-cli -l org.eclipse.jgit.ui/pom.xml org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-*-r.jar mh_unpatchpoms -pjgit-cli dh_install -pjgit-cli org.eclipse.jgit.pgm/jgit.sh /usr/bin -- 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
