[caffe-contrib] 316/362: debian/*: rename libcaffe-*0 to libcaffe-*1 due to soversion change

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit c763f9a6dc1528063b62676236589e4ba46ff696
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Mar 12 11:09:29 2016 +0000

    debian/*: rename libcaffe-*0 to libcaffe-*1 due to soversion change
---
 debian/clean   |  4 ++--
 debian/control | 20 ++++++++++----------
 debian/rules   | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/debian/clean b/debian/clean
index 6b022c6..9a756cb 100644
--- a/debian/clean
+++ b/debian/clean
@@ -3,9 +3,9 @@ debian/caffe-cpu.manpages
 debian/caffe-cuda.install
 debian/caffe-cuda.manpages
 debian/libcaffe-cpu-dev.install
-debian/libcaffe-cpu0.install
+debian/libcaffe-cpu1.install
 debian/libcaffe-cuda-dev.install
-debian/libcaffe-cuda0.install
+debian/libcaffe-cuda1.install
 debian/python-caffe-cpu.docs
 debian/python-caffe-cpu.examples
 debian/python-caffe-cpu.install
diff --git a/debian/control b/debian/control
index adaaef9..4de7762 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ X-Python-Version: >= 2.7
 Package: caffe-cpu
 Architecture: any
 Depends: bash-completion,
-         libcaffe-cpu0 (= ${binary:Version}),
+         libcaffe-cpu1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: caffe-cuda
@@ -48,11 +48,11 @@ Description: Fast open framework for Deep Learning (Tools, CPU_ONLY)
  .
  This package contains caffe executables, configured as CPU_ONLY.
 
-Package: libcaffe-cpu0
+Package: libcaffe-cpu1
 Section: contrib/libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libcaffe-cuda0
+Conflicts: libcaffe-cuda1
 Description: Fast open framework for Deep Learning (Lib, CPU_ONLY)
  Caffe is a deep learning framework made with expression, speed,
  and modularity in mind. It is developed by the Berkeley Vision
@@ -64,7 +64,7 @@ Package: libcaffe-cpu-dev
 Section: contrib/libdevel
 Architecture: any
 Conflicts: libcaffe-cuda-dev
-Depends: libcaffe-cpu0 (= ${binary:Version}), ${misc:Depends}
+Depends: libcaffe-cpu1 (= ${binary:Version}), ${misc:Depends}
 Description: Fast open framework for Deep Learning (Dev, CPU_ONLY)
  Caffe is a deep learning framework made with expression, speed,
  and modularity in mind. It is developed by the Berkeley Vision
@@ -75,7 +75,7 @@ Description: Fast open framework for Deep Learning (Dev, CPU_ONLY)
 Package: caffe-cuda
 Architecture: amd64 ppc64el
 Depends: bash-completion,
-         libcaffe-cuda0 (= ${binary:Version}),
+         libcaffe-cuda1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: caffe-cpu
@@ -86,11 +86,11 @@ Description: Fast open framework for Deep Learning (Tools, CUDA)
  .
  This package contains caffe executables, configured with CUDA.
 
-Package: libcaffe-cuda0
+Package: libcaffe-cuda1
 Section: contrib/libs
 Architecture: amd64 ppc64el
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libcaffe-cpu0
+Conflicts: libcaffe-cpu1
 Description: Fast open framework for Deep Learning (Lib, CUDA)
  Caffe is a deep learning framework made with expression, speed,
  and modularity in mind. It is developed by the Berkeley Vision
@@ -101,7 +101,7 @@ Description: Fast open framework for Deep Learning (Lib, CUDA)
 Package: libcaffe-cuda-dev
 Section: contrib/libdevel
 Architecture: amd64 ppc64el
-Depends: libcaffe-cuda0 (= ${binary:Version}), ${misc:Depends}
+Depends: libcaffe-cuda1 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libcaffe-cpu-dev
 Description: Fast open framework for Deep Learning (Dev, CUDA)
  Caffe is a deep learning framework made with expression, speed,
@@ -113,7 +113,7 @@ Description: Fast open framework for Deep Learning (Dev, CUDA)
 Package: python-caffe-cpu
 Section: contrib/python
 Architecture: any
-Depends: libcaffe-cpu0 (= ${binary:Version}),
+Depends: libcaffe-cpu1 (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
@@ -129,7 +129,7 @@ Description: Fast open framework for Deep Learning (Python2, CPU_ONLY)
 Package: python-caffe-cuda
 Section: contrib/python
 Architecture: amd64 ppc64el
-Depends: libcaffe-cuda0 (= ${binary:Version}),
+Depends: libcaffe-cuda1 (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index 6e4169b..e5483f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,8 @@ CAFFE_SOVER   := "1.0.0-rc3"
 
 CAFFE_CPU_BUILDDIR  := "caffe_cpu_build"
 CAFFE_CUDA_BUILDDIR := "caffe_cuda_build"
-SUITE_CPU    := caffe-cpu  libcaffe-cpu0  libcaffe-cpu-dev  python-caffe-cpu
-SUITE_CUDA   := caffe-cuda libcaffe-cuda0 libcaffe-cuda-dev python-caffe-cuda
+SUITE_CPU    := caffe-cpu  libcaffe-cpu1  libcaffe-cpu-dev  python-caffe-cpu
+SUITE_CUDA   := caffe-cuda libcaffe-cuda1 libcaffe-cuda-dev python-caffe-cuda
 SUITE_CPU_P  := $(foreach PKG, $(SUITE_CPU),  --package=$(PKG))
 SUITE_CUDA_P := $(foreach PKG, $(SUITE_CUDA), --package=$(PKG))
 
@@ -73,10 +73,10 @@ autogen:
 		< debian/caffe.manpages.in > debian/caffe-cuda.manpages
 	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cpu}g;" \
 		-e 's{#CAFFE_SOVER#}{$(CAFFE_SOVER)}g;' \
-		< debian/libcaffe.install.in > debian/libcaffe-cpu0.install
+		< debian/libcaffe.install.in > debian/libcaffe-cpu1.install
 	perl -p -e "s{#CAFFE_CONFIGURE#}{caffe_cuda}g;" \
 		-e 's{#CAFFE_SOVER#}{$(CAFFE_SOVER)}g;' \
-		< debian/libcaffe.install.in > debian/libcaffe-cuda0.install
+		< debian/libcaffe.install.in > debian/libcaffe-cuda1.install
 	perl -p -e 's{#CAFFE_CONFIGURE#}{caffe_cpu}g;' \
 		< debian/libcaffe-dev.install.in > debian/libcaffe-cpu-dev.install
 	perl -p -e 's{#CAFFE_CONFIGURE#}{caffe_cuda}g;' \
@@ -156,9 +156,9 @@ endif
 	dh_makeshlibs --remaining-packages
 
 override_dh_shlibdeps:
-	dh_shlibdeps $(SUITE_CPU_P) -- -xlibcaffe-cuda0
+	dh_shlibdeps $(SUITE_CPU_P) -- -xlibcaffe-cuda1
 ifeq (y, $(flag_build_caffe_cuda))
-	dh_shlibdeps $(SUITE_CUDA_P) -- -xlibcaffe-cpu0
+	dh_shlibdeps $(SUITE_CUDA_P) -- -xlibcaffe-cpu1
 endif
 
 get-orig-source:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git