[SCM] UNNAMED PROJECT branch, master, updated. debian/2.0.0-1-8-g99624f0
Jakub Adam
jakub.adam at ktknet.cz
Thu Sep 27 19:08:58 UTC 2012
The following commit has been merged in the master branch:
commit 99624f00488e5cc6865740a47761c5ed12e92951
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Thu Sep 27 17:47:40 2012 +0200
Refreshed debian-custom-build.patch
diff --git a/debian/changelog b/debian/changelog
index 16202bd..aee3869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
jgit (2.1.0-1) UNRELEASED; urgency=low
* New Upstream release.
+ * Refreshed debian-custom-build.patch.
-- Jakub Adam <jakub.adam at ktknet.cz> Thu, 27 Sep 2012 16:54:42 +0200
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 50a5be9..80e0dd8 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -6,43 +6,18 @@ Subject: debian-custom-build
- disable findbugs-maven-plugin (not in Debian)
- disable maven-pmd-plugin (not in Debian)
- do not build org.eclipse.jgit.http.test (requires newer Jetty than present in Debian)
-- do not build org.eclipse.jgit.storage.dht (requires packaging bug in libprotobuf-java fixed)
- add org.eclipse.jgit.pgm to jgit console classpath
- don't build jgit console all-in-one executable
---
- .../pom.xml | 4 +--
- org.eclipse.jgit.http.server/pom.xml | 4 +--
- org.eclipse.jgit.pgm/jgit.sh | 2 +-
- org.eclipse.jgit.pgm/pom.xml | 6 ++--
- org.eclipse.jgit.storage.dht/pom.xml | 12 +++----
- org.eclipse.jgit/pom.xml | 8 ++---
- pom.xml | 33 ++++++++++----------
- 7 files changed, 35 insertions(+), 34 deletions(-)
+ org.eclipse.jgit.http.server/pom.xml | 4 ++--
+ org.eclipse.jgit.pgm/jgit.sh | 2 +-
+ org.eclipse.jgit.pgm/pom.xml | 6 +++---
+ org.eclipse.jgit/pom.xml | 8 ++++----
+ pom.xml | 27 ++++++++++++++-------------
+ 5 files changed, 24 insertions(+), 23 deletions(-)
-diff --git a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml
-index 746d2d6..5f983f9 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 @@
- </resources>
-
- <plugins>
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
-@@ -106,7 +106,7 @@
- </configuration>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
-index ede436a..fbc1d2a 100644
+index a7ec27d..e2a2184 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -97,7 +97,7 @@
@@ -77,7 +52,7 @@ index 6b9ce40..3700d4f 100644
java=java
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
-index 2c598b2..05c6316 100644
+index b81cd89..479254d 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -105,7 +105,7 @@
@@ -107,60 +82,8 @@ index 2c598b2..05c6316 100644
</plugins>
</build>
</project>
-diff --git a/org.eclipse.jgit.storage.dht/pom.xml b/org.eclipse.jgit.storage.dht/pom.xml
-index b7f81ad..da1d0a3 100644
---- a/org.eclipse.jgit.storage.dht/pom.xml
-+++ b/org.eclipse.jgit.storage.dht/pom.xml
-@@ -95,7 +95,7 @@
- </resources>
-
- <plugins>
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
-@@ -113,7 +113,7 @@
- </configuration>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
-@@ -123,7 +123,7 @@
- </archive>
- </configuration>
- </plugin>
-- <plugin>
-+ <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
-@@ -137,9 +137,9 @@
- </goals>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
-- <plugin>
-+ <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
-@@ -156,7 +156,7 @@
- </goals>
- </execution>
- </executions>
-- </plugin>
-+ </plugin-->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
-index edd522b..1869fad 100644
+index 22a7c76..32b50f0 100644
--- a/org.eclipse.jgit/pom.xml
+++ b/org.eclipse.jgit/pom.xml
@@ -115,7 +115,7 @@
@@ -198,47 +121,47 @@ index edd522b..1869fad 100644
</pluginManagement>
</build>
diff --git a/pom.xml b/pom.xml
-index fdf5147..5a46f75 100644
+index 0a58a6d..dd47322 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -216,11 +216,11 @@
- <version>2.4.1</version>
+@@ -215,11 +215,11 @@
+ <version>2.5</version>
</plugin>
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.5</version>
+ <version>1.7.1</version>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-@@ -234,11 +234,11 @@
- <version>2.3</version>
+@@ -233,11 +233,11 @@
+ <version>2.5</version>
</plugin>
- <plugin>
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
+ <version>2.2</version>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-@@ -258,7 +258,7 @@
- <version>1.5</version>
+@@ -257,7 +257,7 @@
+ <version>1.7</version>
</plugin>
- <plugin>
+ <!--plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
-@@ -273,9 +273,9 @@
+ <version>2.5.2</version>
+@@ -272,9 +272,9 @@
</goals>
</execution>
</executions>
@@ -249,8 +172,8 @@ index fdf5147..5a46f75 100644
+ <!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.6</version>
-@@ -293,7 +293,7 @@
+ <version>2.7.1</version>
+@@ -292,7 +292,7 @@
</goals>
</execution>
</executions>
@@ -259,7 +182,7 @@ index fdf5147..5a46f75 100644
<plugin>
<groupId>org.codehaus.mojo</groupId>
-@@ -363,6 +363,7 @@
+@@ -362,6 +362,7 @@
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
</links>
@@ -267,7 +190,7 @@ index fdf5147..5a46f75 100644
</configuration>
<executions>
<execution>
-@@ -373,7 +374,7 @@
+@@ -372,7 +373,7 @@
</execution>
</executions>
</plugin>
@@ -276,7 +199,7 @@ index fdf5147..5a46f75 100644
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<inherited>true</inherited>
-@@ -386,7 +387,7 @@
+@@ -385,7 +386,7 @@
</goals>
</execution>
</executions>
@@ -285,17 +208,7 @@ index fdf5147..5a46f75 100644
</plugins>
</build>
-@@ -471,20 +472,20 @@
-
- <modules>
- <module>org.eclipse.jgit</module>
-- <module>org.eclipse.jgit.generated.storage.dht.proto</module>
-- <module>org.eclipse.jgit.storage.dht</module>
-+ <!--module>org.eclipse.jgit.generated.storage.dht.proto</module-->
-+ <!--module>org.eclipse.jgit.storage.dht</module-->
- <module>org.eclipse.jgit.ant</module>
- <module>org.eclipse.jgit.ui</module>
- <module>org.eclipse.jgit.http.server</module>
+@@ -470,11 +471,11 @@
<module>org.eclipse.jgit.iplog</module>
<module>org.eclipse.jgit.pgm</module>
<module>org.eclipse.jgit.junit</module>
@@ -306,9 +219,7 @@ index fdf5147..5a46f75 100644
+ <!--module>org.eclipse.jgit.test</module-->
<module>org.eclipse.jgit.ant.test</module>
- <module>org.eclipse.jgit.http.test</module>
-- <module>org.eclipse.jgit.storage.dht.test</module>
+ <!--module>org.eclipse.jgit.http.test</module-->
-+ <!--module>org.eclipse.jgit.storage.dht.test</module-->
<module>org.eclipse.jgit.pgm.test</module>
</modules>
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list