r2039 - in /unstable/evolution-data-server3/debian: ./ lintian/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 11 17:54:16 UTC 2011
Author: joss
Date: Fri Nov 11 17:54:15 2011
New Revision: 2039
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2039
Log:
Revert changes that were for experimental
Added:
unstable/evolution-data-server3/debian/libcamel-1.2-23.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libcamel-1.2-23.install
unstable/evolution-data-server3/debian/libebook1.2-10.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libebook1.2-10.install
unstable/evolution-data-server3/debian/libecal1.2-8.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libecal1.2-8.install
unstable/evolution-data-server3/debian/libedata-book-1.2-9.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libedata-book-1.2-9.install
unstable/evolution-data-server3/debian/libedata-cal-1.2-11.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libedata-cal-1.2-11.install
unstable/evolution-data-server3/debian/libedataserver1.2-14.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libedataserver1.2-14.install
unstable/evolution-data-server3/debian/libedataserverui-3.0-0.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libedataserverui-3.0-0.install
unstable/evolution-data-server3/debian/libegroupwise1.2-13.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libegroupwise1.2-13.install
unstable/evolution-data-server3/debian/libegroupwise1.2-dev.install
- copied unchanged from r1990, unstable/evolution-data-server3/debian/libegroupwise1.2-dev.install
unstable/evolution-data-server3/debian/lintian/libebook1.2-10
- copied unchanged from r1990, unstable/evolution-data-server3/debian/lintian/libebook1.2-10
unstable/evolution-data-server3/debian/lintian/libecal1.2-8
- copied unchanged from r1990, unstable/evolution-data-server3/debian/lintian/libecal1.2-8
unstable/evolution-data-server3/debian/lintian/libedataserver1.2-14
- copied unchanged from r1990, unstable/evolution-data-server3/debian/lintian/libedataserver1.2-14
Removed:
unstable/evolution-data-server3/debian/libcamel-1.2-29.install
unstable/evolution-data-server3/debian/libebook1.2-12.install
unstable/evolution-data-server3/debian/libecal1.2-10.install
unstable/evolution-data-server3/debian/libedata-book-1.2-11.install
unstable/evolution-data-server3/debian/libedata-cal-1.2-13.install
unstable/evolution-data-server3/debian/libedataserver1.2-15.install
unstable/evolution-data-server3/debian/libedataserverui-3.0-1.install
unstable/evolution-data-server3/debian/lintian/libebook1.2-12
unstable/evolution-data-server3/debian/lintian/libecal1.2-10
unstable/evolution-data-server3/debian/lintian/libedataserver1.2-15
Modified:
unstable/evolution-data-server3/debian/changelog
unstable/evolution-data-server3/debian/compat
unstable/evolution-data-server3/debian/control
unstable/evolution-data-server3/debian/libebook1.2-dev.install
unstable/evolution-data-server3/debian/libecal1.2-dev.install
unstable/evolution-data-server3/debian/libedataserver1.2-dev.install
unstable/evolution-data-server3/debian/rules
Modified: unstable/evolution-data-server3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/changelog?rev=2039&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/changelog (original)
+++ unstable/evolution-data-server3/debian/changelog Fri Nov 11 17:54:15 2011
@@ -1,37 +1,9 @@
-evolution-data-server3 (3.2.1-1) UNRELEASED; urgency=low
-
- [ Yves-Alexis Perez ]
- * New upstream release.
- - correctly use secure connection (if used in imap) when storing mail in
- sent folder. This fixes CVE-2011-3355. closes: #641052
- * debian/control:
- - update debhelper build-dep to 8.
- - drop hardening-includes
- - add build-dep on liboauth-dev
- - drop libegroupwise packages.
- - update dpkg-dev build-dep for hardening support.
- - rename packages for soname bumps: libedata-cal-1.2-13,
- libedata-book-1.2-11, libedataserverui-3.0-1, libcamel-1.2-29,
- libedataserver-1.2-15, libebook-1.2-12 libecal-1.2-10
- * debian/rules:
- - set hardening flags using cdbs.
- - use --disable-goa since libgoa is not in Debian.
- * debian/compat bumped to 8.
-
- [ Sjoerd Simons ]
- * New upstream release
- * enable goa
- * Update libgdata b-d for goa
- * Enable vala bindings
-
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 06 Nov 2011 20:23:39 +0000
-
-evolution-data-server3 (3.0.3-2) unstable; urgency=low
+evolution-data-server3 (3.0.3-2) UNRELEASED; urgency=low
* debian/control:
- make -dev packages depend on corresponding gir package.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 02 Sep 2011 23:47:23 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 02 Sep 2011 23:45:34 +0200
evolution-data-server3 (3.0.3-1) unstable; urgency=low
Modified: unstable/evolution-data-server3/debian/compat
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/compat?rev=2039&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/compat (original)
+++ unstable/evolution-data-server3/debian/compat Fri Nov 11 17:54:15 2011
@@ -1,1 +1,1 @@
-8
+5
Modified: unstable/evolution-data-server3/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/control?rev=2039&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/control (original)
+++ unstable/evolution-data-server3/debian/control Fri Nov 11 17:54:15 2011
@@ -17,9 +17,10 @@
Homepage: http://www.gnome.org/projects/evolution/
Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution-data-server
Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 7.2.3~),
cdbs (>= 0.4.37),
- dpkg-dev (>= 1.16.1),
+ hardening-includes,
+ dpkg-dev (>= 1.14.16),
pkg-config (>= 0.16),
flex,
bison,
@@ -33,6 +34,7 @@
libgconf2-dev,
libnss3-dev,
libgtk-3-dev (>= 3.0),
+ libgnome2-dev,
libsoup2.4-dev (>= 2.31.2),
libgnome-keyring-dev (>= 2.20.1),
gtk-doc-tools,
@@ -41,23 +43,20 @@
libgweather-3-dev (>= 2.90.0),
libical-dev,
libicu-dev,
- libgdata-dev (>= 0.9.1),
+ libgdata-dev (>= 0.7.0),
libgirepository1.0-dev (>= 0.9.12),
gobject-introspection (>= 0.9.12-4~),
gir1.2-glib-2.0,
gir1.2-freedesktop,
gperf,
- gnome-pkg-tools,
- liboauth-dev (>= 0.9.4),
- libgoa-1.0-dev,
- valac-0.14
+ gnome-pkg-tools
Package: evolution-data-server
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
evolution-data-server-common (= ${source:Version}),
- libcamel-1.2-29 (= ${binary:Version})
+ libcamel-1.2-23 (= ${binary:Version})
Suggests: evolution (>= 2.6.1),
evolution-data-server-dbg (= ${binary:Version})
Replaces: evolution-data-server1.2
@@ -95,7 +94,7 @@
Description: evolution database backend server with debugging symbols
This package contains unstripped binaries used for debugging.
-Package: libedataserver1.2-15
+Package: libedataserver1.2-14
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -109,7 +108,7 @@
Package: libedataserver1.2-dev
Section: libdevel
Architecture: any
-Depends: libedataserver1.2-15 (= ${binary:Version}),
+Depends: libedataserver1.2-14 (= ${binary:Version}),
gir1.2-edataserver-1.2 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends},
@@ -137,7 +136,7 @@
library. It can be used by packages using the GIRepository format to
generate dynamic bindings.
-Package: libcamel-1.2-29
+Package: libcamel-1.2-23
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -154,7 +153,7 @@
Package: libcamel1.2-dev
Section: libdevel
Architecture: any
-Depends: libcamel-1.2-29 (= ${binary:Version}),
+Depends: libcamel-1.2-23 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
libglib2.0-dev,
@@ -172,7 +171,7 @@
Evolution is the integrated mail, calendar, task and address book
distributed suite from Novell, Inc.
-Package: libebook1.2-12
+Package: libebook1.2-10
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -186,7 +185,7 @@
Package: libebook1.2-dev
Section: libdevel
Architecture: any
-Depends: libebook1.2-12 (= ${binary:Version}),
+Depends: libebook1.2-10 (= ${binary:Version}),
gir1.2-ebook-1.2 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -214,7 +213,7 @@
library. It can be used by packages using the GIRepository format to
generate dynamic bindings.
-Package: libedataserverui-3.0-1
+Package: libedataserverui-3.0-0
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -229,7 +228,7 @@
Package: libedataserverui-3.0-dev
Section: libdevel
Architecture: any
-Depends: libedataserverui-3.0-1 (= ${binary:Version}),
+Depends: libedataserverui-3.0-0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
libgtk-3-dev,
@@ -243,7 +242,7 @@
This package contains header files and static library for
libedataserverui.
-Package: libedata-book-1.2-11
+Package: libedata-book-1.2-9
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -257,7 +256,7 @@
Package: libedata-book1.2-dev
Section: libdevel
Architecture: any
-Depends: libedata-book-1.2-11 (= ${binary:Version}),
+Depends: libedata-book-1.2-9 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
libedataserver1.2-dev,
@@ -269,7 +268,7 @@
.
This package contains header files and static library for libedata-book.
-Package: libecal1.2-10
+Package: libecal1.2-8
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -283,7 +282,7 @@
Package: libecal1.2-dev
Section: libdevel
Architecture: any
-Depends: libecal1.2-10 (= ${binary:Version}),
+Depends: libecal1.2-8 (= ${binary:Version}),
gir1.2-ecalendar-1.2 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
@@ -310,7 +309,7 @@
can be used by packages using the GIRepository format to generate
dynamic bindings.
-Package: libedata-cal-1.2-13
+Package: libedata-cal-1.2-11
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -324,7 +323,7 @@
Package: libedata-cal1.2-dev
Section: libdevel
Architecture: any
-Depends: libedata-cal-1.2-13 (= ${binary:Version}),
+Depends: libedata-cal-1.2-11 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
libical-dev (>= 0.43),
@@ -336,6 +335,34 @@
distributed suite from Novell, Inc.
.
This package contains header files and static library for libedata-cal.
+
+Package: libegroupwise1.2-13
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: Client library for accessing groupwise POA through SOAP interface
+ This package is a client library for accessing groupwise POA through SOAP
+ interface of Evolution.
+ .
+ Evolution is the integrated mail, calendar, task and address book
+ distributed suite from Novell, Inc.
+
+Package: libegroupwise1.2-dev
+Section: libdevel
+Architecture: any
+Depends: libegroupwise1.2-13 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libsoup2.4-dev
+Description: Development files for libegroupwise
+ This package contains header files and static library for libegroupwise.
+ .
+ libegroupwise is client library for accessing groupwise POA through SOAP
+ interface of Evolution.
+ .
+ Evolution is the integrated mail, calendar, task and address book
+ distributed suite from Novell, Inc.
Package: libebackend-1.2-1
Section: libs
Modified: unstable/evolution-data-server3/debian/libebook1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/libebook1.2-dev.install?rev=2039&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/libebook1.2-dev.install (original)
+++ unstable/evolution-data-server3/debian/libebook1.2-dev.install Fri Nov 11 17:54:15 2011
@@ -3,5 +3,3 @@
debian/tmp/usr/include/evolution-data-server-*/libebook
debian/tmp/usr/share/gtk-doc/html/libebook
debian/tmp/usr/share/gir-1.0/EBook-1.2.gir
-debian/tmp/usr/share/vala/vapi/libebook-1.2.vapi
-debian/tmp/usr/share/vala/vapi/libebook-1.2.deps
Modified: unstable/evolution-data-server3/debian/libecal1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/libecal1.2-dev.install?rev=2039&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/libecal1.2-dev.install (original)
+++ unstable/evolution-data-server3/debian/libecal1.2-dev.install Fri Nov 11 17:54:15 2011
@@ -3,5 +3,3 @@
debian/tmp/usr/include/evolution-data-server-*/libecal
debian/tmp/usr/share/gtk-doc/html/libecal
debian/tmp/usr/share/gir-1.0/ECalendar-1.2.gir
-debian/tmp/usr/share/vala/vapi/libecalendar-1.2.deps
-debian/tmp/usr/share/vala/vapi/libecalendar-1.2.vapi
Modified: unstable/evolution-data-server3/debian/libedataserver1.2-dev.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/libedataserver1.2-dev.install?rev=2039&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/libedataserver1.2-dev.install (original)
+++ unstable/evolution-data-server3/debian/libedataserver1.2-dev.install Fri Nov 11 17:54:15 2011
@@ -3,4 +3,3 @@
debian/tmp/usr/include/evolution-data-server-*/libedataserver
debian/tmp/usr/share/gtk-doc/html/libedataserver
debian/tmp/usr/share/gir-1.0/EDataServer-1.2.gir
-debian/tmp/usr/share/vala/vapi/libedataserver-1.2.vapi
Modified: unstable/evolution-data-server3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server3/debian/rules?rev=2039&op=diff
==============================================================================
--- unstable/evolution-data-server3/debian/rules (original)
+++ unstable/evolution-data-server3/debian/rules Fri Nov 11 17:54:15 2011
@@ -8,6 +8,7 @@
#include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/hardening-includes/hardening.make
GNOME_MODULE := evolution-data-server
@@ -16,8 +17,12 @@
DEB_DH_MAKESHLIBS_ARGS_ALL += -V
DEB_DH_MAKESHLIBS_ARGS_libcamel-1.2-23 += -V'libcamel-1.2-23 (>= $(DEB_GNOME_VERSION)), libcamel-1.2-23 (<< $(DEB_GNOME_NEXTVERSION))'
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+
+export CFLAGS LDFLAGS
DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc \
--libexecdir=\$${prefix}/lib/evolution \
@@ -29,10 +34,7 @@
--with-krb5=/usr \
--with-libdb=/usr \
--enable-gtk-doc \
- --enable-gnome-keyring=yes \
- --enable-goa \
- --enable-gojb \
- --enable-vala-bindings
+ --enable-gnome-keyring=yes
DEB_FIXPERMS_EXCLUDE_evolution-data-server += usr/lib/evolution/camel-lock-helper*
More information about the pkg-evolution-commits
mailing list