[Pkg-xfce-commits] r6164 - in goodies/tags/xfce4-mailwatch-plugin: . 1.1.0-5 1.1.0-5/debian 1.1.0-5/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Oct 24 05:06:53 UTC 2011
Author: corsac
Date: 2011-10-24 17:06:53 +0000 (Mon, 24 Oct 2011)
New Revision: 6164
Added:
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/changelog
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/compat
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/control
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/docs
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/04_fix-format-string-errors.patch
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/series
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/rules
Removed:
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/changelog
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/compat
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/control
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/series
goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/rules
Log:
[svn-buildpackage] Tagging xfce4-mailwatch-plugin 1.1.0-5
Property changes on: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5
___________________________________________________________________
Added: mergewithupstream
+ +1
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-mailwatch-plugin:4528-5284
/goodies/branches/experimental/xfce4-mailwatch-plugin.new:4524-4527
/goodies/tags/xfce4-mailwatch-plugin/1.1.0-3:4419-4523
Deleted: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/changelog
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/changelog 2011-10-18 14:18:18 UTC (rev 6138)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/changelog 2011-10-24 17:06:53 UTC (rev 6164)
@@ -1,95 +0,0 @@
-xfce4-mailwatch-plugin (1.1.0-4) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * debian/patches:
- - 02_link-with-libxfcegui4, links against libxfcegui4 since xfce4-panel
- doesn't brings the flags anymore.
- * debian/control:
- - add build-dep on xfce4-dev-tools, intltool and libtool in order to run
- xdt-autogen after patching.
- - add build-dep on hardening-includes.
- - update standards version to 3.9.2.
- - update xfce4-panel build-dep to 4.8.
- * debian/rules:
- - run xdt-autogen after patching.
- - pick {C,LD}FLAGS from dpkg-buildflags
- - add hardening flags to {C,LD}FLAGS
- - add -z,defs, -O1 and --as-needed to LDFLAGS.
- * Switch to 3.0 (quilt) source format.
- * debian/watch updated.
-
- [ Lionel Le Folgoc ]
- * debian/rules: clean up autogenerated files changed by xdt-autogen.
- * debian/control: add myself to Uploaders.
- * debian/patches:
- - 03_fix-implicit-dso-linking.patch: add missing -lgcrypt, fixes FTBFS with
- binutils-gold. closes: #615798
- - series: refreshed.
-
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 23:06:00 +0200
-
-xfce4-mailwatch-plugin (1.1.0-3) unstable; urgency=low
-
- [ Yves-Alexis Perez ]
- * debian/control:
- - move to xfce section.
- * debian/watch edited to track Xfce archive reorganisation.
- * debian/control:
- - update standards version to 3.9.1.
-
- [ Evgeni Golov ]
- * Fix Vcs-* fields, they were missing 'trunk' in the path.
-
- [ Stefan Ott ]
- * debian/patches:
- - 02_mbox-interval.diff added, fix mbox refresh interval closes: #572342
-
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 05 Nov 2010 08:56:49 +0100
-
-xfce4-mailwatch-plugin (1.1.0-2) unstable; urgency=low
-
- * debian/patches:
- - 01_fix-cpu-usage added, fix high cpu usage (Xfce #4494) closes: #523312
- * debian/compat bumped to 7.
- * debian/control:
- - update standards version to 3.8.1.
- - update debhelper build-dep to 7.
- * debian/rules:
- - add -Wl,-z,-defs -Wl,--as-needed to LDFLAGS.
-
- -- Yves-Alexis Perez <corsac at debian.org> Thu, 09 Apr 2009 22:04:48 +0200
-
-xfce4-mailwatch-plugin (1.1.0-1) unstable; urgency=low
-
- [ Simon Huggins ]
- * debian/control: Move fake Homepage field to a real one now dpkg
- supports it.
- * Add Vcs-* headers to debian/control
-
- [ Yves-Alexis Perez ]
- * new upstream release.
- - fix refresh time. closes: #378944
- * debian/control:
- - remove Jani Monoses, Rudy Godo and Martin Loschwitz from Uploaders.
- - update my email address.
- - update standards version to 3.8.0.
- - add build-dep on libxfce4util-dev and libxfcegui4-dev.
- - add ${misc:Depends} to build-deps.
- * debian/copyright: update dates and move license link to from GPL to GPL-2.
-
- [ Stefan Ott ]
- * debian/control: update e-mail address
-
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 22 Feb 2009 19:39:15 +0100
-
-xfce4-mailwatch-plugin (1.0.1-2) unstable; urgency=low
-
- * Updated build-deps to 4.3.90.2 (Xfce 4.4 Beta2).
-
- -- Yves-Alexis Perez <corsac at corsac.net> Wed, 26 Jul 2006 17:48:06 +0100
-
-xfce4-mailwatch-plugin (1.0.1-1) unstable; urgency=low
-
- * Initial release (Closes: #370092)
-
- -- Yves-Alexis Perez <corsac at corsac.net> Sat, 3 Jun 2006 10:40:38 +0200
Copied: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/changelog (from rev 6161, goodies/trunk/xfce4-mailwatch-plugin/debian/changelog)
===================================================================
--- goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/changelog (rev 0)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/changelog 2011-10-24 17:06:53 UTC (rev 6164)
@@ -0,0 +1,112 @@
+xfce4-mailwatch-plugin (1.1.0-5) unstable; urgency=low
+
+ * debian/patches:
+ - 04_fix-format-string-errors added, fix some string format errors leading
+ to a FTBFS when building with -Werror=format-security. closes: #646497
+ * debian/rules:
+ - switch to dh tiny rules.
+ - use hardening support from dh 9 and dpkg-dev 1.16.1
+ * debian/compat bumped to 9.
+ * debian/control:
+ - drop cdbs build-dep
+ - update debhelper build-dep for hardening support.
+ - add dpkg-dev (>= 1.16.1) build-dep for hardening support.
+ * debian/docs added to track documentation to install.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 24 Oct 2011 18:43:42 +0200
+
+xfce4-mailwatch-plugin (1.1.0-4) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/patches:
+ - 02_link-with-libxfcegui4, links against libxfcegui4 since xfce4-panel
+ doesn't brings the flags anymore.
+ * debian/control:
+ - add build-dep on xfce4-dev-tools, intltool and libtool in order to run
+ xdt-autogen after patching.
+ - add build-dep on hardening-includes.
+ - update standards version to 3.9.2.
+ - update xfce4-panel build-dep to 4.8.
+ * debian/rules:
+ - run xdt-autogen after patching.
+ - pick {C,LD}FLAGS from dpkg-buildflags
+ - add hardening flags to {C,LD}FLAGS
+ - add -z,defs, -O1 and --as-needed to LDFLAGS.
+ * Switch to 3.0 (quilt) source format.
+ * debian/watch updated.
+
+ [ Lionel Le Folgoc ]
+ * debian/rules: clean up autogenerated files changed by xdt-autogen.
+ * debian/control: add myself to Uploaders.
+ * debian/patches:
+ - 03_fix-implicit-dso-linking.patch: add missing -lgcrypt, fixes FTBFS with
+ binutils-gold. closes: #615798
+ - series: refreshed.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 19 Apr 2011 23:06:00 +0200
+
+xfce4-mailwatch-plugin (1.1.0-3) unstable; urgency=low
+
+ [ Yves-Alexis Perez ]
+ * debian/control:
+ - move to xfce section.
+ * debian/watch edited to track Xfce archive reorganisation.
+ * debian/control:
+ - update standards version to 3.9.1.
+
+ [ Evgeni Golov ]
+ * Fix Vcs-* fields, they were missing 'trunk' in the path.
+
+ [ Stefan Ott ]
+ * debian/patches:
+ - 02_mbox-interval.diff added, fix mbox refresh interval closes: #572342
+
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 05 Nov 2010 08:56:49 +0100
+
+xfce4-mailwatch-plugin (1.1.0-2) unstable; urgency=low
+
+ * debian/patches:
+ - 01_fix-cpu-usage added, fix high cpu usage (Xfce #4494) closes: #523312
+ * debian/compat bumped to 7.
+ * debian/control:
+ - update standards version to 3.8.1.
+ - update debhelper build-dep to 7.
+ * debian/rules:
+ - add -Wl,-z,-defs -Wl,--as-needed to LDFLAGS.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 09 Apr 2009 22:04:48 +0200
+
+xfce4-mailwatch-plugin (1.1.0-1) unstable; urgency=low
+
+ [ Simon Huggins ]
+ * debian/control: Move fake Homepage field to a real one now dpkg
+ supports it.
+ * Add Vcs-* headers to debian/control
+
+ [ Yves-Alexis Perez ]
+ * new upstream release.
+ - fix refresh time. closes: #378944
+ * debian/control:
+ - remove Jani Monoses, Rudy Godo and Martin Loschwitz from Uploaders.
+ - update my email address.
+ - update standards version to 3.8.0.
+ - add build-dep on libxfce4util-dev and libxfcegui4-dev.
+ - add ${misc:Depends} to build-deps.
+ * debian/copyright: update dates and move license link to from GPL to GPL-2.
+
+ [ Stefan Ott ]
+ * debian/control: update e-mail address
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 22 Feb 2009 19:39:15 +0100
+
+xfce4-mailwatch-plugin (1.0.1-2) unstable; urgency=low
+
+ * Updated build-deps to 4.3.90.2 (Xfce 4.4 Beta2).
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Wed, 26 Jul 2006 17:48:06 +0100
+
+xfce4-mailwatch-plugin (1.0.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #370092)
+
+ -- Yves-Alexis Perez <corsac at corsac.net> Sat, 3 Jun 2006 10:40:38 +0200
Deleted: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/compat
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/compat 2011-10-18 14:18:18 UTC (rev 6138)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/compat 2011-10-24 17:06:53 UTC (rev 6164)
@@ -1 +0,0 @@
-7
Copied: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/compat (from rev 6160, goodies/trunk/xfce4-mailwatch-plugin/debian/compat)
===================================================================
--- goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/compat (rev 0)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/compat 2011-10-24 17:06:53 UTC (rev 6164)
@@ -0,0 +1 @@
+9
Deleted: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/control
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/control 2011-10-18 14:18:18 UTC (rev 6138)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/control 2011-10-24 17:06:53 UTC (rev 6164)
@@ -1,23 +0,0 @@
-Source: xfce4-mailwatch-plugin
-Section: xfce
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
- Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>,
- Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev,
- xfce4-panel-dev (>= 4.8), libgnutls-dev, libxml-parser-perl,
- libxfce4util-dev, libxfcegui4-dev, xfce4-dev-tools, intltool, libtool,
- autoconf, hardening-includes
-Standards-Version: 3.9.2
-Homepage: http://spuriousinterrupt.org/projects/mailwatch
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/
-
-Package: xfce4-mailwatch-plugin
-Section: xfce
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: mail watcher plugin for the Xfce4 panel
- Mail checker panel plugin with support for local, POP3, IMAP,
- and Gmail accounts.
Copied: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/control (from rev 6160, goodies/trunk/xfce4-mailwatch-plugin/debian/control)
===================================================================
--- goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/control (rev 0)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/control 2011-10-24 17:06:53 UTC (rev 6164)
@@ -0,0 +1,23 @@
+Source: xfce4-mailwatch-plugin
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Stefan Ott <stefan at ott.net>, Yves-Alexis Perez <corsac at debian.org>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 8.9.4), libgtk2.0-dev, dpkg-dev (>= 1.16.1),
+ xfce4-panel-dev (>= 4.8), libgnutls-dev, libxml-parser-perl,
+ libxfce4util-dev, libxfcegui4-dev, xfce4-dev-tools, intltool, libtool,
+ autoconf
+Standards-Version: 3.9.2
+Homepage: http://spuriousinterrupt.org/projects/mailwatch
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-mailwatch-plugin/
+
+Package: xfce4-mailwatch-plugin
+Section: xfce
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: mail watcher plugin for the Xfce4 panel
+ Mail checker panel plugin with support for local, POP3, IMAP,
+ and Gmail accounts.
Copied: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/docs (from rev 6160, goodies/trunk/xfce4-mailwatch-plugin/debian/docs)
===================================================================
--- goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/docs (rev 0)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/docs 2011-10-24 17:06:53 UTC (rev 6164)
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+TODO
Copied: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/04_fix-format-string-errors.patch (from rev 6158, goodies/trunk/xfce4-mailwatch-plugin/debian/patches/04_fix-format-string-errors.patch)
===================================================================
--- goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/04_fix-format-string-errors.patch (rev 0)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/04_fix-format-string-errors.patch 2011-10-24 17:06:53 UTC (rev 6164)
@@ -0,0 +1,43 @@
+Description: Link format string errors
+Author: Yves-Alexis Perez <corsac at debian.org>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=8063
+Index: xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c
+===================================================================
+--- xfce4-mailwatch-plugin-1.1.0.orig/libmailwatch-core/mailwatch-net-conn.c 2011-10-24 18:08:09.891132011 +0200
++++ xfce4-mailwatch-plugin-1.1.0/libmailwatch-core/mailwatch-net-conn.c 2011-10-24 18:08:53.387469616 +0200
+@@ -224,7 +224,7 @@
+ else
+ reason = gnutls_strerror(ret);
+ if(error)
+- g_set_error(error, XFCE_MAILWATCH_ERROR, code, reason);
++ g_set_error(error, XFCE_MAILWATCH_ERROR, code, "%s", reason);
+ g_critical("XfceMailwatch: TLS handshake failed: %s", reason);
+
+ return FALSE;
+@@ -761,7 +761,7 @@
+ break;
+ else if(ret < 0 && EINTR != errno) {
+ g_set_error(error, XFCE_MAILWATCH_ERROR,
+- XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
++ XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno));
+ return -1;
+ } else if(!block)
+ return 0;
+@@ -771,7 +771,7 @@
+ if(ret < 0 && EINTR != errno) {
+ if(error) {
+ g_set_error(error, XFCE_MAILWATCH_ERROR,
+- XFCE_MAILWATCH_ERROR_FAILED, strerror(errno));
++ XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(errno));
+ }
+ return -1;
+ } else if(!SHOULD_CONTINUE(net_conn)) {
+@@ -783,7 +783,7 @@
+ } else if(TIMER_EXPIRED(RECV_TIMEOUT)) {
+ if(error) {
+ g_set_error(error, XFCE_MAILWATCH_ERROR,
+- XFCE_MAILWATCH_ERROR_FAILED, strerror(ETIMEDOUT));
++ XFCE_MAILWATCH_ERROR_FAILED, "%s", strerror(ETIMEDOUT));
+ }
+ return -1;
+ }
Deleted: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series 2011-10-18 14:18:18 UTC (rev 6138)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/series 2011-10-24 17:06:53 UTC (rev 6164)
@@ -1,4 +0,0 @@
-01_fix-cpu-usage.diff
-02_mbox-interval.diff
-02_link-with-libxfcegui4.patch
-03_fix-implicit-dso-linking.patch
Copied: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/series (from rev 6158, goodies/trunk/xfce4-mailwatch-plugin/debian/patches/series)
===================================================================
--- goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/series (rev 0)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/patches/series 2011-10-24 17:06:53 UTC (rev 6164)
@@ -0,0 +1,5 @@
+01_fix-cpu-usage.diff
+02_mbox-interval.diff
+02_link-with-libxfcegui4.patch
+03_fix-implicit-dso-linking.patch
+04_fix-format-string-errors.patch
Deleted: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/rules
===================================================================
--- goodies/trunk/xfce4-mailwatch-plugin/debian/rules 2011-10-18 14:18:18 UTC (rev 6138)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/rules 2011-10-24 17:06:53 UTC (rev 6164)
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-
-export CFLAGS LDFLAGS
-
-post-patches::
- NOCONFIGURE=1 xdt-autogen
-
-clean::
- rm -f $$(find -name 'Makefile.in*')
- rm -f INSTALL aclocal.m4 compile config.h.in configure depcomp install-sh
- rm -f intltool-extract.in intltool-merge.in intltool-update.in ltmain.sh
- rm -f missing mkinstalldirs
-
-binary-post-install/xfce4-mailwatch-plugin::
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
Copied: goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/rules (from rev 6160, goodies/trunk/xfce4-mailwatch-plugin/debian/rules)
===================================================================
--- goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/rules (rev 0)
+++ goodies/tags/xfce4-mailwatch-plugin/1.1.0-5/debian/rules 2011-10-24 17:06:53 UTC (rev 6164)
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ NOCONFIGURE=1 xdt-autogen
+ dh_auto_configure
+
+override_dh_install:
+ -rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.a
+ -rm -rf debian/`dh_listpackages`/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*.la
+ dh_install --fail-missing
More information about the Pkg-xfce-commits
mailing list