From 9102155d3db8109e11f1d8b5c64b824bdbae4bac Mon Sep 17 00:00:00 2001 From: Jean-Philippe Garcia Ballester Date: Wed, 20 Dec 2006 16:16:13 +0000 Subject: [PATCH] Use libssh-SONAME instead of libsshSONAME for debian package name to avoid name clash with libssh2 package. git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@102 7dcaeef0-15fb-0310-b436-a5af3365683c --- debian/control | 10 +++++----- debian/{libssh2-dev.doc-base => libssh-2-dev.doc-base} | 4 ++-- debian/{libssh2-dev.docs => libssh-2-dev.docs} | 0 debian/{libssh2-dev.examples => libssh-2-dev.examples} | 0 debian/{libssh2-dev.install => libssh-2-dev.install} | 0 debian/{libssh2-dev.manpages => libssh-2-dev.manpages} | 0 debian/{libssh2.install => libssh-2.install} | 0 debian/rules | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename debian/{libssh2-dev.doc-base => libssh-2-dev.doc-base} (65%) rename debian/{libssh2-dev.docs => libssh-2-dev.docs} (100%) rename debian/{libssh2-dev.examples => libssh-2-dev.examples} (100%) rename debian/{libssh2-dev.install => libssh-2-dev.install} (100%) rename debian/{libssh2-dev.manpages => libssh-2-dev.manpages} (100%) rename debian/{libssh2.install => libssh-2.install} (100%) diff --git a/debian/control b/debian/control index 862b3685..c5a9a2b0 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Laurent Bigonville Build-Depends: cdbs, debhelper (>= 5.0.0), libgcrypt11-dev, libz-dev, doxygen Standards-Version: 3.7.2 -Package: libssh2 +Package: libssh-2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -19,11 +19,11 @@ Description: A tiny C SSH library . Homepage: http://0xbadc0de.be/wiki/doku.php?id=libssh:libssh -Package: libssh2-dev +Package: libssh-2-dev Provides: libssh-dev Section: libdevel Architecture: any -Depends: libssh2 (= ${Source-Version}), libgcrypt11-dev, zlib1g-dev +Depends: libssh-2 (= ${Source-Version}), libgcrypt11-dev, zlib1g-dev Conflicts: libssh-dev Description: A tiny C SSH library. Development files and documentation The ssh library was designed to be used by programmers needing a working SSH @@ -36,10 +36,10 @@ Description: A tiny C SSH library. Development files and documentation . Homepage: http://0xbadc0de.be/wiki/doku.php?id=libssh:libssh -Package: libssh2-dbg +Package: libssh-2-dbg Section: libdevel Architecture: any -Depends: libssh2 (= ${Source-Version}) +Depends: libssh-2 (= ${Source-Version}) Description: A tiny C SSH library. Debug symbols The ssh library was designed to be used by programmers needing a working SSH implementation by the mean of a library. The complete control of the client diff --git a/debian/libssh2-dev.doc-base b/debian/libssh-2-dev.doc-base similarity index 65% rename from debian/libssh2-dev.doc-base rename to debian/libssh-2-dev.doc-base index fc7679a6..b780d6e4 100644 --- a/debian/libssh2-dev.doc-base +++ b/debian/libssh-2-dev.doc-base @@ -5,5 +5,5 @@ Abstract: This manual describes libssh API. Section: Apps/Programming Format: HTML -Index: /usr/share/doc/libssh2-dev/html/index.html -Files: /usr/share/doc/libssh2-dev/html/* +Index: /usr/share/doc/libssh-2-dev/html/index.html +Files: /usr/share/doc/libssh-2-dev/html/* diff --git a/debian/libssh2-dev.docs b/debian/libssh-2-dev.docs similarity index 100% rename from debian/libssh2-dev.docs rename to debian/libssh-2-dev.docs diff --git a/debian/libssh2-dev.examples b/debian/libssh-2-dev.examples similarity index 100% rename from debian/libssh2-dev.examples rename to debian/libssh-2-dev.examples diff --git a/debian/libssh2-dev.install b/debian/libssh-2-dev.install similarity index 100% rename from debian/libssh2-dev.install rename to debian/libssh-2-dev.install diff --git a/debian/libssh2-dev.manpages b/debian/libssh-2-dev.manpages similarity index 100% rename from debian/libssh2-dev.manpages rename to debian/libssh-2-dev.manpages diff --git a/debian/libssh2.install b/debian/libssh-2.install similarity index 100% rename from debian/libssh2.install rename to debian/libssh-2.install diff --git a/debian/rules b/debian/rules index a01566f2..701ec19e 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk #include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS = --with-libgcrypt --enable-ssh1 -DEB_DBG_PACKAGE_libssh2 = libssh2-dbg +DEB_DBG_PACKAGE_libssh-2 = libssh-2-dbg -install/libssh2-dev:: +install/libssh-2-dev:: make install-doc DESTDIR=debian/tmp