diff --git a/debian/changelog b/debian/changelog
index 8c4146c..048867a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+<<<<<<< debian/changelog
+=======
+libgnumail-java (1.1.2-10ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Don't use bnd to generate OSGi metadata (LP #1126567).
+    - d/p/add-osgi-metadata.patch: Drop requirement for javax.activiation,
+      fixing FTBFS in eclipse-* packages.
+  * d/r: use old jar location since we do not use bnd.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 17 Feb 2016 16:25:17 -0800
+
+libgnumail-java (1.1.2-10) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to bnd 2.1.0. Fix obsolete bnd parameter syntax in
+    debian/rules.
+  * wrap-and-sort -sa.
+  * Declare compliance with Debian Policy 3.9.6.
+
+ -- Markus Koschany <apo@debian.org>  Tue, 17 Nov 2015 17:20:05 +0100
+
+>>>>>>> debian/changelog
 libgnumail-java (1.1.2-9ubuntu3) trusty; urgency=medium
 
   * d/p/add-osgi-metadata.patch: Drop requirement for javax.activiation,
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 7bf8f9d..afb6528 100644
--- a/debian/control
+++ b/debian/control
@@ -3,33 +3,56 @@ Section: java
 Priority: optional
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+<<<<<<< debian/control
 Uploaders: Torsten Werner <twerner@debian.org>, Jakub Adam <jakub.adam@ktknet.cz>
 Build-Depends: debhelper (>= 8), cdbs (>= 0.4.5.3), ant, maven-repo-helper
 Build-Depends-Indep: default-jdk, libgnuinet-java, default-jdk-doc
 Standards-Version: 3.9.4
+=======
+Uploaders:
+ Torsten Werner <twerner@debian.org>,
+ Jakub Adam <jakub.adam@ktknet.cz>
+Build-Depends:
+ ant,
+ cdbs (>= 0.4.5.3),
+ debhelper (>= 9),
+ maven-repo-helper
+Build-Depends-Indep:
+ default-jdk,
+ default-jdk-doc,
+ libgnuinet-java
+Standards-Version: 3.9.6
+>>>>>>> debian/control
 Homepage: http://savannah.gnu.org/projects/classpathx
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libgnumail-java/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libgnumail-java/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libgnumail-java/
 
 Package: libgnumail-java
 Architecture: all
-Depends: libgnuinet-java, ${misc:Depends}
-Suggests: libgnumail-java-doc
+Depends:
+ libgnuinet-java,
+ ${misc:Depends}
+Suggests:
+ libgnumail-java-doc
 Description: free implementation of the javamail API
- The javamail API provides abstract classes that model a mail 
- system. With the GNU free implementation of the javamail API, you can 
+ The javamail API provides abstract classes that model a mail
+ system. With the GNU free implementation of the javamail API, you can
  send and read messages using SMTP, IMAP4, POP3, mbox, Maildir and
  NNTP
 
 Package: libgnumail-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Recommends: default-jdk-doc, libgnuinet-java
-Suggests: libgnumail-java
+Depends:
+ ${misc:Depends}
+Recommends:
+ default-jdk-doc,
+ libgnuinet-java
+Suggests:
+ libgnumail-java
 Description: free implementation of the javamail API (Javadocs)
- The javamail API provides abstract classes that model a mail 
- system. With the GNU free implementation of the javamail API, you can 
+ The javamail API provides abstract classes that model a mail
+ system. With the GNU free implementation of the javamail API, you can
  send and read messages using SMTP, IMAP4, POP3, mbox, Maildir and
  NNTP.
  .
diff --git a/debian/copyright b/debian/copyright
index c4ac38d..d83957a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
 Upstream-Name: GNU JavaMail
 
 Files: *
-Copyright: 2000, Andrew Selkirk 
+Copyright: 2000, Andrew Selkirk
            2001, Benjamin A. Speakmon
-           2006, Cedric Hyppolite <cedric.hyppolite@free.fr> 
+           2006, Cedric Hyppolite <cedric.hyppolite@free.fr>
            1999, 2002-2006, Chris Burdess <dog@gnu.org>
            1996-2002, 2004-2005, The Free Software Foundation
 License: GPL-2+ with linking exception
diff --git a/debian/rules b/debian/rules
index c6a9016..f551ad6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,5 +24,5 @@ install/$(PACKAGE)-doc::
 	dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE)
 
 clean::
-	rm -rf *.jar
+	find . -name '*.jar' -delete
 	mh_clean