Code

pkg-rrdtool.git
15 years agoPrepare to build with Python 2.6
Bernd Zeimetz [Mon, 13 Jul 2009 01:03:56 +0000 (03:03 +0200)]
Prepare to build with Python 2.6

15 years agopatches: Added bts332766-negative-timestamps. debian/1.3.8-1
Sebastian Harl [Tue, 2 Jun 2009 16:10:07 +0000 (18:10 +0200)]
patches: Added bts332766-negative-timestamps.

This is an upstream patch to fix the handling of negative timestamps in
rrdupdate(1). Thanks to Frank Zacharias for reporting this.

Closes: #332766
15 years agorules: Clean python*-dbg as well.
Sebastian Harl [Mon, 1 Jun 2009 13:13:35 +0000 (15:13 +0200)]
rules: Clean python*-dbg as well.

15 years agocontrol: Build-depend on intltool.
Sebastian Harl [Mon, 1 Jun 2009 12:14:20 +0000 (14:14 +0200)]
control: Build-depend on intltool.

15 years agocontrol: Let rrdtool-dbg depend on ${shlibs:Depends}.
Sebastian Harl [Mon, 1 Jun 2009 11:54:31 +0000 (13:54 +0200)]
control: Let rrdtool-dbg depend on ${shlibs:Depends}.

15 years agoMerge branch 'master' of git://git.snow-crash.org/pkg-rrdtool
Sebastian Harl [Mon, 1 Jun 2009 11:51:49 +0000 (13:51 +0200)]
Merge branch 'master' of git://git.snow-crash.org/pkg-rrdtool

Conflicts:

debian/changelog

15 years agocontrol, rules: Removed transitional package "python-rrd".
Sebastian Harl [Mon, 1 Jun 2009 11:24:13 +0000 (13:24 +0200)]
control, rules: Removed transitional package "python-rrd".

This is no longer required.

15 years agoDon't install egg-info into the dbg package.
Bernd Zeimetz [Mon, 1 Jun 2009 11:49:11 +0000 (13:49 +0200)]
Don't install egg-info into the dbg package.

15 years agoRun dh_pysupport for rrdtool-dbg, too.
Bernd Zeimetz [Mon, 1 Jun 2009 11:35:11 +0000 (13:35 +0200)]
Run dh_pysupport for rrdtool-dbg, too.

15 years agoUpdating changelog.
Bernd Zeimetz [Mon, 1 Jun 2009 11:24:26 +0000 (13:24 +0200)]
Updating changelog.

15 years agoBuild Python dbg modules into rrdtool-dbg.
Bernd Zeimetz [Mon, 1 Jun 2009 11:22:07 +0000 (13:22 +0200)]
Build Python dbg modules into rrdtool-dbg.

15 years agocontrol: Switched to my @debian.org E-mail address.
Sebastian Harl [Mon, 1 Jun 2009 11:12:30 +0000 (13:12 +0200)]
control: Switched to my @debian.org E-mail address.

15 years agopatches: Removed doc-fixes.
Sebastian Harl [Mon, 1 Jun 2009 11:11:20 +0000 (13:11 +0200)]
patches: Removed doc-fixes.

This patch has been applied upstream.

15 years agopatches: Added bts530814-hurd.
Sebastian Harl [Mon, 1 Jun 2009 10:55:30 +0000 (12:55 +0200)]
patches: Added bts530814-hurd.

This patch fixes a FTBFS on Hurd.
Thanks to Marc Dequènes for reporting this and providing a patch.
Closes: #530814
15 years agochangelog: Updated to 1.3.8-1.
Sebastian Harl [Mon, 1 Jun 2009 10:44:41 +0000 (12:44 +0200)]
changelog: Updated to 1.3.8-1.

The new upstream release fixes #529291 (rrdtool python bindings leak memory).
Thanks to Anders Hammarquist for the patch.

15 years agoMerge branch 'upstream'
Sebastian Harl [Mon, 1 Jun 2009 10:23:55 +0000 (12:23 +0200)]
Merge branch 'upstream'

15 years agoImported upstream version 1.3.8. upstream/1.3.8
Sebastian Harl [Mon, 1 Jun 2009 10:22:45 +0000 (12:22 +0200)]
Imported upstream version 1.3.8.

15 years agoAdding config for git-buildpackage and friends. debian/1.3.7-1
Bernd Zeimetz [Mon, 18 May 2009 14:31:04 +0000 (16:31 +0200)]
Adding config for git-buildpackage and friends.

15 years agochangelog: The new upstream releases closes #431060 (again).
Sebastian Harl [Mon, 11 May 2009 21:02:49 +0000 (23:02 +0200)]
changelog: The new upstream releases closes #431060 (again).

15 years agocontrol: Do not duplicate field "Section" in package rrdtool-tcl.
Sebastian Harl [Fri, 8 May 2009 20:43:40 +0000 (22:43 +0200)]
control: Do not duplicate field "Section" in package rrdtool-tcl.

15 years agorules: Use 'pyversions -vr' instead of 'pysupport-parseversions'.
Sebastian Harl [Fri, 8 May 2009 20:16:40 +0000 (22:16 +0200)]
rules: Use 'pyversions -vr' instead of 'pysupport-parseversions'.

Added XS-Python-Version field to control, replacing the pyversions file.

15 years agopatches: Added compiler-warning-fixes.
Sebastian Harl [Fri, 8 May 2009 16:01:55 +0000 (18:01 +0200)]
patches: Added compiler-warning-fixes.

This is an upstream patch to fix some compiler warnings.

15 years agochangelog: Adding rrdtool-dbg closes #518480.
Sebastian Harl [Fri, 8 May 2009 14:25:53 +0000 (16:25 +0200)]
changelog: Adding rrdtool-dbg closes #518480.

15 years agopatches: Added doc-fixes to fix a POD error in doc/rrdtutorial.pod.
Sebastian Harl [Tue, 7 Apr 2009 15:54:35 +0000 (17:54 +0200)]
patches: Added doc-fixes to fix a POD error in doc/rrdtutorial.pod.

15 years agocontrol: Updated standards-version to 3.8.1.
Sebastian Harl [Tue, 7 Apr 2009 14:46:08 +0000 (16:46 +0200)]
control: Updated standards-version to 3.8.1.

No changes.

15 years agorules: Pass --fail-missing (instead of --list-missing) to dh_install.
Sebastian Harl [Tue, 7 Apr 2009 14:44:37 +0000 (16:44 +0200)]
rules: Pass --fail-missing (instead of --list-missing) to dh_install.

15 years agorrdtool.{examples,install}: Install some examples using dh_install.
Sebastian Harl [Tue, 7 Apr 2009 14:42:02 +0000 (16:42 +0200)]
rrdtool.{examples,install}: Install some examples using dh_install.

examples/* and ifOctets.tcl where previously installed using
dh_installexamples. Using dh_install instead allows to use the --fail-missing
option.

15 years agolibrrd-dev.install: Added /usr/lib/pkgconfig/librrd.pc.
Sebastian Harl [Tue, 7 Apr 2009 13:53:34 +0000 (15:53 +0200)]
librrd-dev.install: Added /usr/lib/pkgconfig/librrd.pc.

Closes: #522144
15 years agocopyright: Updated for version 1.3.7.
Sebastian Harl [Tue, 7 Apr 2009 13:39:11 +0000 (15:39 +0200)]
copyright: Updated for version 1.3.7.

Also, unnecessary whitespace and empty lines have been removed.

15 years agocontrol: Moved librrd-ruby* packages to section "ruby".
Sebastian Harl [Tue, 7 Apr 2009 13:07:59 +0000 (15:07 +0200)]
control: Moved librrd-ruby* packages to section "ruby".

Also, rrdtool-dbg has been moved to section "debug".

These sections have been introduced in March 2009.

15 years agochangelog: Updated to 1.3.7-1.
Sebastian Harl [Tue, 7 Apr 2009 12:42:10 +0000 (14:42 +0200)]
changelog: Updated to 1.3.7-1.

15 years agoMerge branch 'upstream'
Sebastian Harl [Tue, 7 Apr 2009 12:41:47 +0000 (14:41 +0200)]
Merge branch 'upstream'

15 years agochangelog: Upload to unstable instead of experimental.
Sebastian Harl [Tue, 7 Apr 2009 12:41:25 +0000 (14:41 +0200)]
changelog: Upload to unstable instead of experimental.

Lenny has been released ;-)

15 years agoImported upstream version 1.3.7. upstream/1.3.7
Sebastian Harl [Tue, 7 Apr 2009 12:39:21 +0000 (14:39 +0200)]
Imported upstream version 1.3.7.

15 years agoAdded debian/README.Debian.
Sebastian Harl [Sat, 20 Dec 2008 23:06:50 +0000 (00:06 +0100)]
Added debian/README.Debian.

This file includes a short paragraph about the available documentation.

15 years agoRemove .txt and .pod documentation from the 'rrdtool' binary package.
Sebastian Harl [Sat, 20 Dec 2008 22:43:37 +0000 (23:43 +0100)]
Remove .txt and .pod documentation from the 'rrdtool' binary package.

The manpages are a lot more useful.

15 years agoAdded new binary package rrdtool-dbg.
Sebastian Harl [Sat, 20 Dec 2008 22:18:54 +0000 (23:18 +0100)]
Added new binary package rrdtool-dbg.

Unfortunately, segfaults and the like are not uncommon in rrdtool - this will
help to trace them back more easily.

15 years agodebian/changelog: Uploading to experimental because of the Lenny freeze.
Sebastian Harl [Sat, 20 Dec 2008 21:50:12 +0000 (22:50 +0100)]
debian/changelog: Uploading to experimental because of the Lenny freeze.

15 years agodebian/patches: Added bts494874-gnu-kfreebsd.
Sebastian Harl [Sat, 20 Dec 2008 16:58:37 +0000 (17:58 +0100)]
debian/patches: Added bts494874-gnu-kfreebsd.

This fixes a FTBFS on GNU/kFreeBSD - thanks to Petr Salinger for the patch.

Closes: #494874
15 years agodebian/rules: Remove src/librrd.sym in the clean target.
Sebastian Harl [Sat, 20 Dec 2008 16:47:04 +0000 (17:47 +0100)]
debian/rules: Remove src/librrd.sym in the clean target.

This fil is automatically created during the build but not cleaned up in the
upstream Makefiles.

15 years agodebian/changelog: The new upstream release closes #497739.
Sebastian Harl [Sat, 20 Dec 2008 14:27:40 +0000 (15:27 +0100)]
debian/changelog: The new upstream release closes #497739.

15 years agodebian/patches: Removed typo-ruby.
Sebastian Harl [Sat, 20 Dec 2008 13:57:02 +0000 (14:57 +0100)]
debian/patches: Removed typo-ruby.

This patch has been included upstream.

15 years agodebian/patches: Updated no-rpath-for-perl.
Sebastian Harl [Sat, 20 Dec 2008 13:53:45 +0000 (14:53 +0100)]
debian/patches: Updated no-rpath-for-perl.

The patch now applies to the latest version of rrdtool.

15 years agodebian/patches: Removed bts499350-data-corruption.
Sebastian Harl [Sat, 20 Dec 2008 13:43:43 +0000 (14:43 +0100)]
debian/patches: Removed bts499350-data-corruption.

This patch has been included upstream.

15 years agodebian/patches: Removed bts499349-memleaks.
Sebastian Harl [Sat, 20 Dec 2008 13:42:40 +0000 (14:42 +0100)]
debian/patches: Removed bts499349-memleaks.

This patch has been included upstream.

15 years agodebian/patches: Removed bts498183-segfault-madvise.
Sebastian Harl [Sat, 20 Dec 2008 13:40:45 +0000 (14:40 +0100)]
debian/patches: Removed bts498183-segfault-madvise.

This patch has been included upstream.

15 years agodebian/patches: Removed bts496847-error-handling.
Sebastian Harl [Sat, 20 Dec 2008 13:39:23 +0000 (14:39 +0100)]
debian/patches: Removed bts496847-error-handling.

This patch is now included upstream.

15 years agodebian/patches: Removed bts493553-pango-utf-8.
Sebastian Harl [Sat, 20 Dec 2008 13:36:28 +0000 (14:36 +0100)]
debian/patches: Removed bts493553-pango-utf-8.

This patch is now included upstream.

15 years agodebian/patches: Updated bts428778-floating-point-exception.
Sebastian Harl [Sat, 20 Dec 2008 13:33:48 +0000 (14:33 +0100)]
debian/patches: Updated bts428778-floating-point-exception.

The patch now correctly applies to the latest version of rrdtool. Use
rrd_free2() instead of rrd_free() to not leak memory.

15 years agodebian/changelog: Updated to 1.3.5-1.
Sebastian Harl [Sat, 20 Dec 2008 13:31:47 +0000 (14:31 +0100)]
debian/changelog: Updated to 1.3.5-1.

15 years agoMerge branch 'upstream' into experimental
Sebastian Harl [Sat, 20 Dec 2008 12:40:16 +0000 (13:40 +0100)]
Merge branch 'upstream' into experimental

15 years agoImported upstream version 1.3.5. upstream/1.3.5
Sebastian Harl [Sat, 20 Dec 2008 12:37:08 +0000 (13:37 +0100)]
Imported upstream version 1.3.5.

16 years agopatches/bts498183-segfault-madvise: Removed unnecessary whitespace changes. debian/1.3.1-4
Sebastian Harl [Fri, 26 Sep 2008 11:23:20 +0000 (13:23 +0200)]
patches/bts498183-segfault-madvise: Removed unnecessary whitespace changes.

16 years agodebian/NEWS: Set urgency to high as well.
Sebastian Harl [Fri, 26 Sep 2008 08:22:24 +0000 (10:22 +0200)]
debian/NEWS: Set urgency to high as well.

16 years agoUrgency set to high because of the fix for #499350.
Sebastian Harl [Thu, 25 Sep 2008 23:43:00 +0000 (01:43 +0200)]
Urgency set to high because of the fix for #499350.

16 years agodebian/changelog: Added references to upstream SVN and bug tracker.
Sebastian Harl [Thu, 25 Sep 2008 22:50:01 +0000 (00:50 +0200)]
debian/changelog: Added references to upstream SVN and bug tracker.

16 years agoAdded trivial upstream patch typo-ruby.
Sebastian Harl [Thu, 25 Sep 2008 22:39:15 +0000 (00:39 +0200)]
Added trivial upstream patch typo-ruby.

This fixes a typo in the Ruby bindings.

16 years agoAdded upstream patch bts499349-memleaks.
Sebastian Harl [Thu, 25 Sep 2008 22:26:52 +0000 (00:26 +0200)]
Added upstream patch bts499349-memleaks.

This fixes a couple of memory leaks in rrdtool, librrd and the Perl and Ruby
bindings.

Closes: #499349
16 years agoAdded debian/NEWS.
Sebastian Harl [Thu, 25 Sep 2008 22:11:13 +0000 (00:11 +0200)]
Added debian/NEWS.

Documented the changes required by the switch to libpango.

Closes: #493575, #493594
16 years agoAdded upstream patch bts496847-error-handling.
Sebastian Harl [Sat, 20 Sep 2008 19:56:56 +0000 (21:56 +0200)]
Added upstream patch bts496847-error-handling.

This fixes error handling of syscalls in rrdtool(1).

Closes: #496847
16 years agoAdded bts498183-segfault-madvise.
Sebastian Harl [Sat, 20 Sep 2008 19:12:39 +0000 (21:12 +0200)]
Added bts498183-segfault-madvise.

This fixes a segfault on sparc caused by a wrong argument passed to
madvise(2). Thanks to Jurij Smakov for valuable debugging information.

Closes: #498183
16 years agoAdded upstream patch bts499350-data-corruption.
Sebastian Harl [Sat, 20 Sep 2008 18:47:58 +0000 (20:47 +0200)]
Added upstream patch bts499350-data-corruption.

This fixes data corruption when updating multiple values in one go.

Closes: #499350
16 years agoAdded debian/patches/bts493553-pango-utf-8. debian/1.3.1-3
Sebastian Harl [Mon, 4 Aug 2008 13:59:33 +0000 (15:59 +0200)]
Added debian/patches/bts493553-pango-utf-8.

This patch tries to make sure an UTF-8 string is passed to
pango_layout_set_{text,markup}() as required by libpango.

Closes: #493553
16 years agoAdded "libxml2-dev" to librrd-dev's dependencies.
Sebastian Harl [Sat, 2 Aug 2008 09:14:09 +0000 (11:14 +0200)]
Added "libxml2-dev" to librrd-dev's dependencies.

Closes: #493342.
16 years agolibrrd-dev provides librrd2-dev as well. debian/1.3.1-2
Sebastian Harl [Wed, 30 Jul 2008 09:45:51 +0000 (11:45 +0200)]
librrd-dev provides librrd2-dev as well.

None of the reverse dependencies are affected by the API changes, so, now, a
binNMU will do for all of them.

16 years agoChanged distribution from experimental to unstable.
Sebastian Harl [Fri, 25 Jul 2008 10:46:21 +0000 (12:46 +0200)]
Changed distribution from experimental to unstable.

16 years agolibrrd-dev replaces librrd2-dev to ease the transition.
Sebastian Harl [Fri, 25 Jul 2008 09:32:07 +0000 (11:32 +0200)]
librrd-dev replaces librrd2-dev to ease the transition.

16 years agoRemoved bts428780-validate-row-count.
Sebastian Harl [Fri, 25 Jul 2008 09:29:24 +0000 (11:29 +0200)]
Removed bts428780-validate-row-count.

This is included in upstream version 1.3.

16 years agoUpdated changelog to 1.3.1-2.
Sebastian Harl [Fri, 25 Jul 2008 09:27:11 +0000 (11:27 +0200)]
Updated changelog to 1.3.1-2.

Reuploading to unstable.

16 years agoMerge branch 'upstream'
Sebastian Harl [Fri, 25 Jul 2008 09:21:54 +0000 (11:21 +0200)]
Merge branch 'upstream'

16 years agoMerged branch 'upstream-1.3' into upstream.
Sebastian Harl [Fri, 25 Jul 2008 09:21:03 +0000 (11:21 +0200)]
Merged branch 'upstream-1.3' into upstream.

16 years agoMerged branch 'experimental' into master.
Sebastian Harl [Fri, 25 Jul 2008 09:08:07 +0000 (11:08 +0200)]
Merged branch 'experimental' into master.

16 years agoUpdated changelog to 1.3.1-1. experimental/1.3.1-1
Sebastian Harl [Wed, 23 Jul 2008 19:45:07 +0000 (21:45 +0200)]
Updated changelog to 1.3.1-1.

16 years agoMerged debian/changelog from 'master' into experimental.
Sebastian Harl [Wed, 23 Jul 2008 19:42:53 +0000 (21:42 +0200)]
Merged debian/changelog from 'master' into experimental.

16 years agoMerge branch 'upstream-1.3' into experimental
Sebastian Harl [Wed, 23 Jul 2008 19:42:13 +0000 (21:42 +0200)]
Merge branch 'upstream-1.3' into experimental

16 years agoImported upstream version 1.3.1. upstream/1.3.1
Sebastian Harl [Wed, 23 Jul 2008 19:40:04 +0000 (21:40 +0200)]
Imported upstream version 1.3.1.

16 years agoChanged distribution from UNRELEASED to unstable. debian/1.2.28-1
Sebastian Harl [Wed, 23 Jul 2008 19:23:48 +0000 (21:23 +0200)]
Changed distribution from UNRELEASED to unstable.

16 years agoInstall "NEWS" and "CHANGES" into all packages.
Sebastian Harl [Wed, 23 Jul 2008 19:01:31 +0000 (21:01 +0200)]
Install "NEWS" and "CHANGES" into all packages.

Up to now, "NEWS" has not been installed at all while "CHANGES" was missing in
arch-independent packages.

16 years agoAdded libc6-dev | libc-dev to librrd2-dev's dependencies.
Sebastian Harl [Wed, 23 Jul 2008 18:59:01 +0000 (20:59 +0200)]
Added libc6-dev | libc-dev to librrd2-dev's dependencies.

16 years agoNo longer conflict / replace librrd0 and librrd0-dev.
Sebastian Harl [Wed, 23 Jul 2008 18:56:57 +0000 (20:56 +0200)]
No longer conflict / replace librrd0 and librrd0-dev.

librrd0 is no longer available since Etch.

16 years agoAdded the private symbol "rra_random_row@Base 1.2.28-1".
Sebastian Harl [Wed, 23 Jul 2008 18:49:21 +0000 (20:49 +0200)]
Added the private symbol "rra_random_row@Base 1.2.28-1".

16 years agoAdded upstream patch debian/patches/bts428780-validate-row-count.
Sebastian Harl [Wed, 23 Jul 2008 18:20:41 +0000 (20:20 +0200)]
Added upstream patch debian/patches/bts428780-validate-row-count.

Validate the RRA row count in rrdcreate. This closes #428780.

16 years agoUpdated standards-version to 3.8.0 - no changes.
Sebastian Harl [Wed, 23 Jul 2008 18:15:10 +0000 (20:15 +0200)]
Updated standards-version to 3.8.0 - no changes.

16 years agoUpdated changelog to 1.2.28-1.
Sebastian Harl [Wed, 23 Jul 2008 18:12:05 +0000 (20:12 +0200)]
Updated changelog to 1.2.28-1.

16 years agoMerge branch 'upstream'
Sebastian Harl [Wed, 23 Jul 2008 17:57:48 +0000 (19:57 +0200)]
Merge branch 'upstream'

16 years agoImported upstream version 1.2.28. upstream/1.2.28
Sebastian Harl [Wed, 23 Jul 2008 17:57:15 +0000 (19:57 +0200)]
Imported upstream version 1.2.28.

16 years agodebian/changelog: Merged the unreleased entry of 1.2.27-3 into 1.3.0-1. experimental/1.3.0-1
Sebastian Harl [Sun, 15 Jun 2008 12:56:59 +0000 (14:56 +0200)]
debian/changelog: Merged the unreleased entry of 1.2.27-3 into 1.3.0-1.

16 years agodebian/rules: Use tcl-dev instead of tcl to determine the TCL version.
Sebastian Harl [Sun, 15 Jun 2008 12:26:40 +0000 (14:26 +0200)]
debian/rules: Use tcl-dev instead of tcl to determine the TCL version.

This way, we don't depend on tcl-dev having a dependency on tcl for this to
work.

Also, the regex used to determine the version from the "dpkg -s" output has
been hardened by checking for word boundaries.

16 years agoAdded libc6-dev as an option for libc-dev in librrd-dev's dependencies.
Sebastian Harl [Sun, 15 Jun 2008 12:10:52 +0000 (14:10 +0200)]
Added libc6-dev as an option for libc-dev in librrd-dev's dependencies.

Also added a changelog entry for adding that dependency.

16 years agoAdded a note about the upload to experimental to the changelog.
Sebastian Harl [Sun, 15 Jun 2008 11:23:39 +0000 (13:23 +0200)]
Added a note about the upload to experimental to the changelog.

16 years agoNo longer conflict / replace librrd0 and librrd0-dev.
Sebastian Harl [Sat, 14 Jun 2008 21:32:15 +0000 (23:32 +0200)]
No longer conflict / replace librrd0 and librrd0-dev.

librrd0 is no longer available since Etch.

16 years agoRemoved SONAME version from the -dev package.
Sebastian Harl [Sat, 14 Jun 2008 21:23:04 +0000 (23:23 +0200)]
Removed SONAME version from the -dev package.

 * Renamed librrd4-dev to librrd-dev.
 * Added conflict on librrd2-dev to librrd-dev (replacing librrd4-dev's
   conflict with librrd-dev).

16 years agoAdded libc-dev to the build-dependencies of librrd4-dev.
Sebastian Harl [Sat, 14 Jun 2008 20:58:39 +0000 (22:58 +0200)]
Added libc-dev to the build-dependencies of librrd4-dev.

16 years agoClosing #428780.
Sebastian Harl [Fri, 13 Jun 2008 18:16:42 +0000 (20:16 +0200)]
Closing #428780.

I did not have the bug number available when updating the changelog.

16 years agoFixed a typo in debian/control.
Sebastian Harl [Fri, 13 Jun 2008 15:27:04 +0000 (17:27 +0200)]
Fixed a typo in debian/control.

The short description of the "librrd-ruby1.8" binary package mentioned Ruby
1.9 instead of Ruby 1.8.

16 years agoUpdated standards-version to 3.8.0.
Sebastian Harl [Fri, 13 Jun 2008 15:08:31 +0000 (17:08 +0200)]
Updated standards-version to 3.8.0.

No changes were necessary.

16 years agoUpdated to rrdtool-1.3.0-1.
Sebastian Harl [Thu, 12 Jun 2008 21:33:10 +0000 (23:33 +0200)]
Updated to rrdtool-1.3.0-1.

 * Updated librrd4.symbols.
 * Removed patches/long-version which is no longer necessary.

16 years agoMerge branch 'upstream-1.3' into experimental
Sebastian Harl [Thu, 12 Jun 2008 21:19:40 +0000 (23:19 +0200)]
Merge branch 'upstream-1.3' into experimental

16 years agoImported upstream version 1.3.0. upstream/1.3.0
Sebastian Harl [Thu, 12 Jun 2008 21:18:32 +0000 (23:18 +0200)]
Imported upstream version 1.3.0.

16 years agoAdded conflict with librrd-dev to librrd4-dev.
Sebastian Harl [Sun, 8 Jun 2008 19:56:25 +0000 (21:56 +0200)]
Added conflict with librrd-dev to librrd4-dev.

This prevents two -dev packages from being installed simultaneously.