From b1fbdd16de8895f743d3153bdee7f54bfb72b3de Mon Sep 17 00:00:00 2001 From: Kirill Smorodinnikov Date: Mon, 31 Jul 2017 17:23:32 +0300 Subject: [PATCH] remove 2.27 from elliptics-client package --- debian/control | 8 ++++---- ...ics-client2.27.install => elliptics-client.install} | 0 debian/rules | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) rename debian/{elliptics-client2.27.install => elliptics-client.install} (100%) diff --git a/debian/control b/debian/control index 4fdc2db84..7b02abfb8 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, eblob (>= 0.23.11), - elliptics-client2.27 (= ${Source-Version}), + elliptics-client (= ${Source-Version}), handystats (>= 1.11.6), libkora-util1 (= 1.1.0-rc1), libblackhole1 (>= 1.7.0-1) @@ -41,7 +41,7 @@ Provides: elliptics-2.10 Description: Distributed hash table storage Elliptics network is a fault tolerant distributed hash table object storage. -Package: elliptics-client2.27 +Package: elliptics-client Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -55,7 +55,7 @@ Description: Distributed hash table storage (client library) Package: elliptics-dbg Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, elliptics (= ${Source-Version}) | elliptics-client2.27 (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, elliptics (= ${Source-Version}) | elliptics-client (= ${Source-Version}) Replaces: elliptics-dbg-2.10 Provides: elliptics-dbg-2.10 Description: Distributed hash table storage (debug files) @@ -63,7 +63,7 @@ Description: Distributed hash table storage (debug files) Package: elliptics-dev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, elliptics-client2.27 (= ${Source-Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, elliptics-client (= ${Source-Version}) Suggests: eblob (>= 0.23.11), libkora-util1 (= 1.1.0-rc1), Description: Distributed hash table storage (includes) diff --git a/debian/elliptics-client2.27.install b/debian/elliptics-client.install similarity index 100% rename from debian/elliptics-client2.27.install rename to debian/elliptics-client.install diff --git a/debian/rules b/debian/rules index 9ab91d375..04f171be1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,20 +13,20 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_BUILD_TYPE=RelWithDebInfo DEB_DH_STRIP_ARGS := --dbg-package=elliptics-dbg DEB_DH_MAKESHLIBS_ARGS_elliptics := -V "elliptics (>= $(ELLIPTICS_VERSION)), elliptics (<< $(ELLIPTICS_NEXT_VERSION))" -DEB_DH_MAKESHLIBS_ARGS_elliptics-client2.27 := -V \ - "elliptics-client2.27 (>= $(ELLIPTICS_VERSION)) | elliptics-client (>= $(ELLIPTICS_VERSION)), \ - elliptics-client2.27 (<< $(ELLIPTICS_NEXT_VERSION)) | elliptics-client (<< $(ELLIPTICS_NEXT_VERSION))" +DEB_DH_MAKESHLIBS_ARGS_elliptics-client := -V \ + "elliptics-client (>= $(ELLIPTICS_VERSION)), \ + elliptics-client (<< $(ELLIPTICS_NEXT_VERSION))" DEB_COMPRESS_EXCLUDE := .conf DEB_MAKE_CHECK_TARGET=test DEB_BUILD_PARALLEL = yes DEB_PARALLEL_JOBS ?= $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) -DEB_PYTHON2_MODULE_PACKAGES := elliptics-client2.27 +DEB_PYTHON2_MODULE_PACKAGES := elliptics-client DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb --install-lib=$(PYTHON_LIB_PATH) include /usr/share/cdbs/1/class/python-distutils.mk -install/elliptics-client2.27:: +install/elliptics-client:: echo $(cdbs_python_current_version) > debian/pyversions clean:: rm -f debian/pyversions