diff options
author | Michael Biebl <biebl@debian.org> | 2010-07-07 17:19:52 +0200 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2010-07-07 17:19:55 +0200 |
commit | 3477f0f2cb0adf49e02a367bfa3f33ca3389b911 (patch) | |
tree | 66c7a8fbad9e4b1c95652c0cb32fc6489cdf2c4a | |
parent | ef87e662f2b4e83e2bf53e2e42aa704d42e54808 (diff) | |
download | rsyslog-3477f0f2cb0adf49e02a367bfa3f33ca3389b911.tar.gz |
Bump Standards-Version to 3.9.0.
Use Breaks instead of Conflicts as recommended by the new policy.
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3bb70cd..31d4282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ rsyslog (4.6.3-1) UNRELEASED; urgency=low - Bump Build-Depends on autotools-dev to (>= 20100122.1) for the autotools_dev dh addon. - Convert debian/rules to dh. + * Bump Standards-Version to 3.9.0. Use Breaks instead of Conflicts as + recommended by the new policy. -- Michael Biebl <biebl@debian.org> Wed, 07 Jul 2010 15:40:46 +0200 diff --git a/debian/control b/debian/control index 7e29ace..0ad3e31 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: important Maintainer: Michael Biebl <biebl@debian.org> Build-Depends: debhelper (>= 7.0.50), autotools-dev (>= 20100122.1), zlib1g-dev, libmysqlclient-dev, libpq-dev, libkrb5-dev, libgnutls-dev, librelp-dev, pkg-config -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary Homepage: http://www.rsyslog.com/ @@ -37,7 +37,7 @@ Package: rsyslog-doc Section: doc Priority: extra Architecture: all -Conflicts: rsyslog (<< 2.0.1-2) +Breaks: rsyslog (<< 2.0.1-2) Replaces: rsyslog (<< 2.0.1-2) Depends: ${misc:Depends} Suggests: doc-base, www-browser |