debian/changelog: Merged the unreleased entry of 1.2.27-3 into 1.3.0-1.

[pkg-rrdtool.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index cbc3334d84063a116062b46f78087a46522e9dda..c4d7ffe422de04a7132fb948d367858dd6ad72a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,28 @@
 rrdtool (1.3.0-1) experimental; urgency=low
 
+  [ Sebastian Harl ]
   * New upstream release.
     - Fixes a buffer overflow in librrd's error handling (Closes: #450578).
     - Validate RRA row count in rrdcreate (Closes: #428780).
+  * Upload to experimental because of the required transition which has not
+    yet been granted for Lenny by the release team.
   * debian/patches:
     - Updated patches to apply on 1.3.0.
     - "implicit-decl-fix" partly applied upstream
     - "typos" removed, has been applied upstream
   * debian/control:
-    - Replaced librrd2 / librrd2-dev with librrd4 / librrd4-dev.
+    - Replaced librrd2 / librrd2-dev with librrd4 / librrd-dev.
+    - Removed SONAME version from the -dev package name.
     - Added "ttf-dejavu | ttf-bitstream-vera" recommendation to librrd4 -
       upstream no longer ships DejaVuSansMono-Roman.ttf.
     - Replaced "libart-2.0-dev" with "libcairo2-dev, libpango1.0-dev" in the
-      build dependencies and librrd4-dev's dependencies following the switch
+      build dependencies and librrd-dev's dependencies following the switch
       made by upstream.
     - Added "libxml2-dev" to the build dependencies.
-    - Added conflict with librrd-dev to librrd4-dev to prevent two -dev
-      packages from being installed simultaneously.
     - Updated standards-version to 3.8.0 - no changes.
+    - No longer conflict / replace librrd0 and librrd0-dev - librrd0 is no
+      longer available since Etch.
+    - Added libc6-dev | libc-dev to librrd-dev's dependencies.
   * debian/librrd4.symbols:
     - Added symbols file for the new SONAME version number replacing
       librrd2.symbols.
@@ -25,18 +30,13 @@ rrdtool (1.3.0-1) experimental; urgency=low
     - Install "NEWS" and "CHANGES" into all packages.
     - No longer set TCL_INC_DIR manually - has been fixed upstream.
 
- -- Sebastian Harl <sh@tokkee.org>  Fri, 13 Jun 2008 20:11:31 +0200
-
-rrdtool (1.2.27-3) UNRELEASED; urgency=low
-
+  [ Bernd Zeimetz ]
   * debian/rules:
     - Adding an option to point configure to the right path to tcl. This is
       not needed for Lenny, but we also add it here to make coming backports
       more simple.
-  * debian/patches/implicit-decl-fix:
-    - Patching the implicit declaration in rrd_update.c in a nicer way.
 
- -- Bernd Zeimetz <bzed@debian.org>  Sun, 20 Apr 2008 02:09:20 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 15 Jun 2008 14:09:47 +0200
 
 rrdtool (1.2.27-2) unstable; urgency=low