From 31d9d00812e0413bbc30c4ce095db211eb56a90b Mon Sep 17 00:00:00 2001 From: Bernd Zeimetz Date: Sat, 9 Feb 2008 17:24:03 +0100 Subject: [PATCH] Fixing several lintian warnings and errors --- debian/control | 23 +++++++++++++++---- debian/copyright | 12 ++++------ ...librrd2-dev.install => librrd-dev.install} | 0 debian/rules | 5 ++-- 4 files changed, 27 insertions(+), 13 deletions(-) rename debian/{librrd2-dev.install => librrd-dev.install} (100%) diff --git a/debian/control b/debian/control index 3ef4891..52bc7ca 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: rrdtool Section: utils Priority: optional Maintainer: Debian RRDtool Team -Uploaders: Alexander Wirt +Uploaders: Alexander Wirt , Bernd Zeimetz Standards-Version: 3.7.3 Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, zlib1g-dev, libpng12-dev, libart-2.0-dev, libfreetype6-dev, @@ -49,11 +49,26 @@ Description: Time-series data storage and display system (runtime library) This package contains shared libraries used to access and manipulate RRDs. Package: librrd2-dev +Architecture: all +Section: libdevel +Depends: librrd-dev +Description: Transitional dummy package + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package is a transitional dummy package to easy the transition towards + a -dev package name without encoded soname. + +Package: librrd-dev Architecture: any Section: libdevel -Depends: librrd2 (= ${Source-Version}), libpng12-dev, zlib1g-dev, libart-2.0-dev, libfreetype6-dev, ${misc:Depends} -Conflicts: librrd0-dev, librrd0 -Replaces: librrd0 +Depends: librrd2 (= ${binary:Version}), libpng12-dev, zlib1g-dev, libart-2.0-dev, libfreetype6-dev, ${misc:Depends} +Conflicts: librrd0-dev, librrd0, librrd2-dev (<< 1.2.26) +Replaces: librrd0, librrd2-dev (<< 1.2.26) Description: Time-series data storage and display system (development) The Round Robin Database Tool (RRDtool) is a system to store and display time-series data (e.g. network bandwidth, machine-room temperature, diff --git a/debian/copyright b/debian/copyright index c42f990..b9c61f6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,8 +33,8 @@ Copyright: more details. You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA FLOSS License Exception ======================= @@ -133,8 +133,7 @@ Files with different copyrights/licenses: You should have received a copy of the GNU Lesser General Public License along with Foobar; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, a copy of the GNU Lesser General Public License, version 2, can be found in the file /usr/share/common-licenses/LGPL-2 @@ -286,9 +285,8 @@ Files with different copyrights/licenses: You should have received a copy of the GNU Library General Public License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - + write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * src/rrd_not_thread_safe.c, rrd_thread_safe.c: diff --git a/debian/librrd2-dev.install b/debian/librrd-dev.install similarity index 100% rename from debian/librrd2-dev.install rename to debian/librrd-dev.install diff --git a/debian/rules b/debian/rules index d451c00..4d7a850 100755 --- a/debian/rules +++ b/debian/rules @@ -165,9 +165,10 @@ binary-indep: dh_testroot echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby + dh_link -plibrrd2-dev /usr/share/doc/librrd-dev /usr/share/doc/librrd2-dev dh_installchangelogs - dh_installdocs -s -Nlibrrd-ruby - dh_link -s -Nlibrrd-ruby + dh_installdocs -s -Nlibrrd-ruby -Nlibrrd2-dev + dh_link -s -Nlibrrd-ruby -Nlibrrd2-dev dh_perl -s dh_compress -s dh_fixperms -s -- 2.30.2