[Pkg-xfce-commits] r4833 - in goodies/branches/experimental/xfce4-cpufreq-plugin/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Sun Jan 23 10:32:29 UTC 2011


Author: corsac
Date: 2011-01-23 10:32:27 +0000 (Sun, 23 Jan 2011)
New Revision: 4833

Removed:
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/04_fix-linking-libxfcegui4.patch
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/series
Modified:
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog
Log:
all patches dropped for new upstream.

Modified: goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog	2011-01-23 10:18:13 UTC (rev 4832)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog	2011-01-23 10:32:27 UTC (rev 4833)
@@ -13,14 +13,13 @@
     - update standards version to 3.9.1.
   * Switch to 3.0 (quilt)_source format.
   * debian/patches:
-    - 04_fix-linking-libxfcegui4 added, link explicitely against libxfcegui4. 
+    - all patches dropped for new upstream.
   * debian/watch added.
 
   [ Lionel Le Folgoc ]
-  * debian/patches/04_fix-linking-libxfcegui4: use correct linking order.
   * debian/control: add missing ${misc:Depends}.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 Jan 2011 11:17:36 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 Jan 2011 11:20:59 +0100
 
 xfce4-cpufreq-plugin (0.2-3) unstable; urgency=low
 

Deleted: goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch	2011-01-23 10:18:13 UTC (rev 4832)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/01_add_always_ghz_option.patch	2011-01-23 10:32:27 UTC (rev 4833)
@@ -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/branches/experimental/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch	2011-01-23 10:18:13 UTC (rev 4832)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/02_ja.po.patch	2011-01-23 10:32:27 UTC (rev 4833)
@@ -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/branches/experimental/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch	2011-01-23 10:18:13 UTC (rev 4832)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/03_fix-segfault-on-exit.patch	2011-01-23 10:32:27 UTC (rev 4833)
@@ -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/branches/experimental/xfce4-cpufreq-plugin/debian/patches/04_fix-linking-libxfcegui4.patch
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/04_fix-linking-libxfcegui4.patch	2011-01-23 10:18:13 UTC (rev 4832)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/04_fix-linking-libxfcegui4.patch	2011-01-23 10:32:27 UTC (rev 4833)
@@ -1,20 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 81bd8de..b8477fa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,11 @@
- CC = gcc
- OUT = xfce4-cpufreq-plugin
--EXT_CFLAGS := $(shell pkg-config --cflags libxml-2.0 gtk+-2.0 libxfce4panel-1.0)
--EXT_LIBS := $(shell pkg-config --libs libxml-2.0 gtk+-2.0 libxfce4panel-1.0) -lcpufreq
--CFLAGS = -DENABLE_NLS -Wl,-export-dynamic -g -O2 -Wall $(EXT_CFLAGS) $(EXT_LIBS)
-+EXT_CFLAGS := $(shell pkg-config --cflags libxml-2.0 gtk+-2.0 libxfce4panel-1.0 libxfcegui4-1.0)
-+EXT_LIBS := $(shell pkg-config --libs libxml-2.0 gtk+-2.0 libxfce4panel-1.0 libxfcegui4-1.0) -lcpufreq
-+CFLAGS += -DENABLE_NLS -Wl,-export-dynamic -g -O2 -Wall $(EXT_CFLAGS)
- 
- $(OUT): cpufreq.c
--	$(CC) $(CFLAGS) $< -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $< $(EXT_LIBS) -o $@
- 
- clean:
- 	$(RM) *~ $(OUT)

Deleted: goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/series	2011-01-23 10:18:13 UTC (rev 4832)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/series	2011-01-23 10:32:27 UTC (rev 4833)
@@ -1,4 +0,0 @@
-01_add_always_ghz_option.patch
-02_ja.po.patch
-03_fix-segfault-on-exit.patch
-04_fix-linking-libxfcegui4.patch




More information about the Pkg-xfce-commits mailing list