diff --git a/debian/changelog b/debian/changelog index 5209f71f2d..f11559588f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -nextcloud-desktop (2.6.2-1) unstable; urgency=medium +nextcloud-desktop (2.6.2-1) stable; urgency=medium * New upstream release. * Remove upstream applied patches. @@ -10,13 +10,13 @@ nextcloud-desktop (2.6.2-1) unstable; urgency=medium -- Sandro Knauß Sun, 12 Jan 2020 12:28:23 +0100 -nextcloud-desktop (2.6.1-3) experimental; urgency=medium +nextcloud-desktop (2.6.1-3) stable; urgency=medium * Use python3-caja instead of python-caja (Closes: #945674). -- Sandro Knauß Tue, 17 Dec 2019 22:28:22 +0100 -nextcloud-desktop (2.6.1-2) unstable; urgency=medium +nextcloud-desktop (2.6.1-2) stable; urgency=medium [ Norbert Preining ] * Add upstream patch upstream_Fix_remote_wipe_keychain_storage.patch @@ -26,7 +26,7 @@ nextcloud-desktop (2.6.1-2) unstable; urgency=medium -- Sandro Knauß Sat, 07 Dec 2019 17:10:33 +0100 -nextcloud-desktop (2.6.1-1) unstable; urgency=medium +nextcloud-desktop (2.6.1-1) stable; urgency=medium [ Sandro Knauß ] * Update depdends from python-natuilus -> python3-nautilus. (Closes: #942776) @@ -41,7 +41,7 @@ nextcloud-desktop (2.6.1-1) unstable; urgency=medium -- Alf Gaida Sun, 17 Nov 2019 20:35:13 +0100 -nextcloud-desktop (2.6.0-1) unstable; urgency=medium +nextcloud-desktop (2.6.0-1) stable; urgency=medium [ Alf Gaida ] * New upstream release @@ -62,7 +62,7 @@ nextcloud-desktop (2.6.0-1) unstable; urgency=medium -- Alf Gaida Thu, 03 Oct 2019 15:12:56 +0200 -nextcloud-desktop (2.5.3-1) unstable; urgency=medium +nextcloud-desktop (2.5.3-1) stable; urgency=medium [ Sandro Knauß ] * New upstream release. @@ -77,14 +77,14 @@ nextcloud-desktop (2.5.3-1) unstable; urgency=medium -- Sandro Knauß Thu, 29 Aug 2019 20:15:33 +0200 -nextcloud-desktop (2.5.1-3) unstable; urgency=medium +nextcloud-desktop (2.5.1-3) stable; urgency=medium * Fix "Subfolders of moved folders not synced" (Closes: #929079) Added 0005-Fixed-Issue-1000-Subfolders-of-moved-folders-not-syn.patch -- Sandro Knauß Thu, 16 May 2019 16:14:50 +0200 -nextcloud-desktop (2.5.1-2) unstable; urgency=medium +nextcloud-desktop (2.5.1-2) stable; urgency=medium [ Adrian Heine ] * Fix VCS urls @@ -94,7 +94,7 @@ nextcloud-desktop (2.5.1-2) unstable; urgency=medium -- Sandro Knauß Tue, 12 Feb 2019 23:54:02 +0100 -nextcloud-desktop (2.5.1-1) unstable; urgency=medium +nextcloud-desktop (2.5.1-1) stable; urgency=medium * Initial release (Closes: #847613) diff --git a/debian/control b/debian/control index 8263d1c4f4..c794a7d679 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: appstream, dh-python, doxygen, extra-cmake-modules (>= 1.2.0~), + libavcodec58, libcloudproviders-dev, libcmocka-dev, libdbus-1-dev, @@ -46,6 +47,7 @@ Depends: libnextcloudsync0 (= ${binary:Version}), nextcloud-desktop-l10n, ${misc:Depends}, ${shlibs:Depends} +Replaces: nextcloud-client (<< ${binary:Version}) Recommends: nextcloud-desktop-doc Description: Nextcloud folder synchronization tool The Nextcloud desktop app lets you always have your latest files wherever @@ -103,6 +105,7 @@ Package: nextcloud-desktop-common Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} +Replaces: libnextcloudsync0 (<< ${binary:Version}), nextcloud-client (<< ${binary:Version}) Description: Nextcloud folder synchronization - common data The Nextcloud desktop app lets you always have your latest files wherever you are. Just specify one or more folders on the local machine to and a server @@ -116,6 +119,7 @@ Package: nextcloud-desktop-l10n Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} +Replaces: nextcloud-client-l10n (<< ${binary:Version}) Section: localization Description: Nextcloud folder synchronization - localization The Nextcloud desktop app lets you always have your latest files wherever @@ -134,6 +138,7 @@ Depends: libnextcloudsync0 (= ${binary:Version}), nextcloud-desktop-l10n, ${misc:Depends}, ${shlibs:Depends} +Replaces: nextcloud-client (<< ${binary:Version}) Description: folder synchronization with an Nextcloud server - cmd client The Nextcloud desktop app lets you always have your latest files wherever you are. Just specify one or more folders on the local machine to and a server diff --git a/debian/gbp.conf b/debian/gbp.conf index b8cecddbb9..b1bb4dcdb5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/base +debian-branch = debian/dist/buster/master upstream-branch = master pristine-tar = True compression = gz diff --git a/debian/patches/0002-disable-updatecheck.patch b/debian/patches/0002-disable-updatecheck.patch deleted file mode 100644 index 3e6deeee4b..0000000000 --- a/debian/patches/0002-disable-updatecheck.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Phoning-home version checks should be disabled in Debian packages -Author: Sandro Knauß -Origin: Debian -Forwarded: not-needed -Last-Update: 2019-01-15 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/gui/generalsettings.cpp -+++ b/src/gui/generalsettings.cpp -@@ -149,11 +149,14 @@ void GeneralSettings::loadMiscSettings() - - void GeneralSettings::slotUpdateInfo() - { -+ /* Debian don't want an autoupdater - // Note: the sparkle-updater is not an OCUpdater - OCUpdater *updater = qobject_cast(Updater::instance()); - if (ConfigFile().skipUpdateCheck()) { - updater = nullptr; // don't show update info if updates are disabled - } -+ */ -+ OCUpdater *updater = nullptr; - - if (updater) { - connect(updater, &OCUpdater::downloadStateChanged, this, &GeneralSettings::slotUpdateInfo, Qt::UniqueConnection); ---- a/src/libsync/configfile.cpp -+++ b/src/libsync/configfile.cpp -@@ -556,11 +556,14 @@ bool ConfigFile::skipUpdateCheck(const Q - if (connection.isEmpty()) - con = defaultConnection(); - -- QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false); -+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true); - fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback); - - QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback); -- return value.toBool(); -+ if ( !value.toBool() ) { -+ qDebug() << "debian disabled the UpdateCheck mechanism."; -+ } -+ return true; - } - - void ConfigFile::setSkipUpdateCheck(bool skip, const QString &connection) diff --git a/debian/patches/0005-fix-wrong-include.patch b/debian/patches/0005-fix-wrong-include.patch deleted file mode 100644 index ef622b71c3..0000000000 --- a/debian/patches/0005-fix-wrong-include.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Fixes incomplete renaming to nextcloud - Upstream really should build with tests. - ---- -Last-Update: 2019-11-15 - ---- nextcloud-desktop-2.6.1.orig/test/testnextcloudpropagator.cpp -+++ nextcloud-desktop-2.6.1/test/testnextcloudpropagator.cpp -@@ -8,7 +8,7 @@ - #include - - #include "propagatedownload.h" --#include "nextcloudpropagator_p.h" -+#include "owncloudpropagator_p.h" - - using namespace OCC; - namespace OCC { diff --git a/debian/patches/series b/debian/patches/series index c1504e51d4..08ba6ecb15 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ 0001-fix-installationpath-of-dolphin-plugin.patch -0002-disable-updatecheck.patch 0003-use_system_buildflags.patch 0004-sane-cmake.patch -0005-fix-wrong-include.patch