[Pkg-xfce-commits] r5258 - in goodies/trunk/xfce4-cpufreq-plugin: . debian debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Apr 2 03:48:49 UTC 2011
Author: corsac
Date: 2011-04-02 15:48:48 +0000 (Sat, 02 Apr 2011)
New Revision: 5258
Removed:
goodies/trunk/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch
goodies/trunk/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch
goodies/trunk/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch
goodies/trunk/xfce4-cpufreq-plugin/debian/patches/series
Modified:
goodies/trunk/xfce4-cpufreq-plugin/
goodies/trunk/xfce4-cpufreq-plugin/debian/changelog
goodies/trunk/xfce4-cpufreq-plugin/debian/control
goodies/trunk/xfce4-cpufreq-plugin/debian/copyright
goodies/trunk/xfce4-cpufreq-plugin/debian/rules
Log:
merge experimental branch into trunk
Property changes on: goodies/trunk/xfce4-cpufreq-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-cpufreq-plugin:4300-5257
/goodies/tags/xfce4-cpufreq-plugin/0.2-3:3942-4299
Modified: goodies/trunk/xfce4-cpufreq-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/changelog 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/changelog 2011-04-02 15:48:48 UTC (rev 5258)
@@ -1,11 +1,30 @@
-xfce4-cpufreq-plugin (0.2-4) UNRELEASED; urgency=low
+xfce4-cpufreq-plugin (1.0.0-1) experimental; urgency=low
- * debian/watch really added.
+ [ Yves-Alexis Perez ]
+ New upstream release.
+ * debian/rules:
+ - switch to dh7 tiny rules
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+ - add hardening flags to {C,LD}FLAGS}.
+ * debian/control:
+ - update dh build dep to 7.0.50~ for overrides.
+ - add build-dep on libxfcegui4-dev.
+ - update standards version to 3.9.1.
+ - switch to xfce section.
+ * Switch to 3.0 (quilt)_source format.
+ * debian/patches:
+ - all patches dropped for new upstream.
+ * debian/watch added.
+ * debian/copyright updated and switch to DEP5 format.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 23 Apr 2010 01:14:39 +0200
+ [ Lionel Le Folgoc ]
+ * debian/control: add missing ${misc:Depends}.
-xfce4-cpufreq-plugin (0.2-3) unstable; urgency=low
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Feb 2011 14:35:51 +0100
+xfce4-cpufreq-plugin (0.2-3+b1) unstable; urgency=low
+
[ Stefan Ott ]
* debian/control: update e-mail address
@@ -16,18 +35,15 @@
* debian/watch edited to track Xfce archive reorganisation.
* debian/compat bumped to 7.
* debian/control:
- - update standards version to 3.8.4.
+ - update standards version to 3.8.2.
- update debhelper build-dep to 7.
- - switch to xfce section.
- - add depends on ${misc:Depends}.
- * debian/source/format created with "3.0 (quilt)" format.
[ Lionel Le Folgoc ]
* debian/patches/03_fix-segfault-on-exit.patch: use expected function
signature for the "free-data" callback. lp: #86317, closes: #505175
* debian/control: add myself to Uploaders.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 23 Apr 2010 00:39:11 +0200
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Tue, 16 Feb 2010 22:54:36 +0100
xfce4-cpufreq-plugin (0.2-2) unstable; urgency=low
Modified: goodies/trunk/xfce4-cpufreq-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/control 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/control 2011-04-02 15:48:48 UTC (rev 5258)
@@ -5,8 +5,10 @@
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>,
Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at debian.org>, Stefan Ott <stefan at ott.net>,
Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), libgtk2.0-dev, xfce4-panel-dev (>= 4.3.90.2-3), libxml2-dev, libcpufreq-dev, intltool
-Standards-Version: 3.8.4
+Build-Depends: cdbs, debhelper (>= 7.0.50~), libgtk2.0-dev,
+ xfce4-panel-dev (>= 4.3.90.2-3), libxml2-dev, libcpufreq-dev, intltool,
+ libxfcegui4-dev, hardening-includes
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-cpufreq-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-cpufreq-plugin/
Modified: goodies/trunk/xfce4-cpufreq-plugin/debian/copyright
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/copyright 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/copyright 2011-04-02 15:48:48 UTC (rev 5258)
@@ -1,15 +1,28 @@
-This package was debianized by Stefan Ott <stefan at desire.ch> on
-Tue, 04 Oct 2005 00:04:56 CEST.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=162
+Upstream-Name: xfce4-cpufreq-plugin
+Upstream-Contact: Florian Frivoal <frivoal at xfce.org>
+Source: http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin
+License: GPL-2
-It was downloaded from <http://triplehelix.org/~joshk/>
+Files: panel-plugin/xfce4-cpufreq-configure.c
+ panel-plugin/xfce4-cpufreq-configure.h
+ panel-plugin/xfce4-cpufreq-linux.c
+ panel-plugin/xfce4-cpufreq-overview.c
+ panel-plugin/xfce4-cpufreq-plugin.c
+ panel-plugin/xfce4-cpufreq-plugin.h
+ panel-plugin/xfce4-cpufreq-utils.c
+Copyright: 2006, Thomas Schreck <shrek at xfce.org>
+ 2010-2011, Florian Rivoal <frivoal at xfce.org>
+License: GPL-2
-Copyright holders:
-© 2005 Joshua Kwan <joshk at triplehelix.org>
-© 2003 Nicholas Penwarden <toth64 at yahoo.com>
-© 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
-© 2003 2003 edscott wilson garcia <edscott at users.sourceforge.net>
+Files: panel-plugin/xfce4-cpufreq-linux.h
+ panel-plugin/xfce4-cpufreq-overview.h
+ panel-plugin/xfce4-cpufreq-utils.h
+Copyright: 2006, Thomas Schreck <shrek at xfce.org>
+License: GPL-2
-License:
-This software is released under the terms of the BSD license.
-On Debian systems, the complete text of the BSD License
-can be found in the file /usr/share/common-licenses/BSD
+License: GPL-2
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2'.
+
Deleted: goodies/trunk/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch 2011-04-02 15:48:48 UTC (rev 5258)
@@ -1,109 +0,0 @@
---- xfce4-cpufreq-plugin-0.2/cpufreq.c 2006-06-16 02:21:54.000000000 +0200
-+++ xfce4-cpufreq-plugin-0.2.patched/cpufreq.c 2008-04-05 01:24:44.914728734 +0200
-@@ -64,6 +64,7 @@
-
- gboolean invert_colors;
- gboolean showed_warning;
-+ gboolean always_GHz;
-
- GdkColor colorLow;
- GdkColor colorHi;
-@@ -178,9 +179,9 @@
- }
- }
-
-- if (cur < 1000000)
-+ if ((cur < 1000000) && !c->always_GHz)
- snprintf(buf, 256, "<span size=\"x-small\">%d</span><span size=\"small\"> </span><span size=\"x-small\">MHz</span>", cur / 1000);
-- else
-+ else
- snprintf(buf, 256, "<span size=\"small\">%.1f GHz</span>", (gdouble)cur / 1000000);
-
- if ((cur < c->max && !c->invert_colors) ||
-@@ -291,6 +292,7 @@
- {
- c->cpu = 0;
- c->invert_colors = FALSE;
-+ c->always_GHz = FALSE;
- return;
- }
-
-@@ -302,11 +304,13 @@
- {
- c->cpu = 0;
- c->invert_colors = FALSE;
-+ c->always_GHz = FALSE;
- return;
- }
-
- c->cpu = atoi(str);
- c->invert_colors = xfce_rc_read_bool_entry(rc, "InvColors", FALSE);
-+ c->always_GHz = xfce_rc_read_bool_entry(rc, "AlwaysGHz", FALSE);
- xfce_rc_close (rc);
- }
-
-@@ -329,6 +333,7 @@
- snprintf(buf, 32, "%d", c->cpu);
- xfce_rc_write_entry(rc, "NumCPUs", buf);
- xfce_rc_write_bool_entry(rc, "InvColors", c->invert_colors);
-+ xfce_rc_write_bool_entry(rc, "AlwaysGHz", c->always_GHz);
- xfce_rc_close (rc);
- }
-
-@@ -351,6 +356,15 @@
- }
-
- static void
-+always_GHz_toggled (GtkToggleButton *button, gpointer data)
-+{
-+ struct cpufreq_monitor *c = (struct cpufreq_monitor *)data;
-+ c->always_GHz = gtk_toggle_button_get_active (button);
-+
-+ update_cpufreq_status (c);
-+}
-+
-+static void
- combo_changed_cb (GtkComboBox *cb, gpointer data)
- {
- struct cpufreq_monitor *c = (struct cpufreq_monitor *)data;
-@@ -410,16 +424,30 @@
- GtkWidget *options_label = gtk_label_new (_("Options"));
- gtk_widget_show (options_label);
- gtk_frame_set_label_widget (GTK_FRAME (options), options_label);
--
-+
-+ GtkWidget *options_list = gtk_vbox_new(TRUE, 0);
-+ gtk_widget_show(options_list);
-+
- GtkWidget *invert = gtk_check_button_new_with_mnemonic
- (_("Invert colors"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(invert), c->invert_colors);
- gtk_widget_show(invert);
-- gtk_container_add (GTK_CONTAINER (options), invert);
-+ gtk_container_add (GTK_CONTAINER (options_list), invert);
-
- g_signal_connect(invert, "toggled",
- G_CALLBACK (invert_colors_toggled), c);
-
-+ GtkWidget *alwaysGHz = gtk_check_button_new_with_mnemonic
-+ (_("Always show Frequency as GHz"));
-+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alwaysGHz), c->always_GHz);
-+ gtk_widget_show(alwaysGHz);
-+ gtk_container_add (GTK_CONTAINER (options_list), alwaysGHz);
-+
-+ g_signal_connect(alwaysGHz, "toggled",
-+ G_CALLBACK (always_GHz_toggled), c);
-+
-+ gtk_container_add(GTK_CONTAINER (options), options_list);
-+
- gtk_box_pack_start(GTK_BOX(vbox), header, FALSE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 5);
- gtk_box_pack_start(GTK_BOX(vbox), cpucombo, FALSE, FALSE, 0);
-@@ -445,6 +473,7 @@
- c->nr_cpus = get_nr_cpus();
- c->showed_warning = FALSE;
- c->invert_colors = FALSE;
-+ c->always_GHz = FALSE;
-
- /* determine min/max */
- cpufreq_get_hardware_limits(c->cpu, &c->min, &c->max);
Deleted: goodies/trunk/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch 2011-04-02 15:48:48 UTC (rev 5258)
@@ -1,82 +0,0 @@
-diff --git a/po/Makefile b/po/Makefile
-index 7d4c3dc..5332797 100644
---- a/po/Makefile
-+++ b/po/Makefile
-@@ -2,7 +2,7 @@
-
- top_srcdir = ../
- NAME = xfce4-cpufreq
--ALL_LINGUAS = fr
-+ALL_LINGUAS = fr ja
- PO_DIR ?= /usr/share/locale
-
- po: $(NAME).pot $(addsuffix .mo, $(ALL_LINGUAS))
-@@ -22,4 +22,4 @@ clean:
- install-po: po
- $(foreach lang,$(ALL_LINGUAS), \
- mkdir -p $(DESTDIR)$(PO_DIR)/$(lang)/LC_MESSAGES && \
-- install -m 644 $(lang).mo $(DESTDIR)$(PO_DIR)/$(lang)/LC_MESSAGES/$(NAME).mo)
-+ install -m 644 $(lang).mo $(DESTDIR)$(PO_DIR)/$(lang)/LC_MESSAGES/$(NAME).mo;)
-diff --git a/po/ja.po b/po/ja.po
-new file mode 100644
-index 0000000..330a11d
---- /dev/null
-+++ b/po/ja.po
-@@ -0,0 +1,57 @@
-+# xfce4-cpufreq-plugin-0.2 Japanese PO translation file
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
-+# Nobuhiro Iwamatsu <iwamatsu at nigauri.org>, 2008
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: xfce4-cpufreq-plugin-0.2\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2006-06-15 17:19-0700\n"
-+"PO-Revision-Date: 2008-04-12 23:20+0900\n"
-+"Last-Translator: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n"
-+"Language-Team: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Poedit-Language: Japanese\n"
-+"X-Poedit-Country: JAPAN\n"
-+
-+#: ../cpufreq.c:110
-+#: ../cpufreq.c:137
-+msgid "Processor model unknown"
-+msgstr "プロセッサモデルが不明です。"
-+
-+#: ../cpufreq.c:159
-+msgid "CPUFreq support is not present. The CPUFreq Monitor will not function this session."
-+msgstr "CPUFreq サポートがありません。CPUFreq Monitor はこのセッションでは機能しないでしょう。"
-+
-+#: ../cpufreq.c:164
-+msgid "N/A"
-+msgstr "該当なし"
-+
-+#: ../cpufreq.c:172
-+#, c-format
-+msgid "CPU %d is not present. The CPUFreq Monitor will monitor CPU 0 for this session."
-+msgstr "CPU %d がありません。CPUFreq Monitor はこのセッションでは CPU0 を監視します。"
-+
-+#: ../cpufreq.c:379
-+msgid "CPUFreq Plugin Options"
-+msgstr "CPUFreq プラグインオプション"
-+
-+#: ../cpufreq.c:380
-+msgid "Choose the CPU to monitor:"
-+msgstr "監視する CPU を選んでください:"
-+
-+#: ../cpufreq.c:395
-+msgid "Properties"
-+msgstr "設定"
-+
-+#: ../cpufreq.c:410
-+msgid "Options"
-+msgstr "オプション"
-+
-+#: ../cpufreq.c:415
-+msgid "Invert colors"
-+msgstr "色を逆にします。"
-+
Deleted: goodies/trunk/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch 2011-04-02 15:48:48 UTC (rev 5258)
@@ -1,11 +0,0 @@
---- xfce4-cpufreq-plugin-0.2.orig/cpufreq.c
-+++ xfce4-cpufreq-plugin-0.2/cpufreq.c
-@@ -196,7 +196,7 @@
- }
-
- static void
--cpufreq_free (struct cpufreq_monitor *c)
-+cpufreq_free (XfcePanelPlugin *plugin, struct cpufreq_monitor *c)
- {
- int i;
-
Deleted: goodies/trunk/xfce4-cpufreq-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/patches/series 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/patches/series 2011-04-02 15:48:48 UTC (rev 5258)
@@ -1,3 +0,0 @@
-01_add_always_ghz_option.patch
-02_ja.po.patch
-03_fix-segfault-on-exit.patch
Modified: goodies/trunk/xfce4-cpufreq-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-cpufreq-plugin/debian/rules 2011-04-02 15:45:43 UTC (rev 5257)
+++ goodies/trunk/xfce4-cpufreq-plugin/debian/rules 2011-04-02 15:48:48 UTC (rev 5258)
@@ -1,15 +1,17 @@
#!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile-vars.mk
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
-DEB_MAKE_INVOKE := $(DEB_MAKE_ENVVARS) \
- make -C $(DEB_BUILDDIR)
+export CFLAGS LDFLAGS
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/`dh_listpackages`
+%:
+ dh $@
-include /usr/share/cdbs/1/class/makefile.mk
-
-binary-post-install/xfce4-cpufreq-plugin::
+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
More information about the Pkg-xfce-commits
mailing list