[qpid-java] 04/09: Use gbp pq

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository qpid-java.

commit bd145dc60c2bb10b7eecf44eee0860db77cc4e79
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sat Sep 30 00:21:35 2017 +0100

    Use gbp pq
---
 debian/patches/bcel.patch | 22 +++++++++++++---------
 debian/patches/pom.patch  | 37 +++++++++++++++++++------------------
 debian/patches/series     |  1 -
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/debian/patches/bcel.patch b/debian/patches/bcel.patch
index 0c85e72..19edb87 100644
--- a/debian/patches/bcel.patch
+++ b/debian/patches/bcel.patch
@@ -1,10 +1,14 @@
-Subject: Rename of BCEL constant classes
- org.apache.bcel.Constants has been depredated in favour of
- org.apache.bcel.Const
-Forwarded: No
-Author: Christopher Hoskin <christopher.hoskin at gmail.com>
-Last-Update: 2016-10-08
+From: Christopher Hoskin <mans0954 at debian.org>
+Date: Sat, 30 Sep 2017 00:20:35 +0100
+Subject: Rename of BCEL constant classes org.apache.bcel.Constants has been
+ depredated in favour of org.apache.bcel.Const
 
+---
+ .../manager/ldap/LDAPSSLSocketFactoryGenerator.java  | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
+index 6aa900c..09383bd 100644
 --- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
 +++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
 @@ -20,10 +20,10 @@
@@ -22,7 +26,7 @@ Last-Update: 2016-10-08
  
  import java.io.ByteArrayOutputStream;
  import java.io.IOException;
-@@ -32,12 +32,12 @@
+@@ -32,12 +32,12 @@ import java.lang.reflect.Field;
  import javax.net.SocketFactory;
  import javax.net.ssl.SSLSocketFactory;
  
@@ -37,7 +41,7 @@ Last-Update: 2016-10-08
  import org.apache.bcel.generic.InstructionFactory;
  import org.apache.bcel.generic.InstructionList;
  import org.apache.bcel.generic.MethodGen;
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ public class LDAPSSLSocketFactoryGenerator
          createSslContextStaticField(classGen, constantPoolGen);
          createGetDefaultStaticMethod(classGen, constantPoolGen, factory);
  
@@ -46,7 +50,7 @@ Last-Update: 2016-10-08
  
          JavaClass javaClass = classGen.getJavaClass();
          ByteArrayOutputStream out = null;
-@@ -167,13 +167,13 @@
+@@ -167,13 +167,13 @@ public class LDAPSSLSocketFactoryGenerator
                              constantPoolGen);
  
          il.append(instructionFactory.createNew(classGen.getClassName()));
diff --git a/debian/patches/pom.patch b/debian/patches/pom.patch
index 73ee35a..152c977 100644
--- a/debian/patches/pom.patch
+++ b/debian/patches/pom.patch
@@ -1,23 +1,24 @@
-Subject: Patch ./pom.xml to build and test on Sid
- Comment out modules:
-  * jdbc-provider-bone broker plugin (depends on BoneCP which is not packaged
-    and has been depricated by upstream in favour of HikariCP)
-  * jca/rar (depends on maven-rar-plugin, not packaged)
-  * bdbstore, bdbstore/systests (depends on Oracle Berkeley DB Java Edition v5,
-    Sid has v3 packaged)
- Exclude from compilation:
-  * GeronimoTransactionManagerLocator.java (Depends on Geronimo classes not
-    packaged for Debian)
-  * VirtualHostMessageStoreTest.java (Depends indirectly on Berkeley DB)
- Exclude tests:
-  * StartupAppenderTest.java - test fails, needs investigation
-  * AppenderUtilsTest.java - test fails, needs investigation
- Set useIncrementalCompilation to false (workaround for 
+From: Christopher Hoskin <mans0954 at debian.org>
+Date: Sat, 30 Sep 2017 00:20:35 +0100
+Subject: Patch ./pom.xml to build and test on Sid Comment out modules: *
+ jdbc-provider-bone broker plugin (depends on BoneCP which is not packaged
+ and has been depricated by upstream in favour of HikariCP) * jca/rar
+ (depends on maven-rar-plugin, not packaged) * bdbstore,
+ bdbstore/systests (depends on Oracle Berkeley DB Java Edition v5,
+ Sid has v3 packaged) Exclude from compilation: *
+ GeronimoTransactionManagerLocator.java (Depends on Geronimo classes not
+ packaged for Debian) * VirtualHostMessageStoreTest.java (Depends indirectly
+ on Berkeley DB) Exclude tests: * StartupAppenderTest.java - test fails,
+ needs investigation * AppenderUtilsTest.java - test fails,
+ needs investigation Set useIncrementalCompilation to false (workaround for
  https://issues.apache.org/jira/browse/MCOMPILER-236).
-Forwarded: not-needed
-Author: Christopher Hoskin <christopher.hoskin at gmail.com>
-Last-Update: 2016-10-08
 
+---
+ pom.xml | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index cc8b8d4..b782d07 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -178,7 +178,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 6989a31..34ba3c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 pom.patch
 bcel.patch
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/qpid-java.git