Merge branch 'master' of git@apu.snow-crash.org:pkg-rrdtool

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 5dbd578f94f75df847a207aeefa5ebc2d2b7ec4f..ab9797edbcadd09f52826747878fe93072433685 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 rrdtool (1.2.27-1) unstable; urgency=low
 
+  [ Bernd Zeimetz ]
   * New upstream release.
   * debian/rules, debian/librrd2.install:
     - Install rrdtool's ttf and configure rrd to use it.
@@ -13,7 +14,11 @@ rrdtool (1.2.27-1) unstable; urgency=low
     - Builds with -O2 segfault on arm, so disable it on arm for now until the
       bug is properly debugged, which will take some time (Closes: #447041).
 
- -- Bernd Zeimetz <bzed@debian.org>  Sun, 24 Feb 2008 20:23:31 +0100
+  [ Sebastian Harl ]
+  * Adding debian/patches/typo by David Martínez Moreno to fix some typos
+    (Closes: #432340).
+
+ -- Bernd Zeimetz <bzed@debian.org>  Sun, 24 Feb 2008 18:44:41 +0100
 
 rrdtool (1.2.26-1) unstable; urgency=low
 

diff --git a/debian/librrd2-dev.install b/debian/librrd2-dev.install
index 718865277a68d16cfb52791ea162a0e0f3dab452..dccee1a98fc1e2f135372aafc2746b43c3735ffe 100644 (file)
--- a/debian/librrd2-dev.install
+++ b/debian/librrd2-dev.install
@@ -3,3 +3,5 @@ usr/lib/librrd.a
 usr/lib/librrd_th.a
 usr/lib/librrd.la
 usr/lib/librrd_th.la
+usr/lib/librrd.so
+usr/lib/librrd_th.so

diff --git a/debian/librrd2.install b/debian/librrd2.install
index e791aaf2694aa5d6e387f2d60e42fcafd03f99dc..e24cfc55595bf134ac5a23d8d9a9d95ead5055f7 100644 (file)
--- a/debian/librrd2.install
+++ b/debian/librrd2.install
@@ -1,3 +1,3 @@
-usr/lib/librrd.so.2.* 
-usr/lib/librrd_th.so.2.* 
+usr/lib/librrd.so.*
+usr/lib/librrd_th.so.*
 ../../src/DejaVuSansMono-Roman.ttf usr/share/rrdtool/librrd2

diff --git a/debian/patches/series b/debian/patches/series
index 69cecaaf69d7d1e3dd0691a382f19e6017caaff2..2591de2c20cd3197c11a1ab34279c566b957d435 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ setup.py-module-name
 no-rpath-for-ruby
 no-rpath-for-perl
 implicit-decl-fix
+typos

diff --git a/debian/patches/typos b/debian/patches/typos
new file mode 100644 (file)
index 0000000..26749d7
--- /dev/null
+++ b/debian/patches/typos
@@ -0,0 +1,22 @@
+--- a/src/rrd_open.c
++++ b/src/rrd_open.c
+@@ -125,7 +125,7 @@
+     MYFREAD(rrd->stat_head, stat_head_t,  1)
+     /* lets see if the first read worked */
+     if (ferror( *in_file ) || feof(*in_file)) {
+-        rrd_set_error("reading the cookie off %s faild",file_name);
++        rrd_set_error("reading the cookie off %s failed",file_name);
+         fclose(*in_file);
+         return(-1);
+     }        
+--- a/src/rrd_thread_safe.c
++++ b/src/rrd_thread_safe.c
+@@ -52,7 +52,7 @@
+ const char *rrd_strerror(int err) {
+     struct rrd_context *ctx = rrd_get_context();
+     if (strerror_r(err, ctx->lib_errstr, ctx->errlen)) 
+-         return "strerror_r faild. sorry!"; 
++         return "strerror_r failed. Sorry!"; 
+     else 
+          return ctx->lib_errstr; 
+ }

diff --git a/debian/rules b/debian/rules
index d3be3ee3ca30ff2cfec2770f585a4e22c9575a05..0e24d079305c57b51244a5e1cbd1dd1dc3e6162e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,8 @@ include /usr/share/quilt/quilt.make
 
 #library versions
 LIB_version := $(shell grep '^librrd_la_LDFLAGS' src/Makefile.am | \
-                           sed 's,^[^0-9]*,,g;s,\([0-9]*\):\([0-9]*\):\([0-9]*\),\1.\3.\2,g')
+               sed 's,^[^0-9]*,,g;s,\([0-9]*\):\([0-9]*\):\([0-9]*\),\1.\3.\2,g')
 LIB_major := $(shell echo $(LIB_version) | sed 's,\..*,,g')
-LIB_TH_version := $(shell grep '^librrd_th_la_LDFLAGS' src/Makefile.am | \
-                           sed 's,^[^0-9]*,,g;s,\([0-9]*\):\([0-9]*\):\([0-9]*\),\1.\3.\2,g')
-LIB_TH_major := $(shell echo $(LIB_TH_version) | sed 's,\..*,,g')
 
 
 
@@ -148,7 +145,7 @@ install-common-stamp: build-arch-stamp
        dh_clean -k
 
        make install DESTDIR=$(CURDIR)/debian/tmp
-       dh_install --sourcedir=$(CURDIR)/debian/tmp
+       dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
 
        touch $@
 
@@ -202,10 +199,6 @@ binary-arch: build-arch install-arch
        dh_pysupport -ppython-rrdtool
        dh_perl -a
        dh_installman -a
-       dh_link -plibrrd2-dev /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so
-       dh_link -plibrrd2-dev /usr/lib/librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so
-       dh_link -plibrrd$(LIB_major) /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so.$(LIB_major)
-       dh_link -plibrrd$(LIB_major) /usr/lib/librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so.$(LIB_TH_major)
        dh_link -a
        dh_strip -a
        dh_compress -a