r30952 - in /desktop/unstable/system-tools-backends/debian: changelog patches/04_empty_ntp.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sat Oct 22 15:08:03 UTC 2011


Author: biebl
Date: Sat Oct 22 15:08:03 2011
New Revision: 30952

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30952
Log:
Refresh debian/patches/04_empty_ntp.patch.

Modified:
    desktop/unstable/system-tools-backends/debian/changelog
    desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch

Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=30952&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/changelog [utf-8] Sat Oct 22 15:08:03 2011
@@ -3,6 +3,7 @@
   * New upstream release.
   * debian/watch:
     - Track .bz2 tarballs.
+  * Refresh debian/patches/04_empty_ntp.patch.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 22 Oct 2011 17:05:49 +0200
 

Modified: desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch?rev=30952&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch [utf-8] (original)
+++ desktop/unstable/system-tools-backends/debian/patches/04_empty_ntp.patch [utf-8] Sat Oct 22 15:08:03 2011
@@ -8,13 +8,13 @@
 This caused other time syncing problems later (see e.g.
 https://bugs.launchpad.net/bugs/83604).
 ---
-diff --git a/Time/NTP.pm b/Time/NTP.pm
-index e7be3a9..026ba3e 100644
---- a/Time/NTP.pm
-+++ b/Time/NTP.pm
-@@ -75,6 +75,11 @@ sub ntp_conf_replace
-   my ($line_key, $val, $rest);
-   my ($n, $ret);
+Index: system-tools-backends-2.10.2/Time/NTP.pm
+===================================================================
+--- system-tools-backends-2.10.2.orig/Time/NTP.pm	2010-12-06 18:32:52.000000000 +0100
++++ system-tools-backends-2.10.2/Time/NTP.pm	2011-10-22 17:05:20.493458177 +0200
+@@ -80,6 +80,11 @@
+   # Notably, this avoids creating an empty file when simply running ntpdate.
+   return if (!&Utils::File::exists ($file) && !@$value);
  
 +  # If config file does not exist, and no server has to be written,
 +  # don't create and empty file that will confuse package managers.
@@ -24,5 +24,3 @@
    &Utils::Report::enter ();
    &Utils::Report::do_report ("replace_split", $key, $file);
  
---
-cgit v0.8.3-6-g21f6




More information about the pkg-gnome-commits mailing list