diff -Nru caffe-1.0.0/debian/changelog caffe-1.0.0/debian/changelog --- caffe-1.0.0/debian/changelog 2017-05-15 02:08:06.000000000 +0000 +++ caffe-1.0.0/debian/changelog 2017-06-23 01:39:36.000000000 +0000 @@ -1,3 +1,11 @@ +caffe (1.0.0-3) unstable; urgency=medium + + * Upload to unstable. + * Set Multi-Arch of the dev package to same. + * Bump Standards Version to 4.0.0 (No change needed). + + -- Zhou Mo Fri, 23 Jun 2017 01:39:36 +0000 + caffe (1.0.0-2) experimental; urgency=medium * Rename static library libproto.a -> libcaffeproto.a and add it back diff -Nru caffe-1.0.0/debian/control caffe-1.0.0/debian/control --- caffe-1.0.0/debian/control 2017-04-17 02:49:50.000000000 +0000 +++ caffe-1.0.0/debian/control 2017-06-23 01:39:36.000000000 +0000 @@ -51,7 +51,7 @@ python3-scipy, python3-six, python3-yaml, -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: http://caffe.berkeleyvision.org Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/caffe.git Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/caffe.git @@ -114,7 +114,7 @@ Package: libcaffe-cpu-dev Section: libdevel Architecture: any -Multi-Arch: foreign +Multi-Arch: same Conflicts: libcaffe-cuda-dev Depends: libcaffe-cpu1 (= ${binary:Version}), ${misc:Depends} Suggests: caffe-doc diff -Nru caffe-1.0.0/debian/patches/cmake-change-static-lib-name.patch caffe-1.0.0/debian/patches/cmake-change-static-lib-name.patch --- caffe-1.0.0/debian/patches/cmake-change-static-lib-name.patch 2017-05-15 01:51:49.000000000 +0000 +++ caffe-1.0.0/debian/patches/cmake-change-static-lib-name.patch 2017-06-23 01:39:36.000000000 +0000 @@ -1,3 +1,5 @@ +Purpose: change the statis library name so it would not be ambiguous. +Forward: This is already merged upstream. diff --git a/src/caffe/CMakeLists.txt b/src/caffe/CMakeLists.txt index b9152e9..4a80556 100644 --- a/src/caffe/CMakeLists.txt