[Pkg-xfce-commits] r7522 - in goodies/trunk/xfce4-weather-plugin: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Wed May 22 06:23:53 UTC 2013
Author: corsac
Date: 2013-05-22 18:23:53 +0000 (Wed, 22 May 2013)
New Revision: 7522
Added:
goodies/trunk/xfce4-weather-plugin/debian/patches/01_link-libm.patch
goodies/trunk/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch
goodies/trunk/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch
goodies/trunk/xfce4-weather-plugin/debian/patches/series
Modified:
goodies/trunk/xfce4-weather-plugin/
goodies/trunk/xfce4-weather-plugin/debian/changelog
goodies/trunk/xfce4-weather-plugin/debian/control
goodies/trunk/xfce4-weather-plugin/debian/rules
Log:
merge changes from experimental
Property changes on: goodies/trunk/xfce4-weather-plugin
___________________________________________________________________
Modified: svn:mergeinfo
- /goodies/branches/experimental/xfce4-weather-plugin:4494-5332
/goodies/branches/experimental/xfce4-weather-plugin.new:4493
/goodies/tags/xfce4-weather-plugin/0.7.3-3:4419-4492
+ /goodies/branches/experimental/xfce4-weather-plugin:4494-5332,7133-7521
/goodies/branches/experimental/xfce4-weather-plugin.new:4493
/goodies/tags/xfce4-weather-plugin/0.7.3-3:4419-4492
Modified: goodies/trunk/xfce4-weather-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/changelog 2013-05-22 18:13:55 UTC (rev 7521)
+++ goodies/trunk/xfce4-weather-plugin/debian/changelog 2013-05-22 18:23:53 UTC (rev 7522)
@@ -1,15 +1,43 @@
-xfce4-weather-plugin (0.8.2-1) UNRELEASED; urgency=low
+xfce4-weather-plugin (0.8.3-1) UNRELEASED; urgency=low
[ Yves-Alexis Perez ]
* New upstream release.
+ * debian/rules:
+ - enable all hardening rules.
+ * debian/control:
+ - add build-dep on libsoup2.4-dev.
+
+ [ Lionel Le Folgoc ]
* debian/patches:
- - 00_license dropped, not needed anymore.
- * debian/copyright updated and migrated to DEP5 format.
+ - 01_link-libm.patch: added, fix build
+ - 02_fix-color-parsing.patch: added, load the saved color from the config
+ - 03_fix-panel-icon-size.patch: added, fix cut off panel icon.
+ * debian/control: add b-deps on xfce4-dev-tools, automake, autoconf and libtool, needed by
+ xdt-autogen.
+ * debian/rules: run xdt-autogen and clean up afterwards due to the libm build
+ fix.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 18 Feb 2013 22:06:05 +0100
+
+xfce4-weather-plugin (0.8.2-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/patches: add missing DEP3 headers.
+ * New upstream release.
+ * debian/control: switch to libxfce4ui-1-dev (ported upstream).
+ * debian/patches:
+ - 00_license.patch: dropped, upstream changed the forecast provider.
+ * debian/rules: fix rule to remove la files.
+
+ [ Yves-Alexis Perez ]
* debian/rules:
- - enable parallel build.
+ - add --parallel to dh calls.
+ * debian/control:
+ - update standards version to 3.9.3.
+ - add Lionel to uploaders.
+ - update debhelper build-dep to 9.
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 07 Oct 2012 14:56:41 +0200
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 12 Sep 2012 12:29:04 +0200
-
xfce4-weather-plugin (0.7.4-3) unstable; urgency=low
* Brown paper bag release.
Modified: goodies/trunk/xfce4-weather-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/control 2013-05-22 18:13:55 UTC (rev 7521)
+++ goodies/trunk/xfce4-weather-plugin/debian/control 2013-05-22 18:23:53 UTC (rev 7522)
@@ -2,11 +2,12 @@
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 8.9.4), dpkg-dev (>= 1.16.1),
+Uploaders: Yves-Alexis Perez <corsac at debian.org>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: autotools-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1),
xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, intltool,
- libxfce4ui-1-dev
-Standards-Version: 3.9.2
+ libxfce4ui-1-dev, libsoup2.4-dev, xfce4-dev-tools, automake, autoconf, libtool
+Standards-Version: 3.9.3
Homepage: http://goodies.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-weather-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-weather-plugin/
Copied: goodies/trunk/xfce4-weather-plugin/debian/patches/01_link-libm.patch (from rev 7521, goodies/branches/experimental/xfce4-weather-plugin/debian/patches/01_link-libm.patch)
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/patches/01_link-libm.patch (rev 0)
+++ goodies/trunk/xfce4-weather-plugin/debian/patches/01_link-libm.patch 2013-05-22 18:23:53 UTC (rev 7522)
@@ -0,0 +1,50 @@
+From 69842d364cc2dc453445926e4cdf036ab245b871 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt at gmx.at>
+Date: Wed, 20 Feb 2013 14:08:08 +0000
+Subject: Link to libmath and clean up AC_CHECK_HEADERS.
+
+(Patch slightly altered to patch configure.ac instead of configure.ac.in, not
+present in release tarballs)
+
+Origin: upstream, http://git.xfce.org/panel-plugins/xfce4-weather-plugin/commit/?id=69842d364cc2dc453445926e4cdf036ab245b871
+
+---
+diff --git a/configure.ac b/configure.ac
+index 6b3492b..d95bab0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,9 +45,9 @@ dnl **********************************
+ dnl *** Check for standard headers ***
+ dnl **********************************
+ AC_HEADER_STDC()
+-AC_CHECK_HEADERS([string.h fcntl.h errno.h sys/socket.h netdb.h \
+- netinet/in.h sys/types.h time.h unistd.h stdio.h \
+- sys/stat.h stddef.h stdlib.h netinet/in.h])
++AC_CHECK_HEADERS([math.h stdarg.h stddef.h stdlib.h string.h sys/stat.h time.h])
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
+
+ dnl ******************************
+ dnl *** Check for i18n support ***
+diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
+index 901197e..3c63d2d 100644
+--- a/panel-plugin/Makefile.am
++++ b/panel-plugin/Makefile.am
+@@ -41,13 +41,13 @@ libweather_la_CFLAGS = \
+ $(LIBXML_CFLAGS)
+
+ libweather_la_LIBADD = \
++ $(LIBM) \
+ $(LIBXFCE4PANEL_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(LIBXFCE4UI_LIBS) \
+ $(GTK_LIBS) \
+ $(LIBXML_LIBS) \
+- $(SOUP_LIBS) \
+- $(LIBRESOLV)
++ $(SOUP_LIBS)
+
+ libweather_la_LDFLAGS = \
+ -avoid-version \
+--
+cgit v0.9.0.3
Copied: goodies/trunk/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch (from rev 7521, goodies/branches/experimental/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch)
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch (rev 0)
+++ goodies/trunk/xfce4-weather-plugin/debian/patches/02_fix-color-parsing.patch 2013-05-22 18:23:53 UTC (rev 7522)
@@ -0,0 +1,25 @@
+From 462e85dfd54e9a3bdf6c330c602a6545bccce585 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt at gmx.at>
+Date: Wed, 20 Feb 2013 14:25:09 +0000
+Subject: Fix color parsing when reading config file.
+
+This turned out to be a stupid copy & paste mistake.
+
+Origin: upstream, http://git.xfce.org/panel-plugins/xfce4-weather-plugin/commit/?id=462e85dfd54e9a3bdf6c330c602a6545bccce585
+
+---
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index 710c33c..4a2e3c3 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -884,7 +884,7 @@ xfceweather_read_config(XfcePanelPlugin *plugin,
+
+ value = xfce_rc_read_entry(rc, "scrollbox_color", NULL);
+ if (value)
+- gdk_color_parse("#rrrrggggbbbb", &(data->scrollbox_color));
++ gdk_color_parse(value, &(data->scrollbox_color));
+
+ data->scrollbox_use_color =
+ xfce_rc_read_bool_entry(rc, "scrollbox_use_color", FALSE);
+--
+cgit v0.9.0.3
Copied: goodies/trunk/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch (from rev 7521, goodies/branches/experimental/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch)
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch (rev 0)
+++ goodies/trunk/xfce4-weather-plugin/debian/patches/03_fix-panel-icon-size.patch 2013-05-22 18:23:53 UTC (rev 7522)
@@ -0,0 +1,27 @@
+From d1f9e9ab06231f876a1d6b607660d36d8a0fb902 Mon Sep 17 00:00:00 2001
+From: Harald Judt <h.judt at gmx.at>
+Date: Mon, 25 Feb 2013 21:52:08 +0000
+Subject: Fix panel icon size.
+
+Since the toggle button has been added, or maybe even before that,
+the icon is cut off at the borders. Fix this by subtracting two pixels
+from the icon size.
+
+Origin: upstream, http://git.xfce.org/panel-plugins/xfce4-weather-plugin/commit/?id=d1f9e9ab06231f876a1d6b607660d36d8a0fb902
+
+---
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index 4a2e3c3..2e15565 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -295,6 +295,8 @@ update_icon(plugin_data *data)
+ data->size != data->panel_size)
+ size *= 2;
+ #endif
++ /* take into account the border of the toggle button */
++ size -= 2;
+
+ /* set panel icon according to current weather conditions */
+ conditions = get_current_conditions(data->weatherdata);
+--
+cgit v0.9.0.3
Copied: goodies/trunk/xfce4-weather-plugin/debian/patches/series (from rev 7521, goodies/branches/experimental/xfce4-weather-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/patches/series (rev 0)
+++ goodies/trunk/xfce4-weather-plugin/debian/patches/series 2013-05-22 18:23:53 UTC (rev 7522)
@@ -0,0 +1,3 @@
+01_link-libm.patch
+02_fix-color-parsing.patch
+03_fix-panel-icon-size.patch
Modified: goodies/trunk/xfce4-weather-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/rules 2013-05-22 18:13:55 UTC (rev 7521)
+++ goodies/trunk/xfce4-weather-plugin/debian/rules 2013-05-22 18:23:53 UTC (rev 7522)
@@ -1,12 +1,22 @@
#!/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
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@ --parallel
-override_dh_auto_install:
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
- dh_auto_install
+override_dh_install:
+ -rm -rf debian/`dh_listpackages`/usr/lib/*/xfce4/panel/plugins/*.a
+ -rm -rf debian/`dh_listpackages`/usr/lib/*/xfce4/panel/plugins/*.la
+ dh_install
+
+override_dh_auto_configure:
+ NOCONFIGURE=1 xdt-autogen
+ dh_auto_configure
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -f $$(find -name 'Makefile.in*')
+ rm -f INSTALL aclocal.m4 config.guess config.sub configure
+ rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
More information about the Pkg-xfce-commits
mailing list