W: Expected new/debian (f8ed72878e00e081b6e2cc8b94cd384c73e1521c) is not the same commit as ahasenack/new/debian (f717b664750fc98203b4b5a3a0ed435a2f17781d)
E: Expected new/debian (e67a4e80a20cc9086418550d33bf8952ec11c4f1) is not the same tree as ahasenack/new/debian (fbe6b4da6ac1b652f1019583ceb4b171a08a770b)
E: unexpected differences between logical and deconstruct tags
E: More than one changelog diff hunk detected
+samba (2:4.6.5+dfsg-3ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable (LP: #1700644). Remaining changes:
+    - debian/VERSION.patch: Update vendor string to "Ubuntu".
+    - debian/smb.conf;
+      + Add "(Samba, Ubuntu)" to server string.
+      + Comment out the default [homes] share, and add a comment about
+        "valid users = %s" to show users how to restrict access to
+        \\server\username to only username.
+    - debian/samba-common.config:
+      + Do not change priority to high if dhclient3 is installed.
+    - Add apport hook:
+      + Created debian/source_samba.py.
+      + debian/rules, debian/samba-common-bin.install: install hook.
+    - Add extra DEP8 tests to samba (LP #1696823):
+      + d/t/control: enable the new DEP8 tests
+      + d/t/smbclient-anonymous-share-list: list available shares anonymously
+      + d/t/smbclient-authenticated-share-list: list available shares using
+        an authenticated connection
+      + d/t/smbclient-share-access: create a share and download a file from it
+      + d/t/cifs-share-access: access a file in a share using cifs
+    - Ask the user if we can run testparm against the config file. If yes,
+      include its stderr and exit status in the bug report. Otherwise, only
+      include the exit status. (LP #1694334)
+    - If systemctl is available, use it to query the status of the smbd
+      service before trying to reload it. Otherwise, keep the same check
+      as before and reload the service based on the existence of the
+      initscript. (LP #1579597)
+  * Refresh patches to get rid of offsets:
+    - d/p/usershare.patch
+    - d/p/xsltproc_dont_build_smb.conf.5.patch
+  * d/p/non-wide-symlinks-to-directories-12860.patch: fix a CVE-2017-2619
+    regression which breaks symlinks to directories on certain systems
+    (LP: #1701073)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Fri, 07 Jul 2017 18:07:38 -0300
+
 samba (2:4.6.5+dfsg-3) unstable; urgency=medium
 
   * Remove upstart code
  9-January-1994 Bruce Perens <Bruce@Pixar.com>
  * Added Debian GNU/Linux package maintenance system files, and
    configured for Debian systems.
+
Some lint checks failed. Please investigate.