[Pkg-xfce-commits] r4736 - in desktop/branches/experimental: exo/debian garcon/debian libxfce4ui/debian libxfce4util/debian libxfcegui4/debian orage/debian thunar/debian thunar-vfs/debian tumbler/debian xfce4-appfinder/debian xfce4-panel/debian xfce4-session/debian xfce4-settings/debian xfce4-utils/debian xfconf/debian xfdesktop4/debian xfwm4/debian
Yves-Alexis Perez
corsac at alioth.debian.org
Mon Dec 20 02:58:07 UTC 2010
Author: corsac
Date: 2010-12-20 14:58:05 +0000 (Mon, 20 Dec 2010)
New Revision: 4736
Modified:
desktop/branches/experimental/exo/debian/rules
desktop/branches/experimental/garcon/debian/rules
desktop/branches/experimental/libxfce4ui/debian/rules
desktop/branches/experimental/libxfce4util/debian/rules
desktop/branches/experimental/libxfcegui4/debian/rules
desktop/branches/experimental/orage/debian/rules
desktop/branches/experimental/thunar-vfs/debian/rules
desktop/branches/experimental/thunar/debian/rules
desktop/branches/experimental/tumbler/debian/rules
desktop/branches/experimental/xfce4-appfinder/debian/rules
desktop/branches/experimental/xfce4-panel/debian/rules
desktop/branches/experimental/xfce4-session/debian/rules
desktop/branches/experimental/xfce4-settings/debian/rules
desktop/branches/experimental/xfce4-utils/debian/rules
desktop/branches/experimental/xfconf/debian/rules
desktop/branches/experimental/xfdesktop4/debian/rules
desktop/branches/experimental/xfwm4/debian/rules
Log:
export LDFLAGS and CFLAGS so debian/rules build has them too
don't rely on dpkg-buildpackage to export the variables for us, in some case
dpkg-buildpackage isn't used
Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/exo/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,6 +7,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
EXO_LIBNAME=1
EXO_SOVERSION=0
Modified: desktop/branches/experimental/garcon/debian/rules
===================================================================
--- desktop/branches/experimental/garcon/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/garcon/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -6,6 +6,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
%:
dh $@
Modified: desktop/branches/experimental/libxfce4ui/debian/rules
===================================================================
--- desktop/branches/experimental/libxfce4ui/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/libxfce4ui/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,6 +7,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
%:
dh $@
Modified: desktop/branches/experimental/libxfce4util/debian/rules
===================================================================
--- desktop/branches/experimental/libxfce4util/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/libxfce4util/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,6 +7,8 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
override_dh_install:
rm -f $(CURDIR)/debian/tmp/usr/lib/libxfce4util.la
dh_install --fail-missing
Modified: desktop/branches/experimental/libxfcegui4/debian/rules
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/libxfcegui4/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -6,6 +6,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
%:
dh $@
Modified: desktop/branches/experimental/orage/debian/rules
===================================================================
--- desktop/branches/experimental/orage/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/orage/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -12,6 +12,8 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
post-patches::
NOCONFIGURE=1 xdt-autogen
Modified: desktop/branches/experimental/thunar/debian/rules
===================================================================
--- desktop/branches/experimental/thunar/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/thunar/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -8,6 +8,8 @@
CFLAGS+=$(HARDENING_CFLAGS)
LDFLAGS+=$(HARDENING_LDFLAGS)
+export CFLAGS LDFLAGS
+
%:
dh $@
Modified: desktop/branches/experimental/thunar-vfs/debian/rules
===================================================================
--- desktop/branches/experimental/thunar-vfs/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/thunar-vfs/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -8,6 +8,8 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --disable-gnome-thumbnailers --enable-dbus --enable-startup-notification
makebuilddir/libthunar-vfs-1-2:: debian/compat
Modified: desktop/branches/experimental/tumbler/debian/rules
===================================================================
--- desktop/branches/experimental/tumbler/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/tumbler/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -6,6 +6,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
override_dh_install:
dh_install --list-missing -X .la
Modified: desktop/branches/experimental/xfce4-appfinder/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfce4-appfinder/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -6,6 +6,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
override_dh_install:
# install menu pixmap
Modified: desktop/branches/experimental/xfce4-panel/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-panel/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfce4-panel/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,7 +7,16 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-maintainer-mode
+ find .pc -type f -exec echo '{}' >> po/POTFILES.skip \;
+
+override_dh_auto_clean:
+ rm -f po/POTFILES.skip
+ dh_auto_clean
+
override_dh_install:
rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/panel/plugins/*.a
dh_install --fail-missing --sourcedir=debian/tmp -X .la
Modified: desktop/branches/experimental/xfce4-session/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-session/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfce4-session/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,6 +7,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
override_dh_auto_configure:
Modified: desktop/branches/experimental/xfce4-settings/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfce4-settings/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,7 +7,9 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
override_dh_auto_configure:
dh_auto_configure -- --enable-libnotify --enable-xcursor \
--enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\
Modified: desktop/branches/experimental/xfce4-utils/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-utils/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfce4-utils/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -9,6 +9,8 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
override_dh_auto_configure:
find .pc -type f -name '*.c' -exec echo '{}' \; >> po/POTFILES.skip
NOCONFIGURE=1 xdt-autogen
Modified: desktop/branches/experimental/xfconf/debian/rules
===================================================================
--- desktop/branches/experimental/xfconf/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfconf/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,7 +7,9 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
%:
dh $@
Modified: desktop/branches/experimental/xfdesktop4/debian/rules
===================================================================
--- desktop/branches/experimental/xfdesktop4/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfdesktop4/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,6 +7,8 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
override_dh_auto_configure:
dh_auto_configure -- --enable-thunarx --enable-exo \
--docdir=\$${prefix}/share/doc/xfdesktop4-data
Modified: desktop/branches/experimental/xfwm4/debian/rules
===================================================================
--- desktop/branches/experimental/xfwm4/debian/rules 2010-12-20 10:56:32 UTC (rev 4735)
+++ desktop/branches/experimental/xfwm4/debian/rules 2010-12-20 14:58:05 UTC (rev 4736)
@@ -7,5 +7,7 @@
LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
CFLAGS+=$(HARDENING_CFLAGS)
+export CFLAGS LDFLAGS
+
%:
dh $@
More information about the Pkg-xfce-commits
mailing list