[SCM] UNNAMED PROJECT branch, master, updated. debian/1.3.0-2-6-gb74c4c7

Jakub Adam jakub.adam at ktknet.cz
Sat Jun 23 21:09:10 UTC 2012 

The following commit has been merged in the master branch:
commit cf9ccd1c32638571386353f1af18a9a6fb9c9542
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jun 23 16:17:18 2012 +0200

    Refreshed d/patches/debian-custom-build.patch

diff --git a/debian/changelog b/debian/changelog
index e8d7996..604c644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jgit (2.0.0-1) UNRELEASED; urgency=low
 
   * New Upstream release.
+  * Refreshed d/patches/debian-custom-build.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 23 Jun 2012 16:15:32 +0200
 
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index 8f8bf43..50a5be9 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -10,17 +10,17 @@ Subject: debian-custom-build
 - 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 +-
+ .../pom.xml                                        |    4 +--
+ org.eclipse.jgit.http.server/pom.xml               |    4 +--
  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                                            |   29 ++++++++++---------
- 7 files changed, 32 insertions(+), 31 deletions(-)
+ 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(-)
 
 diff --git a/org.eclipse.jgit.generated.storage.dht.proto/pom.xml b/org.eclipse.jgit.generated.storage.dht.proto/pom.xml
-index 0fcd4c4..03394a7 100644
+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 @@
@@ -42,7 +42,7 @@ index 0fcd4c4..03394a7 100644
        <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 a517ce9..41dfbe7 100644
+index ede436a..fbc1d2a 100644
 --- a/org.eclipse.jgit.http.server/pom.xml
 +++ b/org.eclipse.jgit.http.server/pom.xml
 @@ -97,7 +97,7 @@
@@ -64,10 +64,10 @@ index a517ce9..41dfbe7 100644
        <plugin>
          <artifactId>maven-jar-plugin</artifactId>
 diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh
-index f18e85f..b83f2b1 100644
+index 6b9ce40..3700d4f 100644
 --- a/org.eclipse.jgit.pgm/jgit.sh
 +++ b/org.eclipse.jgit.pgm/jgit.sh
-@@ -85,7 +85,7 @@ Darwin)
+@@ -86,7 +86,7 @@ Darwin)
  	;;
  esac
  
@@ -77,19 +77,28 @@ index f18e85f..b83f2b1 100644
  
  java=java
 diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
-index e315b14..2c2d208 100644
+index 2c598b2..05c6316 100644
 --- a/org.eclipse.jgit.pgm/pom.xml
 +++ b/org.eclipse.jgit.pgm/pom.xml
-@@ -118,7 +118,7 @@
+@@ -105,7 +105,7 @@
+       </dependencies>
+     </profile>
+   </profiles>
+-
++	
+   <build>
+     <sourceDirectory>src/</sourceDirectory>
+ 
+@@ -124,7 +124,7 @@
      </resources>
  
      <plugins>
 -      <plugin>
 +      <!--plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-shade-plugin</artifactId>
-         <executions>
-@@ -187,7 +187,7 @@
+         <artifactId>maven-jar-plugin</artifactId>
+         <configuration>
+           <archive>
+@@ -237,7 +237,7 @@
              </configuration>
            </execution>
          </executions>
@@ -99,7 +108,7 @@ index e315b14..2c2d208 100644
    </build>
  </project>
 diff --git a/org.eclipse.jgit.storage.dht/pom.xml b/org.eclipse.jgit.storage.dht/pom.xml
-index 3de3f80..e4579b7 100644
+index b7f81ad..da1d0a3 100644
 --- a/org.eclipse.jgit.storage.dht/pom.xml
 +++ b/org.eclipse.jgit.storage.dht/pom.xml
 @@ -95,7 +95,7 @@
@@ -151,10 +160,10 @@ index 3de3f80..e4579b7 100644
           <plugin>
              <groupId>org.codehaus.mojo</groupId>
 diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml
-index f4ad4b6..2e963c3 100644
+index edd522b..1869fad 100644
 --- a/org.eclipse.jgit/pom.xml
 +++ b/org.eclipse.jgit/pom.xml
-@@ -114,7 +114,7 @@
+@@ -115,7 +115,7 @@
          </executions>
        </plugin>
  
@@ -163,7 +172,7 @@ index f4ad4b6..2e963c3 100644
          <groupId>org.apache.maven.plugins</groupId>
          <artifactId>maven-source-plugin</artifactId>
          <inherited>true</inherited>
-@@ -132,7 +132,7 @@
+@@ -133,7 +133,7 @@
              </configuration>
            </execution>
          </executions>
@@ -172,7 +181,7 @@ index f4ad4b6..2e963c3 100644
  
        <plugin>
          <artifactId>maven-jar-plugin</artifactId>
-@@ -151,13 +151,13 @@
+@@ -152,13 +152,13 @@
  
      <pluginManagement>
        <plugins>
@@ -189,10 +198,10 @@ index f4ad4b6..2e963c3 100644
      </pluginManagement>
    </build>
 diff --git a/pom.xml b/pom.xml
-index b9223f0..ef2d0fe 100644
+index fdf5147..5a46f75 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -177,11 +177,11 @@
+@@ -216,11 +216,11 @@
            <version>2.4.1</version>
          </plugin>
  
@@ -206,7 +215,7 @@ index b9223f0..ef2d0fe 100644
  
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
-@@ -195,11 +195,11 @@
+@@ -234,11 +234,11 @@
            <version>2.3</version>
          </plugin>
  
@@ -220,7 +229,7 @@ index b9223f0..ef2d0fe 100644
  
          <plugin>
            <groupId>org.apache.maven.plugins</groupId>
-@@ -219,7 +219,7 @@
+@@ -258,7 +258,7 @@
            <version>1.5</version>
          </plugin>
  
@@ -229,7 +238,7 @@ index b9223f0..ef2d0fe 100644
            <groupId>org.codehaus.mojo</groupId>
            <artifactId>findbugs-maven-plugin</artifactId>
            <version>2.3.2</version>
-@@ -234,9 +234,9 @@
+@@ -273,9 +273,9 @@
                </goals>
              </execution>
            </executions>
@@ -241,7 +250,7 @@ index b9223f0..ef2d0fe 100644
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-pmd-plugin</artifactId>
            <version>2.6</version>
-@@ -254,7 +254,7 @@
+@@ -293,7 +293,7 @@
                </goals>
              </execution>
            </executions>
@@ -250,7 +259,7 @@ index b9223f0..ef2d0fe 100644
  
          <plugin>
            <groupId>org.codehaus.mojo</groupId>
-@@ -324,6 +324,7 @@
+@@ -363,6 +363,7 @@
            <links>
              <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
            </links>
@@ -258,7 +267,25 @@ index b9223f0..ef2d0fe 100644
          </configuration>
          <executions>
            <execution>
-@@ -418,20 +419,20 @@
+@@ -373,7 +374,7 @@
+           </execution>
+         </executions>
+       </plugin>
+-      <plugin>
++      <!--plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+         <inherited>true</inherited>
+@@ -386,7 +387,7 @@
+             </goals>
+           </execution>
+         </executions>
+-      </plugin>
++      </plugin-->
+     </plugins>
+   </build>
+ 
+@@ -471,20 +472,20 @@
  
    <modules>
      <module>org.eclipse.jgit</module>
@@ -282,7 +309,6 @@ index b9223f0..ef2d0fe 100644
 -    <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>
  
- </project>
--- 

-- 
UNNAMED PROJECT

More information about the pkg-java-commits mailing list