1
=== modified file 'debian/changelog'
2
--- debian/changelog	2016-07-06 14:15:27 +0000
3
+++ debian/changelog	2016-08-19 16:49:31 +0000
4
@@ -1,3 +1,13 @@
5
1
syncevolution (1.5.1+16.10.20160706-0ubuntu2) yakkety; urgency=medium
6
2
7
3
  [ Tino Mettler ]
8
4
  * Add 0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch
9
5
    to add missing casts from shared_ptr to bool, fixes FTBFS with GCC 6
10
6
  * Fix remaining FTBFS with GCC 6 by downgrading the C++ dialect to gnu++98
11
7
    (Closes: #811624) (LP: #1613405)
12
8
13
9
 -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 19 Aug 2016 12:48:59 -0400
14
10
15
1
syncevolution (1.5.1+16.10.20160706-0ubuntu1) yakkety; urgency=medium
11
syncevolution (1.5.1+16.10.20160706-0ubuntu1) yakkety; urgency=medium
16
2
12
17
3
  * New upstream release
13
  * New upstream release
18
4
14
19
=== added file 'debian/patches/0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch'
20
--- debian/patches/0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch	1970-01-01 00:00:00 +0000
21
+++ debian/patches/0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch	2016-08-19 16:49:31 +0000
22
@@ -0,0 +1,60 @@
23
1
From 9286b8851524a85f5c9d7352f5a89c550c13f315 Mon Sep 17 00:00:00 2001
24
2
From: Tino Mettler <tino+debian@tikei.de>
25
3
Date: Wed, 6 Jul 2016 14:33:19 +0200
26
4
Subject: [PATCH] Add missing casts from shared_ptr to bool to fix FTBFS with
27
5
 GCC 6
28
6
29
7
---
30
8
 src/dbus/server/session.h    | 2 +-
31
9
 src/syncevo/Logging.h        | 4 ++--
32
10
 src/syncevo/StringDataBlob.h | 2 +-
33
11
 3 files changed, 4 insertions(+), 4 deletions(-)
34
12
35
13
diff --git a/src/dbus/server/session.h b/src/dbus/server/session.h
36
14
index af46f5d..b762bab 100644
37
15
--- a/src/dbus/server/session.h
38
16
+++ b/src/dbus/server/session.h
39
17
@@ -425,7 +425,7 @@ public:
40
18
     void setServerAlerted(bool serverAlerted) { m_serverAlerted = serverAlerted; }
41
19
 
42
20
     void initServer(SharedBuffer data, const std::string &messageType);
43
21
-    void setStubConnection(const boost::shared_ptr<Connection> c) { m_connection = c; m_useConnection = c; }
44
22
+    void setStubConnection(const boost::shared_ptr<Connection> c) { m_connection = c; m_useConnection = static_cast<bool> (c); }
45
23
     boost::weak_ptr<Connection> getStubConnection() { return m_connection; }
46
24
     bool useStubConnection() { return m_useConnection; }
47
25
 
48
26
diff --git a/src/syncevo/Logging.h b/src/syncevo/Logging.h
49
27
index ce9a249..5deb01b 100644
50
28
--- a/src/syncevo/Logging.h
51
29
+++ b/src/syncevo/Logging.h
52
30
@@ -255,7 +255,7 @@ class Logger
53
31
         Handle &operator = (const Handle &other) throw ();
54
32
         ~Handle() throw ();
55
33
 
56
34
-        operator bool () const { return m_logger; }
57
35
+        operator bool () const { return static_cast<bool> (m_logger); }
58
36
         bool operator == (Logger *logger) const { return m_logger.get() == logger; }
59
37
         Logger *get() const { return m_logger.get(); }
60
38
 
61
39
@@ -398,7 +398,7 @@ template<class L> class PushLogger : boost::noncopyable
62
40
         }
63
41
     }
64
42
 
65
43
-    operator bool () const { return m_logger; }
66
44
+    operator bool () const { return static_cast<bool> (m_logger); }
67
45
 
68
46
     void reset(const Logger::Handle &logger)
69
47
     {
70
48
diff --git a/src/syncevo/StringDataBlob.h b/src/syncevo/StringDataBlob.h
71
49
index 62bc4c7..14f0d61 100644
72
50
--- a/src/syncevo/StringDataBlob.h
73
51
+++ b/src/syncevo/StringDataBlob.h
74
52
@@ -53,7 +53,7 @@ class StringDataBlob : public DataBlob
75
53
 
76
54
     virtual boost::shared_ptr<std::string> getData() { return m_data; }
77
55
     virtual std::string getName() const { return m_name; }
78
56
-    virtual bool exists() const { return m_data; }
79
57
+    virtual bool exists() const { return static_cast<bool> (m_data); }
80
58
     virtual bool isReadonly() const { return m_readonly; }
81
59
 };
82
60
 
83
0
61
84
=== modified file 'debian/patches/series'
85
--- debian/patches/series	2016-07-05 17:27:00 +0000
86
+++ debian/patches/series	2016-08-19 16:49:31 +0000
87
@@ -1,5 +1,6 @@
88
1
0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch
1
0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch
89
2
0002-Avoid-register-unecessary-timezones.patch
2
0002-Avoid-register-unecessary-timezones.patch
90
3
0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch
91
3
fix-photo-merging.patch
4
fix-photo-merging.patch
92
4
calendar-limit-date-sync.diff
5
calendar-limit-date-sync.diff
93
5
Use-90-days-as-default-value-for-syncInterval.patch
6
Use-90-days-as-default-value-for-syncInterval.patch
94
6
7
95
=== modified file 'debian/rules'
96
--- debian/rules	2016-07-05 17:27:00 +0000
97
+++ debian/rules	2016-08-19 16:49:31 +0000
98
@@ -6,6 +6,7 @@
99
6
export DH_VERBOSE=1
6
export DH_VERBOSE=1
100
7
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
7
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
101
8
export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic 
8
export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic 
102
9
export DEB_CXXFLAGS_MAINT_APPEND = -std=gnu++98
103
9
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
10
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
104
10
11
105
11
%: 
12
%:
Reviewer	Review Type	Date Requested	Status
Ubuntu Phablet Team		2016-08-16	Pending
Review via email: mp+302980@code.launchpad.net