From: Raspbian automatic forward porter Date: Sun, 10 Apr 2022 16:03:26 +0000 (+0100) Subject: Merge version 8.0.5-1+rpi1 and 8.0.6+ds1-2 to produce 8.0.6+ds1-2+rpi1 X-Git-Tag: archive/raspbian/8.0.6+ds1-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0d1884a1a7210c17c2790a7cad46b0cc68962212;p=seafile-client.git Merge version 8.0.5-1+rpi1 and 8.0.6+ds1-2 to produce 8.0.6+ds1-2+rpi1 --- 0d1884a1a7210c17c2790a7cad46b0cc68962212 diff --cc debian/changelog index 03e6af1,2c5b48b..a73abdd --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,16 +1,23 @@@ - seafile-client (8.0.5-1+rpi1) bookworm-staging; urgency=medium ++seafile-client (8.0.6+ds1-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 6.2.7-1+rpi1 by Peter Michael Green at Sat, 01 Dec 2018 05:02:42 +0000] + * Switch armhf from qtwebengine to qtwebkit. + - -- Raspbian forward porter Tue, 30 Nov 2021 20:48:31 +0000 ++ -- Raspbian forward porter Sun, 10 Apr 2022 16:03:25 +0000 ++ + seafile-client (8.0.6+ds1-2) unstable; urgency=medium + + * Set source-Upstream-Version to the *actual* upstream version + without repack suffix (Closes: #1008826) + + -- Moritz Schlarb Mon, 04 Apr 2022 11:42:59 +0200 + + seafile-client (8.0.6+ds1-1) unstable; urgency=medium + + * Prepare watch file with repack suffix for next time + * New upstream version 8.0.6+ds1 + + -- Moritz Schlarb Thu, 31 Mar 2022 08:46:45 +0200 seafile-client (8.0.5-1) unstable; urgency=medium diff --cc debian/rules index 3b68d40,be9c689..415a58b --- a/debian/rules +++ b/debian/rules @@@ -17,12 -20,8 +20,10 @@@ export QT_SELECT= CMAKE_FLAGS = -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DBUILD_SHIBBOLETH_SUPPORT=ON -DAUTOMOC_MOC_OPTIONS=-p./ - include /usr/share/dpkg/architecture.mk - ifeq ($(DEB_HOST_ARCH),armel) CMAKE_FLAGS += -DUSE_QT_WEBKIT=ON +else ifeq ($(DEB_HOST_ARCH),armhf) + CMAKE_FLAGS += -DUSE_QT_WEBKIT=ON else ifeq ($(DEB_HOST_ARCH),mips) CMAKE_FLAGS += -DUSE_QT_WEBKIT=ON else ifeq ($(DEB_HOST_ARCH),mips64el)