diff -pruN 1.4.0~pre2+git141-g6d40dace6358-2/debian/changelog 1.4.0~pre2+git141-g6d40dace6358-2ubuntu1/debian/changelog
--- 1.4.0~pre2+git141-g6d40dace6358-2/debian/changelog	2018-11-04 11:19:47.000000000 +0000
+++ 1.4.0~pre2+git141-g6d40dace6358-2ubuntu1/debian/changelog	2019-02-01 01:34:27.000000000 +0000
@@ -1,3 +1,12 @@
+bcfg2 (1.4.0~pre2+git141-g6d40dace6358-2ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control:
+      + Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+      + Suggests: Move cheetah to Recommends (for templating).
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 31 Jan 2019 17:34:27 -0800
+
 bcfg2 (1.4.0~pre2+git141-g6d40dace6358-2) unstable; urgency=medium
 
   * Point VCS urls to Salsa
@@ -6,6 +15,22 @@ bcfg2 (1.4.0~pre2+git141-g6d40dace6358-2
 
  -- Arto Jantunen <viiru@debian.org>  Sun, 04 Nov 2018 13:19:47 +0200
 
+bcfg2 (1.4.0~pre2+git141-g6d40dace6358-1ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control:
+      + Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+      + Suggests: Move cheetah to Recommends (for templating).
+  * Dropped changes, superseded in Debian:
+    - genshi now a Depends, neither a Recommends nor Suggests
+  * Dropped changes, included upstream:
+    - debian/patches/1000-nagiosgen-ipv6.patch:
+      + Fix NagiosGen with IPv6 hosts.
+    - debian/patches/1001-nagiosgen-sort-groups.patch:
+      + NagiosGen: Sort the hostgroup list.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 10 Aug 2017 16:03:16 -0700
+
 bcfg2 (1.4.0~pre2+git141-g6d40dace6358-1) unstable; urgency=medium
 
   * New upstream git snapshot for more Django 1.9 and 1.10 fixes
@@ -39,6 +64,19 @@ bcfg2 (1.4.0~pre1-1) experimental; urgen
 
  -- Arto Jantunen <viiru@debian.org>  Tue, 15 Jul 2014 10:35:57 +0300
 
+bcfg2 (1.3.5-4ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control:
+      + Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+      + Suggests: Move genshi and cheetah to Recommends (for templating).
+    - debian/patches/1000-nagiosgen-ipv6.patch:
+      + Fix NagiosGen with IPv6 hosts.
+    - debian/patches/1001-nagiosgen-sort-groups.patch:
+      + NagiosGen: Sort the hostgroup list.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Fri, 01 Jan 2016 23:04:03 +0530
+
 bcfg2 (1.3.5-4) unstable; urgency=medium
 
   * Install the new south_migrations into the package, thanks Adam
@@ -52,6 +90,19 @@ bcfg2 (1.3.5-3) unstable; urgency=medium
 
  -- Arto Jantunen <viiru@debian.org>  Thu, 24 Sep 2015 19:48:46 +0300
 
+bcfg2 (1.3.5-2ubuntu1) wily; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control:
+      + Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+      + Suggests: Move genshi and cheetah to Recommends (for templating).
+    - debian/patches/1000-nagiosgen-ipv6.patch:
+      + Fix NagiosGen with IPv6 hosts.
+    - debian/patches/1001-nagiosgen-sort-groups.patch:
+      + NagiosGen: Sort the hostgroup list.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sun, 06 Sep 2015 11:54:00 +0200
+
 bcfg2 (1.3.5-2) unstable; urgency=medium
 
   * Apply patch from Jonas Jochmaring to support Django 1.7
@@ -59,12 +110,35 @@ bcfg2 (1.3.5-2) unstable; urgency=medium
 
  -- Arto Jantunen <viiru@debian.org>  Thu, 25 Jun 2015 20:39:15 +0300
 
+bcfg2 (1.3.5-1ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control:
+      + Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+      + Suggests: Move genshi and cheetah to Recommends (for templating).
+    - debian/patches/1000-nagiosgen-ipv6.patch:
+      + Fix NagiosGen with IPv6 hosts.
+    - debian/patches/1001-nagiosgen-sort-groups.patch:
+      + NagiosGen: Sort the hostgroup list.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sat, 14 Feb 2015 23:18:26 +0100
+
 bcfg2 (1.3.5-1) unstable; urgency=medium
 
   * New upstream version 1.3.5
 
  -- Arto Jantunen <viiru@debian.org>  Tue, 09 Sep 2014 19:52:42 +0300
 
+bcfg2 (1.3.4-1ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian. Remaining Ubuntu changes:
+   - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+   - Suggests: Move genshi and cheetah to Recommends (for templating).
+   - Cherry-pick a sorting fix from upstream (also NagiosGen).
+   - Cherry-pick fix from upstream master to fix NagiosGen with IPv6 hosts.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Fri, 02 May 2014 16:56:47 -0400
+
 bcfg2 (1.3.4-1) unstable; urgency=medium
 
   * New upstream version 1.3.4
@@ -73,6 +147,28 @@ bcfg2 (1.3.4-1) unstable; urgency=medium
 
  -- Arto Jantunen <viiru@debian.org>  Fri, 04 Apr 2014 17:38:07 +0300
 
+bcfg2 (1.3.3-1ubuntu3) trusty; urgency=medium
+
+  * Also cherry-pick a sorting fix from upstream (also NagiosGen).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Sat, 15 Feb 2014 22:15:23 -0500
+
+bcfg2 (1.3.3-1ubuntu2) trusty; urgency=medium
+
+  * Cherry-pick fix from upstream master to fix NagiosGen with IPv6 hosts.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Sat, 15 Feb 2014 20:49:04 -0500
+
+bcfg2 (1.3.3-1ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian. Remaining Ubuntu changes:
+   - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+   - Suggests: Move genshi and cheetah to Recommends (for templating).
+  * Drop BackupPCGen plugin as it's now possible to achieve the exact
+    same feature using the existing upstream plugins alone.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 16 Dec 2013 16:03:18 -0500
+
 bcfg2 (1.3.3-1) unstable; urgency=medium
 
   * New upstream version 1.3.3
@@ -86,6 +182,16 @@ bcfg2 (1.3.3-1) unstable; urgency=medium
 
  -- Arto Jantunen <viiru@debian.org>  Sat, 14 Dec 2013 15:58:13 +0200
 
+bcfg2 (1.3.2-1ubuntu1) saucy; urgency=low
+
+  * Merge from Debian. Remaining Ubuntu changes:
+   - Patch adding BackupPCGen plugin by Revolution Linux (off by default).
+   - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+   - Suggests: Move genshi and cheetah to Recommends (for templating).
+  * Cherry-pick IPv6 and UTF-8 fixes from upstream git.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 19 Aug 2013 16:53:01 +0200
+
 bcfg2 (1.3.2-1) unstable; urgency=low
 
   * Remove patches 0002-0006, included upstream
@@ -97,6 +203,15 @@ bcfg2 (1.3.2-1) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Sun, 21 Jul 2013 11:21:55 +0300
 
+bcfg2 (1.3.1-3ubuntu1) saucy; urgency=low
+
+  * Merge from Debian. Remaining Ubuntu changes:
+   - Patch adding BackupPCGen plugin by Revolution Linux (off by default).
+   - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+   - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Tue, 09 Jul 2013 16:25:00 -0400
+
 bcfg2 (1.3.1-3) unstable; urgency=low
 
   * Apply two patches from upstream to fix build failures related to
@@ -141,6 +256,24 @@ bcfg2 (1.3.0~pre2-1) experimental; urgen
 
  -- Arto Jantunen <viiru@debian.org>  Wed, 26 Dec 2012 12:30:06 +0200
 
+bcfg2 (1.2.3-1ubuntu2) raring; urgency=low
+
+  * Update BackupPCGen patch:
+    - Add some flexibility in the parser to allow for varying field number.
+    - Fix to match PEP-8 standard.
+    - Update to work under both Python 2.7 and 3.3 (requires python3-configobj)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Fri, 23 Nov 2012 10:43:05 -0500
+
+bcfg2 (1.2.3-1ubuntu1) raring; urgency=low
+
+  * Merge from Debian experimental. Remaining Ubuntu changes:
+   - Patch adding BackupPCGen plugin by Revolution Linux (off by default).
+   - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+   - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 19 Nov 2012 22:41:16 -0500
+
 bcfg2 (1.2.3-1) experimental; urgency=low
 
   * Upload to experimental due to the wheezy freeze
@@ -149,6 +282,15 @@ bcfg2 (1.2.3-1) experimental; urgency=lo
 
  -- Arto Jantunen <viiru@debian.org>  Fri, 03 Aug 2012 19:20:52 +0300
 
+bcfg2 (1.2.2-2ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+   - Patch adding BackupPCGen plugin by Revolution Linux (off by default).
+   - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+   - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Andrew Starr-Bochicchio <a.starr.b@gmail.com>  Thu, 26 Jul 2012 16:41:41 -0400
+
 bcfg2 (1.2.2-2) unstable; urgency=high
 
   * Urgency=high due to security fix
@@ -157,6 +299,23 @@ bcfg2 (1.2.2-2) unstable; urgency=high
 
  -- Arto Jantunen <viiru@debian.org>  Wed, 27 Jun 2012 21:25:43 +0300
 
+bcfg2 (1.2.2-1ubuntu2) precise; urgency=low
+
+  * Bugfix update of BackupPCGen plugin to deal with servers backing up
+    a single location. Thank to Marc Gariepy for the fix.
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 18 Apr 2012 18:24:43 +0200
+
+bcfg2 (1.2.2-1ubuntu1) precise; urgency=low
+
+  * Merge 1.2.2 bugfix release from Debian. Remaining changes:
+    - Added patches:
+      + Add BackupPCGen plugin by Revolution Linux (off by default).
+    - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+    - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 28 Mar 2012 21:25:36 -0400
+
 bcfg2 (1.2.2-1) unstable; urgency=low
 
   * New upstream version 1.2.2
@@ -165,6 +324,16 @@ bcfg2 (1.2.2-1) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Mon, 19 Mar 2012 20:16:25 +0200
 
+bcfg2 (1.2.1-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Added patches:
+      + Add BackupPCGen plugin by Revolution Linux (off by default).
+    - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+    - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 09 Feb 2012 15:33:13 -0500
+
 bcfg2 (1.2.1-1) unstable; urgency=low
 
   * New upstream version 1.2.1
@@ -172,6 +341,20 @@ bcfg2 (1.2.1-1) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Wed, 01 Feb 2012 18:07:44 +0200
 
+bcfg2 (1.2.0-1ubuntu1) precise; urgency=low
+
+  * Merge from debian testing. Remaining changes:
+    - Added patches:
+      + Add BackupPCGen plugin by Revolution Linux (off by default).
+    - Dropped patches:
+      + Make ssh_known_hosts base64 to avoid timeouts
+        (shouldn't be necessary with 1.2)
+      + Add NagiosGen patch to support "parents" in Nagios (upstreamed)
+    - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+    - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 26 Jan 2012 15:22:16 -0500
+
 bcfg2 (1.2.0-1) unstable; urgency=low
 
   * New upstream version 1.2.0
@@ -189,6 +372,18 @@ bcfg2 (1.2.0-1) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Sat, 24 Dec 2011 13:00:02 +0200
 
+bcfg2 (1.1.3-1ubuntu1) precise; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Added patches:
+      + Add NagiosGen patch to support "parents" in Nagios
+      + Add BackupPCGen plugin by Revolution Linux (off by default).
+      + Make ssh_known_hosts base64 to avoid timeouts (SSHGen).
+    - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+    - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 20 Oct 2011 10:58:36 -0400
+
 bcfg2 (1.1.3-1) unstable; urgency=low
 
   * New upstream version 1.1.3
@@ -199,6 +394,21 @@ bcfg2 (1.1.3-1) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Sun, 25 Sep 2011 14:28:38 +0300
 
+bcfg2 (1.1.2-2ubuntu1) oneiric; urgency=low
+
+  * Merge upstream bugfix only release 1.1.2.
+  * Also fixes CVE 2011-3211 (LP: #844743)
+
+  * Merge from debian unstable.  Remaining changes:
+    - Added patches:
+      + Add NagiosGen patch to support "parents" in Nagios
+      + Add BackupPCGen plugin by Revolution Linux (off by default).
+      + Make ssh_known_hosts base64 to avoid timeouts (SSHGen).
+    - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+    - Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 08 Sep 2011 09:38:14 -0400
+
 bcfg2 (1.1.2-2) unstable; urgency=high
 
   * Urgency=high due to security fix
@@ -222,6 +432,34 @@ bcfg2 (1.1.2-1) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Thu, 02 Jun 2011 11:50:12 +0300
 
+bcfg2 (1.1.1-3ubuntu3) oneiric; urgency=low
+
+  * Apply patch from Torsten Rehn to resolve $BCFG2_SERVER_OPTIONS
+    not being honored in the bcfg2-server initscript. (LP: #781612)
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Wed, 20 Jul 2011 13:58:56 -0400
+
+bcfg2 (1.1.1-3ubuntu2) oneiric; urgency=low
+
+  * Add python2.7 fix (LP: #777999)
+  * Sort patches/series to make it easier to read
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Mon, 16 May 2011 09:56:46 -0400
+
+bcfg2 (1.1.1-3ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Added patches:
+      + Add NagiosGen patch to support "parents" in Nagios
+      + Add BackupPCGen plugin by Revolution Linux (off by default).
+      + Make ssh_known_hosts base64 to avoid timeouts (SSHGen).
+    - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+    - Suggests: Move genshi and cheetah to Recommends (for templating).
+  * Dropped change, fixed in Debian:
+    - Depends: Update to use gamin by default (to avoid installing portmap).
+
+ -- Angel Abad <angelabad@ubuntu.com>  Mon, 02 May 2011 14:52:02 +0200
+
 bcfg2 (1.1.1-3) unstable; urgency=low
 
   * Use debhelper 8
@@ -232,6 +470,22 @@ bcfg2 (1.1.1-3) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Thu, 17 Mar 2011 21:07:53 +0200
 
+bcfg2 (1.1.1-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable. Remaining changes:
+    - Added patches:
+      + Add NagiosGen patch to support "parents" in Nagios
+      + Add BackupPCGen plugin by Revolution Linux (off by default).
+      + Make ssh_known_hosts base64 to avoid timeouts (SSHGen).
+    - Depends: Update to use gamin by default (to avoid installing portmap).
+    - Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+    - Suggests: Move genshi and cheetah to Recommends (for templating).
+  * Dropped change, not needed:
+    - Build-Depends: Change python-support from >= 1.0.9
+      to >=1.0.4 (to make backporting easier).
+
+ -- Angel Abad <angelabad@ubuntu.com>  Thu, 17 Feb 2011 10:53:58 +0100
+
 bcfg2 (1.1.1-2) unstable; urgency=low
 
   * The "Yay Squeeze" release
@@ -241,6 +495,28 @@ bcfg2 (1.1.1-2) unstable; urgency=low
 
  -- Arto Jantunen <viiru@debian.org>  Thu, 10 Feb 2011 18:49:19 +0200
 
+bcfg2 (1.1.1-1ubuntu2) natty; urgency=low
+
+  * Added patches:
+   - Add NagiosGen patch to support "parents" in Nagios
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Sat, 01 Jan 2011 16:22:56 -0500
+
+bcfg2 (1.1.1-1ubuntu1) natty; urgency=low
+
+  * Added patches
+    - Add BackupPCGen plugin by Revolution Linux (off by default).
+    - Make ssh_known_hosts base64 to avoid timeouts (SSHGen).
+
+  * Maintainer: Change to "Ubuntu Developers"
+  * Build-Depends: Change python-support from >= 1.0.9
+    to >=1.0.4 (to make backporting easier).
+  * Depends: Update to use gamin by default (to avoid installing portmap).
+  * Recommends: Move graphviz to Suggests (avoid libX11 on a server).
+  * Suggests: Move genshi and cheetah to Recommends (for templating).
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Tue, 14 Dec 2010 16:16:38 -0500
+
 bcfg2 (1.1.1-1) experimental; urgency=low
 
   * New upstream version 1.1.1
diff -pruN 1.4.0~pre2+git141-g6d40dace6358-2/debian/control 1.4.0~pre2+git141-g6d40dace6358-2ubuntu1/debian/control
--- 1.4.0~pre2+git141-g6d40dace6358-2/debian/control	2018-11-04 11:19:47.000000000 +0000
+++ 1.4.0~pre2+git141-g6d40dace6358-2ubuntu1/debian/control	2019-02-01 01:34:27.000000000 +0000
@@ -1,7 +1,8 @@
 Source: bcfg2
 Section: admin
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Build-Depends: debhelper (>= 9),
 	       python-all (>= 2.6.6-3),
 	       python-setuptools,
@@ -36,8 +37,8 @@ Description: Configuration management cl
 Package: bcfg2-server
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python-pyinotify | python-gamin, python-daemon, python-genshi (>= 0.4.4)
-Recommends: graphviz, patch
-Suggests: python-cheetah, python-profiler, python-django, mail-transport-agent, bcfg2-doc (= ${binary:Version})
+Recommends: patch, python-cheetah
+Suggests: python-profiler, python-django, mail-transport-agent, bcfg2-doc (= ${binary:Version}), graphviz
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
