Merge lp:~ari-tczew/system-tools-backends/ubuntu into lp:~ubuntu-desktop/system-tools-backends/ubuntu

[Artur Rona]

[Colin Watson (cjwatson)]

Please drop the bit about Vcs-Bzr from the "Remaining changes" block in debian/changelog. This is for the same reason that we don't document Ubuntu-specific Maintainer changes (http://people.canonical.com/~cjwatson/ubuntu-policy/policy.html/ch-binary.html#s3.3): it has to be done for every package with Ubuntu-specific version control, and if it were the only change then we'd sync and drop it. Essentially, we only need to document the changes that stop us syncing from Debian.

review: Needs Fixing

[lp:~ari-tczew/system-tools-backends/ubuntu]

29. By Artur Rona on 2011-01-17

Remove entry of Vcs-Bzr link.

[Colin Watson (cjwatson)]

Thanks, I'm fine with this now.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-07 06:33:56 +0000
+++ debian/changelog	2011-01-17 11:24:09 +0000
@@ -1,3 +1,18 @@
+system-tools-backends (2.10.1-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #703665)
+    - debian/patches/03ubuntu_empty_ntp_conf.patch:
+      + Don't create empty NTP configuration files.
+
+ -- Artur Rona <[e-mail]>  Sun, 16 Jan 2011 20:42:05 +0100
+
+system-tools-backends (2.10.1-2) unstable; urgency=low
+
+  * 03_hostname.patch: patch by Mario Izquierdo to fix hostname 
+    detection. Closes: #607152.
+
+ -- Josselin Mouette <[e-mail]>  Fri, 17 Dec 2010 22:48:37 +0100
+
 system-tools-backends (2.10.1-1ubuntu2) natty; urgency=low
 
   * Sync up 03ubuntu_empty_ntp_conf.patch with patch committed upstream,

=== added file 'debian/patches/03_hostname.patch'
--- debian/patches/03_hostname.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_hostname.patch	2011-01-17 11:24:09 +0000
@@ -0,0 +1,12 @@
+Index: system-tools-backends-2.10.1/Network/Hosts.pm
+===================================================================
+--- system-tools-backends-2.10.1.orig/Network/Hosts.pm	2010-12-17 22:47:08.612239499 +0100
++++ system-tools-backends-2.10.1/Network/Hosts.pm	2010-12-17 22:47:24.972237485 +0100
+@@ -37,6 +37,7 @@ sub get_fqdn_dist
+ {
+   my %dist_map =
+ 	 (
++    "debian"          => "debian",
+     "redhat-6.2"      => "redhat-6.2",
+     "redhat-7.0"      => "redhat-6.2",
+     "redhat-7.1"      => "redhat-6.2",

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-12-06 13:50:27 +0000
+++ debian/patches/series	2011-01-17 11:24:09 +0000
@@ -1,3 +1,4 @@
 01_kfreebsd.diff
 02ubuntu_chmod_network_interfaces_when_using_key.patch
+03_hostname.patch
 03ubuntu_empty_ntp_conf.patch