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

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-12-06 21:22:22 +0000 (Mon, 06 Dec 2010)
New Revision: 4640

Modified:
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/control
   goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/04_fix-linking-libxfcegui4.patch
Log:
* debian/patches/04_fix-linking-libxfcegui4: use correct linking order.
* debian/control: add missing ${misc:Depends}.

Modified: goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog	2010-12-06 11:12:38 UTC (rev 4639)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog	2010-12-06 21:22:22 UTC (rev 4640)
@@ -1,5 +1,6 @@
 xfce4-cpufreq-plugin (0.2-4) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * debian/rules:
     - switch to dh7 tiny rules
     - pick {C,LD}FLAGS from dpkg-buildflags.
@@ -13,6 +14,10 @@
   * debian/patches:
     - 04_fix-linking-libxfcegui4 added, link explicitely against libxfcegui4. 
 
+  [ 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, 17 Oct 2010 17:17:54 +0200
 
 xfce4-cpufreq-plugin (0.2-3) unstable; urgency=low

Modified: goodies/branches/experimental/xfce4-cpufreq-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/control	2010-12-06 11:12:38 UTC (rev 4639)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/control	2010-12-06 21:22:22 UTC (rev 4640)
@@ -14,7 +14,7 @@
 
 Package: xfce4-cpufreq-plugin
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: cpufreq information plugin for the Xfce4 panel
  This plugin displays the current frequency of the CPU, in GHz or MHz as
  necessary. It also displays the frequency relative to the maximum CPU

Modified: 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	2010-12-06 11:12:38 UTC (rev 4639)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/04_fix-linking-libxfcegui4.patch	2010-12-06 21:22:22 UTC (rev 4640)
@@ -10,11 +10,11 @@
 -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) $(EXT_LIBS)
++CFLAGS += -DENABLE_NLS -Wl,-export-dynamic -g -O2 -Wall $(EXT_CFLAGS)
  
  $(OUT): cpufreq.c
 -	$(CC) $(CFLAGS) $< -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $< $(EXT_LIBS) -o $@
  
  clean:
  	$(RM) *~ $(OUT)