prepare for release: update changelog

This reverts commit 83c95e2dd3.

debian/TODO

@@ -1,3 +1,3 @@
   * add missing manpages for syncompare and syncevo-http-server
-  * tighten dh-missing to stop just warn about filtes not installed:
-    either fix install or list in "not_installed" with explanation
+  * fix FTPFS with g++ 11 without CXXFLAG -std=c++14;
+    see <https://gitlab.freedesktop.org/SyncEvolution/syncevolution/-/issues/167>

debian/changelog

@@ -1,3 +1,35 @@
+syncevolution (2.0.0-2) experimental; urgency=medium
+
+  [ Jonas Smedegaard ]
+  * update copyright info:
+    + fix consistently use field License-Grant (not Grant)
+    + fix consistently use field Files (not bogus File)
+    + fix add License section LGPL-2
+    + tighten license-related lintian overrides
+  * fix have syncevolution-http depend on python3-gi
+    (not bogus python3-gobject:
+    earlier transitional package python-gobject pulled in python-gi)
+  * fix drop depending on python3-twisted-web:
+    bogus (transitioned to python3-twisted-core)
+    and used only by exerimental unused script
+  * tighten dh-missing to fail (not only warn) on missed files
+    + list unversioned symlinks to shared objects as not-installed
+    + list helper scripts for testing as not-installed
+  * fix install XDG startup files in syncevolution-dbus
+  * fix install SRV resolver script in syncevolution-common,
+    recommend adns-utils (or simpler fallbacks),
+    and have syncevolution-libs recommend syncevolution-common
+  * work around FTPFS with g++ 11 by setting CXXFLAG -std=c++14
+
+  [ Joao Azevedo ]
+  * list library syncactivesync.so as not installed
+    (to match upstream intent in unconventional build target)
+  * list TDEPIM libraries as not installed
+    (we no longer link against KDE libraries so unlikely to be useful)
+  * fix install libraries syncpbap providergoa
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 03 Nov 2021 15:50:49 +0100
+
 syncevolution (2.0.0-1) experimental; urgency=medium
 
   [ upstream ]

debian/control

@@ -74,6 +74,8 @@ Architecture: all
 Depends:
  libsynthesis0v5 (>= 3.4.0.47.5),
  ${misc:Depends},
+Recommends:
+ adns-tools | host | dnsutils,
 Description: Sync personal information data via SyncML/CalDAV/CardDAV (common files)
  SyncEvolution synchronizes contact, calendar and task items via SyncML and
  CalDAV/CardDAV with other servers or devices. It uses the Evolution Data Server
@@ -90,6 +92,8 @@ Depends:
  syncevolution-libs-gnome (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
+Recommends:
+ syncevolution-common (= ${source:Version}),
 Description: Sync personal information data via SyncML/CalDAV/CardDAV (backend libraries)
  SyncEvolution synchronizes contact, calendar and task items via SyncML and
  CalDAV/CardDAV with other servers or devices. It uses the Evolution Data Server
@@ -141,9 +145,8 @@ Depends:
  dbus-x11,
  python3,
  python3-dbus,
- python3-gobject,
+ python3-gi,
  python3-openssl,
- python3-twisted-web,
  syncevolution-dbus (>= ${source:Version}),
  ${misc:Depends},
 Description: Sync personal information data via SyncML/CalDAV/CardDAV (HTTP server)

debian/copyright

@@ -13,7 +13,7 @@ Copyright:
   2005-2009        Patrick Ohly <patrick.ohly@gmx.de>
   2011             Symbio, Ville Nummela
   2004-2008        Synthesis AG
-Grant:
+License-Grant:
  This library is free software;
  you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License
@@ -124,13 +124,13 @@ License-Grant:
  either version 2 of the License, or (at your option) any later version.
 License: LGPL-2+
 
-File:
+Files:
  src/backends/evolution/e-cal-check-timezones.c
  src/backends/evolution/e-cal-check-timezones.h
 Copyright:
   2008  Novell, Inc
   2009  Patrick Ohly <patrick.ohly@gmx.de>
-Grant:
+License-Grant:
  This program is free software;
  you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License
@@ -143,7 +143,7 @@ Comment:
 
 Files: src/dbus/interfaces/spec-to-docbook.xsl
 Copyright: 2007, William Jon McCann
-Grant:
+License-Grant:
  License: GPL
 License: GPL-1+
 
@@ -267,6 +267,9 @@ Reference: /usr/share/common-licenses/GPL-2
 License: GPL-3
 Reference: /usr/share/common-licenses/GPL-3
 
+License: LGPL-2
+Reference: /usr/share/common-licenses/LGPL-2
+
 License: LGPL-2+
 Reference: /usr/share/common-licenses/LGPL-2
 

debian/copyright_hints

@@ -1154,15 +1154,17 @@ License: UNKNOWN
 Files: debian/source/lintian-overrides
 Copyright: debian/copyright Artistic
   debian/copyright GPL-1+
-  debian/copyright GPL-2
+  debian/copyright GPL-2+
   debian/copyright GPL-3
+  debian/copyright LGPL-2
   debian/copyright LGPL-2+
   debian/copyright LGPL-2.1
   debian/copyright LGPL-3
   debian/copyright artistic
   debian/copyright gpl-1+
-  debian/copyright gpl-2
+  debian/copyright gpl-2+
   debian/copyright gpl-3
+  debian/copyright lgpl-2
   debian/copyright lgpl-2+
   debian/copyright lgpl-2.1
   debian/copyright lgpl-3

debian/not-installed

@@ -2,6 +2,7 @@
 usr/include/*/*.h
 usr/lib/*/*.a
 usr/lib/*/*.la
+usr/lib/*/*.so
 usr/lib/*/*/*/*.a
 usr/lib/*/*/*/*.la
 usr/lib/*/pkgconfig/*.pc
@@ -9,6 +10,17 @@ usr/lib/*/pkgconfig/*.pc
 # covered in debian/copyright
 usr/share/doc/syncevolution/COPYING
 
-# relates to unused options --enable-kwallet --enable-akonadi
+# relates to unsupported KDE options --enable-kwallet --enable-akonadi
 usr/lib/*/syncevolution/backends/platformkde.so
 usr/lib/*/syncevolution/backends/syncakonadi.so
+usr/lib/*/syncevolution/backends/syncactivesync.so
+
+# relates to unsupported KDE-derived Trinity Desktop Environment (TDE)
+usr/lib/*/syncevolution/backends/synctdepimabc.so
+usr/lib/*/syncevolution/backends/synctdepimcal.so
+usr/lib/*/syncevolution/backends/synctdepimnotes.so
+usr/lib/*/syncevolution/backends/platformtde.so
+
+# helper scripts for testing
+usr/bin/syncevo-phone-config
+usr/bin/synclog2html

debian/rules

@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_CXXFLAGS_APPEND = -std=c++14
+
 export CONFIG_SHELL=/bin/bash
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -28,7 +30,7 @@ override_dh_install:
 	dh_install -X"*.pl"
 
 override_dh_missing:
-	dh_missing --list-missing
+	dh_missing
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V'libsyncevolution0 (>= 1.5.2-3~)' -plibsyncevolution0

debian/source/lintian-overrides

@@ -3,6 +3,7 @@ missing-license-paragraph-in-dep5-copyright debian/copyright artistic *
 missing-license-paragraph-in-dep5-copyright debian/copyright gpl-1\+ *
 missing-license-paragraph-in-dep5-copyright debian/copyright gpl-2\+ *
 missing-license-paragraph-in-dep5-copyright debian/copyright gpl-3 *
+missing-license-paragraph-in-dep5-copyright debian/copyright lgpl-2 *
 missing-license-paragraph-in-dep5-copyright debian/copyright lgpl-2\+ *
 missing-license-paragraph-in-dep5-copyright debian/copyright lgpl-2\.1 *
 missing-license-paragraph-in-dep5-copyright debian/copyright lgpl-3 *
@@ -10,6 +11,7 @@ missing-license-text-in-dep5-copyright debian/copyright Artistic *
 missing-license-text-in-dep5-copyright debian/copyright GPL-1\+ *
 missing-license-text-in-dep5-copyright debian/copyright GPL-2\+ *
 missing-license-text-in-dep5-copyright debian/copyright GPL-3 *
-missing-license-text-in-dep5-copyright debian/copyright LGPL-2+ *
+missing-license-text-in-dep5-copyright debian/copyright LGPL-2 *
+missing-license-text-in-dep5-copyright debian/copyright LGPL-2\+ *
 missing-license-text-in-dep5-copyright debian/copyright LGPL-2\.1 *
 missing-license-text-in-dep5-copyright debian/copyright LGPL-3 *

debian/syncevolution-common.install

@@ -1,3 +1,4 @@
 usr/bin/synccompare
+usr/bin/syncevo-webdav-lookup
 usr/share/locale/*/LC_MESSAGES/syncevolution.mo
 usr/share/syncevolution

debian/syncevolution-dbus.install

@@ -1,4 +1,6 @@
+etc/xdg/autostart/syncevo-dbus-server.desktop
 usr/libexec/syncevo-dbus-helper
 usr/libexec/syncevo-dbus-server
+usr/libexec/syncevo-dbus-server-startup.sh
 usr/lib/systemd/user/*.service
 usr/share/dbus-1/services/org.syncevolution.service

debian/syncevolution-libs.install

@@ -1,9 +1,12 @@
+usr/lib/*/syncevolution/backends/providergoa.so
 usr/lib/*/syncevolution/backends/provideroauth2.so
 usr/lib/*/syncevolution/backends/syncdav.so
 usr/lib/*/syncevolution/backends/syncfile.so
+usr/lib/*/syncevolution/backends/syncpbap.so
 usr/lib/*/syncevolution/backends/synckcalextended.so
 usr/lib/*/syncevolution/backends/syncmaemocal.so
 usr/lib/*/syncevolution/backends/syncqtcontacts.so
 usr/lib/*/syncevolution/backends/syncsqlite.so
 usr/lib/*/syncevolution/backends/syncxmlrpc.so
+
 usr/libexec/syncevo-local-sync