>From fc7954848b53cde5d7b118f9a37a3ac2ce1ccaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]> Date: Sun, 17 Jun 2012 10:54:45 +0200 Subject: [PATCH 3/3] New debian version 0.95.3-2
* Hardening * Upload allowed for maintainers --- debian/changelog | 9 ++++++++- debian/control | 1 + debian/rules | 18 +++++------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 756f0a6..325ece6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ +wmaker (0.95.3-2) unstable; urgency=low + + * Hardened. debian/rules changed. + * DM-Upload-Allowed set. + + -- Rodolfo García Peñas (kix) <[email protected]> Thu, 10 Jun 2012 23:35:31 +0200 + wmaker (0.95.3-1) unstable; urgency=low * New upstream release 0.95.3 * Removed debian/clean file. Upstream removes now the files. * Bumped to standard version 3.9.3 - * Important!: Removed symbol "W_DraggingInfo" in libwutil2 and + * Important!: Removed symbol "W_DraggingInfo" in libwutil2 and libwings2, because the struct W_DraggingInfo is now declared as "typedef", therefore the struct is not included. This change is included in upstream, see line 126 of the file diff --git a/debian/control b/debian/control index 3af1f8f..5bb23fe 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: x11 Priority: optional Maintainer: Rodolfo García Peñas (kix) <[email protected]> Standards-Version: 3.9.3 +DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.0.50~), automake (>= 1:1.11), gettext, libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff4-dev, libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev, diff --git a/debian/rules b/debian/rules index ffb48ec..9884737 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,9 @@ #!/usr/bin/make -f # export DH_VERBOSE=1 - -CFLAGS = -g -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/Defaults\\\"" - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -DDEBUG -endif +export CFLAGS = `dpkg-buildflags --get CFLAGS` +export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/Defaults\\\"" +export LDFLAGS = `dpkg-buildflags --get LDFLAGS` +export CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -65,7 +57,7 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \ override_dh_auto_configure: ./autogen.sh LINGUAS="$(LINGUAS)" ./configure $(COMMON_OPTIONS) \ - $(WMAKER_OPTIONS) CFLAGS="$(CFLAGS)" + $(WMAKER_OPTIONS) $(shell dpkg-buildflags --export=configure) override_dh_installmenu: dh_installmenu -a --noscripts -- 1.7.10 -- ||// //\\// Rodolfo "kix" Garcia ||\\// //\\ http://www.kix.es/
>From fc7954848b53cde5d7b118f9a37a3ac2ce1ccaa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]> Date: Sun, 17 Jun 2012 10:54:45 +0200 Subject: [PATCH 3/3] New debian version 0.95.3-2 * Hardening * Upload allowed for maintainers --- debian/changelog | 9 ++++++++- debian/control | 1 + debian/rules | 18 +++++------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 756f0a6..325ece6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ +wmaker (0.95.3-2) unstable; urgency=low + + * Hardened. debian/rules changed. + * DM-Upload-Allowed set. + + -- Rodolfo García Peñas (kix) <[email protected]> Thu, 10 Jun 2012 23:35:31 +0200 + wmaker (0.95.3-1) unstable; urgency=low * New upstream release 0.95.3 * Removed debian/clean file. Upstream removes now the files. * Bumped to standard version 3.9.3 - * Important!: Removed symbol "W_DraggingInfo" in libwutil2 and + * Important!: Removed symbol "W_DraggingInfo" in libwutil2 and libwings2, because the struct W_DraggingInfo is now declared as "typedef", therefore the struct is not included. This change is included in upstream, see line 126 of the file diff --git a/debian/control b/debian/control index 3af1f8f..5bb23fe 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Section: x11 Priority: optional Maintainer: Rodolfo García Peñas (kix) <[email protected]> Standards-Version: 3.9.3 +DM-Upload-Allowed: yes Build-Depends: debhelper (>= 7.0.50~), automake (>= 1:1.11), gettext, libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff4-dev, libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev, diff --git a/debian/rules b/debian/rules index ffb48ec..9884737 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,9 @@ #!/usr/bin/make -f # export DH_VERBOSE=1 - -CFLAGS = -g -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/Defaults\\\"" - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -DDEBUG -endif +export CFLAGS = `dpkg-buildflags --get CFLAGS` +export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/Defaults\\\"" +export LDFLAGS = `dpkg-buildflags --get LDFLAGS` +export CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -65,7 +57,7 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \ override_dh_auto_configure: ./autogen.sh LINGUAS="$(LINGUAS)" ./configure $(COMMON_OPTIONS) \ - $(WMAKER_OPTIONS) CFLAGS="$(CFLAGS)" + $(WMAKER_OPTIONS) $(shell dpkg-buildflags --export=configure) override_dh_installmenu: dh_installmenu -a --noscripts -- 1.7.10
