Merge ~nacc/ubuntu/+source/apache-log4j1.2:merge into ~ubuntu-server-dev/ubuntu/+source/apache-log4j1.2:ubuntu/devel

[Nish Aravamudan]

apache-log4j1.2 (1.2.17-7ubuntu1) xenial; urgency=medium

  * Merge from Debian unstable. Remaining changes:
    - d/{rules,control}: Remove dependency on bnd and don't add
      OSGi headers to jar file.
    - d/liblog4j1.2.manifest,control,rules: Add OSGi manifest for log4j
      using javahelper.
    - d/control,rules: Switch libmail-java -> libgnumail-java to avoid
      Maven in Ubuntu main.

 -- Nishanth Aravamudan <email address hidden> Wed, 17 Feb 2016 16:37:24 -0800

apache-log4j1.2 (1.2.17-7) unstable; urgency=medium

  * Team upload.
  * Transition to bnd 2.1.0.
  * Vcs-Browser: Use https.

 -- Markus Koschany <email address hidden> Tue, 17 Nov 2015 18:22:37 +0100

Unmerged commits

2888f21... by Nish Aravamudan on 2016-02-18

update-maintainer

2e45309... by Nish Aravamudan on 2016-02-18

changelog

a40e51f... by Nish Aravamudan on 2016-02-18

reconstruct-changelog

8070c51... by Nish Aravamudan on 2016-02-18

merge-changelogs

9dcdd39... by Nish Aravamudan on 2016-02-18

    - d/control,rules: Switch libmail-java -> libgnumail-java to avoid
      Maven in Ubuntu main.

1b5c83b... by Nish Aravamudan on 2016-02-18

    - d/liblog4j1.2.manifest,control,rules: Add OSGi manifest for log4j
      using javahelper.

2e66c4d... by Nish Aravamudan on 2016-02-18

  * Merge from Debian unstable. Remaining changes:
    - d/{rules,control}: Remove dependency on bnd and don't add
      OSGi headers to jar file.

339ce93... by Robie Basak on 2016-02-18

Import version 1.2.17-7

Imported using git-dsc-commit.

diff --git a/debian/README.Debian b/debian/README.Debian
index 018605a..f16bc77 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,11 +11,11 @@ simple program.
 
     import org.apache.log4j.Logger;
     import org.apache.log4j.BasicConfigurator;
-    
+
     public class Hello {
-    
+
       static Logger logger = Logger.getLogger(Hello.class);
-    
+
       public
       static
       void main(String argv[]) {
@@ -35,24 +35,24 @@ Refer to the javadoc documentation and the user manual on how to
 include log statements in your own code.
 
 
-==================   
+==================
 log4j dependencies
 ==================
-   
+
 Log4j is based on JDK 1.1 with the following additional requirements:
 
     ----------------------------
-    Package org.apache.log4j.xml 
+    Package org.apache.log4j.xml
     ----------------------------
 
     The DOMConfigurator is based on the DOM Level 1 API. The
     DOMConfigurator.configure(Element) method will work with any
     XML parser that will pass it a DOM tree.
-    
+
     The DOMConfigurator.configure(String filename) method and its variants
     require a JAXP compatible XMLparser, for example the Apache Xerces
     parser. Compiling the DOMConfigurator requires the presence of a
-    JAXP parser in the classpath.  
+    JAXP parser in the classpath.
 
     ------------
     SMTPAppender
diff --git a/debian/changelog b/debian/changelog
index bea7d9b..9f4ccd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+<<<<<<< debian/changelog
+=======
+apache-log4j1.2 (1.2.17-7ubuntu1) xenial; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/{rules,control}: Remove dependency on bnd and don't add
+      OSGi headers to jar file.
+    - d/liblog4j1.2.manifest,control,rules: Add OSGi manifest for log4j
+      using javahelper.
+    - d/control,rules: Switch libmail-java -> libgnumail-java to avoid
+      Maven in Ubuntu main.
+
+ -- Nishanth Aravamudan <[e-mail]>  Wed, 17 Feb 2016 16:37:24 -0800
+
+apache-log4j1.2 (1.2.17-7) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to bnd 2.1.0.
+  * Vcs-Browser: Use https.
+
+ -- Markus Koschany <[e-mail]>  Tue, 17 Nov 2015 18:22:37 +0100
+
+>>>>>>> debian/changelog
 apache-log4j1.2 (1.2.17-6ubuntu1) wily; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/control b/debian/control
index 6b2d9c1..c94f343 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: ant,
                maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/apache-log4j1.2
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/apache-log4j1.2
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/apache-log4j1.2
 Homepage: http://logging.apache.org/log4j/1.2/
 
 Package: liblog4j1.2-java
diff --git a/debian/liblog4j1.2-java-doc.doc-base b/debian/liblog4j1.2-java-doc.doc-base
index 96dcb25..45ed01c 100644
--- a/debian/liblog4j1.2-java-doc.doc-base
+++ b/debian/liblog4j1.2-java-doc.doc-base
@@ -1,7 +1,7 @@
 Document: liblog4j1.2-java-doc
 Title: Documenation for log4j 1.2
 Author: The Apache log4j team
-Abstract: This is the documentation for log4j, a logging library 
+Abstract: This is the documentation for log4j, a logging library
  for java. The documentation includes the javadoc API.
 Section: Programming