[Pkg-xfce-commits] r4320 - in goodies/branches/experimental/xfce4-cpufreq-plugin/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Oct 17 03:33:12 UTC 2010
Author: corsac
Date: 2010-10-17 15:33:08 +0000 (Sun, 17 Oct 2010)
New Revision: 4320
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
goodies/branches/experimental/xfce4-cpufreq-plugin/debian/rules
Log:
- pick {C,LD}FLAGS from dpkg-buildflags.
- add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
- add hardening flags to {C,LD}FLAGS}.
Modified: goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog 2010-10-17 15:15:02 UTC (rev 4319)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/changelog 2010-10-17 15:33:08 UTC (rev 4320)
@@ -2,6 +2,9 @@
* 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.
@@ -10,7 +13,7 @@
* debian/patches:
- 04_fix-linking-libxfcegui4 added, link explicitely against libxfcegui4.
- -- Yves-Alexis Perez <corsac at debian.org> Sun, 17 Oct 2010 16:58:48 +0200
+ -- 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-10-17 15:15:02 UTC (rev 4319)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/control 2010-10-17 15:33:08 UTC (rev 4320)
@@ -7,7 +7,7 @@
Lionel Le Folgoc <mrpouit at gmail.com>
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
+ 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/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-10-17 15:15:02 UTC (rev 4319)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/patches/04_fix-linking-libxfcegui4.patch 2010-10-17 15:33:08 UTC (rev 4320)
@@ -1,14 +1,20 @@
diff --git a/Makefile b/Makefile
-index 81bd8de..5f7b4bd 100644
+index 81bd8de..b8477fa 100644
--- a/Makefile
+++ b/Makefile
-@@ -1,7 +1,7 @@
+@@ -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) $(EXT_LIBS)
++CFLAGS += -DENABLE_NLS -Wl,-export-dynamic -g -O2 -Wall $(EXT_CFLAGS) $(EXT_LIBS)
$(OUT): cpufreq.c
+- $(CC) $(CFLAGS) $< -o $@
++ $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
+
+ clean:
+ $(RM) *~ $(OUT)
Modified: goodies/branches/experimental/xfce4-cpufreq-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-cpufreq-plugin/debian/rules 2010-10-17 15:15:02 UTC (rev 4319)
+++ goodies/branches/experimental/xfce4-cpufreq-plugin/debian/rules 2010-10-17 15:33:08 UTC (rev 4320)
@@ -1,5 +1,11 @@
#!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
+
%:
dh $@
More information about the Pkg-xfce-commits
mailing list