diff -Nru caffe-1.0.0/debian/changelog caffe-1.0.0/debian/changelog --- caffe-1.0.0/debian/changelog 2017-06-25 08:49:59.000000000 +0000 +++ caffe-1.0.0/debian/changelog 2017-06-23 01:39:36.000000000 +0000 @@ -1,14 +1,10 @@ -caffe (1.0.0-2build2) artful; urgency=medium +caffe (1.0.0-3) unstable; urgency=medium - * No-change rebuild against libgflags2.2 + * Upload to unstable. + * Set Multi-Arch of the dev package to same. + * Bump Standards Version to 4.0.0 (No change needed). - -- Steve Langasek Sun, 25 Jun 2017 08:49:59 +0000 - -caffe (1.0.0-2build1) artful; urgency=medium - - * No-change rebuild against OpenCV 3.1. - - -- Mattia Rizzolo Tue, 20 Jun 2017 14:03:06 +0200 + -- Zhou Mo Fri, 23 Jun 2017 01:39:36 +0000 caffe (1.0.0-2) experimental; urgency=medium diff -Nru caffe-1.0.0/debian/control caffe-1.0.0/debian/control --- caffe-1.0.0/debian/control 2017-06-25 08:49:59.000000000 +0000 +++ caffe-1.0.0/debian/control 2017-06-23 01:39:36.000000000 +0000 @@ -1,8 +1,7 @@ Source: caffe Section: science Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Science Maintainers +Maintainer: Debian Science Maintainers Uploaders: Zhou Mo Build-Depends-Indep: doxygen, doxygen-latex @@ -52,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 @@ -115,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