[Pkg-xfce-commits] r5329 - in goodies/trunk/xfce4-wavelan-plugin: . debian debian/patches

Yves-Alexis Perez corsac at alioth.debian.org
Sun Apr 3 01:18:55 UTC 2011 

Author: corsac
Date: 2011-04-03 13:18:50 +0000 (Sun, 03 Apr 2011)
New Revision: 5329

Added:
   goodies/trunk/xfce4-wavelan-plugin/debian/patches/series
   goodies/trunk/xfce4-wavelan-plugin/debian/source/
Removed:
   goodies/trunk/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch
Modified:
   goodies/trunk/xfce4-wavelan-plugin/
   goodies/trunk/xfce4-wavelan-plugin/debian/changelog
   goodies/trunk/xfce4-wavelan-plugin/debian/control
   goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch
   goodies/trunk/xfce4-wavelan-plugin/debian/rules
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/xfce4-wavelan-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-wavelan-plugin:4344-5328
/goodies/tags/xfce4-wavelan-plugin/0.5.5-3:3427-4343

Modified: goodies/trunk/xfce4-wavelan-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/changelog	2011-04-03 12:54:25 UTC (rev 5328)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/changelog	2011-04-03 13:18:50 UTC (rev 5329)
@@ -1,3 +1,31 @@
+xfce4-wavelan-plugin (0.5.6-1) UNRELEASED; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/control:
+    - add build-dep on libxfcegui4-dev.
+    - add build-dep on xfce4-dev-tools and libtool.
+  * debian/patches:
+    - 01_fix-tooltips-gtk2.16 dropped, included upstream.
+  * debian/rules:
+    - run xdt-autogen after applying patches touching
+      configure.in/Makefile.am.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+  * Switch to 3.0 (quilt) source format.
+
+  [ Lionel Le Folgoc ]
+  * Drop the autotools regeneration, unneeded with 0.5.6 (already compatible
+    with xfce4-panel 4.7):
+    - debian/control: drop xfce4-dev-tools and libtool b-deps.
+    - debian/rules: drop xdt-autogen call in post-patches::.
+  * debian/control: 
+    - add myself to Uploaders.
+    - update Standards-Version to 3.9.1.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 05 Dec 2010 17:01:02 +0100
+
 xfce4-wavelan-plugin (0.5.5-3) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/xfce4-wavelan-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/control	2011-04-03 12:54:25 UTC (rev 5328)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/control	2011-04-03 13:18:50 UTC (rev 5329)
@@ -3,10 +3,11 @@
 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>, 
- Yves-Alexis Perez <corsac at debian.org>
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: autotools-dev, cdbs, debhelper (>= 7), 
- xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, intltool
-Standards-Version: 3.8.2
+ xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, intltool,
+ libxfcegui4-dev, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-wavelan-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-wavelan-plugin/

Deleted: goodies/trunk/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch	2011-04-03 12:54:25 UTC (rev 5328)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/patches/01_fix-tooltips-gtk2.16.patch	2011-04-03 13:18:50 UTC (rev 5329)
@@ -1,85 +0,0 @@
---- ./panel-plugin/wavelan.c.orig	2009-04-08 23:58:02.000000000 +0300
-+++ ./panel-plugin/wavelan.c	2009-05-23 18:09:53.000000000 +0300
-@@ -63,8 +63,6 @@
-   GtkWidget *image;
-   GtkWidget *signal;
- 
--  GtkTooltips *tooltips;
--
-   XfcePanelPlugin *plugin;
-   
- } t_wavelan;
-@@ -145,22 +143,20 @@
-       TRACE ("result = %d", result);
-       /* reset quality indicator */
-       if (result == WI_NOCARRIER) {
--        tip = g_strdup_printf(_("No carrier signal"));
-+        tip = g_strdup(_("No carrier signal"));
-         wavelan_set_state(wavelan, 0);
-       }
-       else {
-         /* set error */
--        tip = g_strdup_printf("%s", wi_strerror(result));
-+        tip = g_strdup(wi_strerror(result));
-         wavelan_set_state(wavelan, -1);
-       }
-     }
-     else {
-       wavelan_set_state(wavelan, stats.ws_quality);
--
--      if (strlen(stats.ws_netname) > 0)
--        tip = g_strdup_printf("%s: %d%s at %dMb/s", stats.ws_netname, stats.ws_quality, stats.ws_qunit, stats.ws_rate);
--      else
--        tip = g_strdup_printf("%d%s at %dMb/s", stats.ws_quality, stats.ws_qunit, stats.ws_rate);
-+      tip = g_strdup_printf("%s%s%d%s at %dMb/s", stats.ws_netname,
-+                            strlen(stats.ws_netname) > 0 ? ": " : "",
-+                            stats.ws_quality, stats.ws_qunit, stats.ws_rate);
-     }
-   }
-   else {
-@@ -170,8 +166,7 @@
- 
-   /* activate new tooltip */
-   if (tip != NULL) {
--    gtk_tooltips_set_tip(wavelan->tooltips, GTK_WIDGET (wavelan->plugin), 
--                         tip, NULL);
-+    gtk_widget_set_tooltip_text(GTK_WIDGET (wavelan->plugin), tip);
-     g_free(tip);
-   }
- 
-@@ -199,7 +194,11 @@
-     if ((wavelan->device = wi_open(wavelan->interface)) != NULL) {
-       /* register the update timer */
-       TRACE ("Opened device");
--      wavelan->timer_id = g_timeout_add(250, wavelan_timer, wavelan);
-+#if GLIB_CHECK_VERSION( 2,14,0 )
-+      wavelan->timer_id = g_timeout_add_seconds(1, wavelan_timer, wavelan);
-+#else
-+      wavelan->timer_id = g_timeout_add(1000, wavelan_timer, wavelan);
-+#endif
-     }
-   }
- }
-@@ -328,12 +327,6 @@
-   else
-     gtk_widget_set_size_request(wavelan->ebox, wavelan->size, -1);
-   
--
--  /* create tooltips */
--  wavelan->tooltips = gtk_tooltips_new();
--  g_object_ref (wavelan->tooltips);
--  gtk_object_sink (GTK_OBJECT (wavelan->tooltips));
--
-   wavelan_read_config(plugin, wavelan);
- 
-   wavelan_set_state(wavelan, wavelan->state);
-@@ -346,9 +339,6 @@
- {
-   TRACE ("Entered wavelan_free");
-   
--  /* free tooltips */
--  g_object_unref(G_OBJECT(wavelan->tooltips));
--
-     g_source_remove(wavelan->timer_id);
- 
-   /* free the device info */

Modified: goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch	2011-04-03 12:54:25 UTC (rev 5328)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/patches/02_fix-ftbfs-kfreebsd.patch	2011-04-03 13:18:50 UTC (rev 5329)
@@ -1,3 +1,6 @@
+Description: fix FTBFS on Debian GNU/kFreeBSD
+Author: Aurélien Jarno <aurel at aurel32.net>
+Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6963
 --- xfce4-wavelan-plugin-0.5.5.orig/panel-plugin/wi_bsd.c
 +++ xfce4-wavelan-plugin-0.5.5/panel-plugin/wi_bsd.c
 @@ -28,7 +28,14 @@

Copied: goodies/trunk/xfce4-wavelan-plugin/debian/patches/series (from rev 5328, goodies/branches/experimental/xfce4-wavelan-plugin/debian/patches/series)
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/patches/series	2011-04-03 13:18:50 UTC (rev 5329)
@@ -0,0 +1 @@
+02_fix-ftbfs-kfreebsd.patch

Modified: goodies/trunk/xfce4-wavelan-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-wavelan-plugin/debian/rules	2011-04-03 12:54:25 UTC (rev 5328)
+++ goodies/trunk/xfce4-wavelan-plugin/debian/rules	2011-04-03 13:18:50 UTC (rev 5329)
@@ -1,11 +1,18 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_DH_INSTALL_ARGS := --fail-missing
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
 
+include /usr/share/hardening-includes/hardening.make
+
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
 binary-post-install/xfce4-wavelan-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la

More information about the Pkg-xfce-commits mailing list