Hello,
find attached a couple of patches to update the Debian packing in next
for 0.95.7.
cu Andreas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
>From e7ab680f5bc7fefefb8a3254cc49d4bce57984b1 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sun, 27 Dec 2015 14:36:11 +0100
Subject: [PATCH 1/5] Ignore missing documentation for --runstatedir.
Ignore runstatedir in check-cmdline-options-doc.sh
autoconf 2.70 will add a --runstatedir option, Debian has backported
it. Ignore it when checking whether INSTALL is up to date.
---
debian/changelog | 5 +++++
debian/patches/56_ignore_runstatedir.diff | 16 ++++++++++++++++
debian/patches/series | 1 +
3 files changed, 22 insertions(+)
create mode 100644 debian/patches/56_ignore_runstatedir.diff
diff --git a/debian/changelog b/debian/changelog
index b0e1129..6065693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
wmaker (0.95.7-1) unstable; urgency=medium
+ [ Rodolfo García Peñas (kix) ]
* New upstrem version 0.95.7.
* debian/changelog, removed debian files (lintian warning).
* Updated debian/libwings3.symbols.
@@ -20,6 +21,10 @@ wmaker (0.95.7-1) unstable; urgency=medium
* debian/wmaker.manpages
* Removed upstream file FAQ.I18N in debian/wmaker-common.docs.
+ [ Andreas Metzler ]
+ * 56_ignore_runstatedir.diff: Ignore missing documentation for --runstatedir
+ in INSTALL.
+
-- Rodolfo García Peñas (kix) <k...@debian.org> Thu, 13 Aug 2015 20:19:33 +0200
wmaker (0.95.6-1.1) unstable; urgency=medium
diff --git a/debian/patches/56_ignore_runstatedir.diff b/debian/patches/56_ignore_runstatedir.diff
new file mode 100644
index 0000000..4305bfc
--- /dev/null
+++ b/debian/patches/56_ignore_runstatedir.diff
@@ -0,0 +1,16 @@
+Description: Ignore runstatedir in check-cmdline-options-doc.sh
+ autoconf 2.70 will add a --runstatedir option, Debian has backported it.
+ Ignore it when checking whether INSTALL is up to date.
+Author: Andreas Metzler <ametz...@debian.org>
+Origin: vendor
+
+--- wmaker-0.95.7.orig/Makefile.am
++++ wmaker-0.95.7/Makefile.am
+@@ -106,6 +106,7 @@ configure-documentation:
+ --ignore-prg 'enable-shared,enable-static # should be in INSTALL' \
+ --ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \
+ --ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
++ --ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
+ --ignore-prg 'with-x # no use, it would not work without X'
+
+ .PHONY: configure-documentation
diff --git a/debian/patches/series b/debian/patches/series
index b704e17..7032d1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
53_Debian_WMState.diff
54_Debian_wmmacros.diff
55_ungif_problem.diff
+56_ignore_runstatedir.diff
--
2.6.4
>From 3eb980bc5ec6f192d5cc1657768f6b21b5e9cec4 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sun, 27 Dec 2015 14:48:54 +0100
Subject: [PATCH 2/5] Use dh_autoreconf.
Use dh_autoreconf instead of invoking autogen.sh in the configure
target.
---
debian/changelog | 1 +
debian/control | 2 +-
debian/rules | 3 +--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6065693..089adaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ wmaker (0.95.7-1) unstable; urgency=medium
[ Andreas Metzler ]
* 56_ignore_runstatedir.diff: Ignore missing documentation for --runstatedir
in INSTALL.
+ * Use dh_autoreconf instead of invoking autogen.sh in the configure target.
-- Rodolfo García Peñas (kix) <k...@debian.org> Thu, 13 Aug 2015 20:19:33 +0200
diff --git a/debian/control b/debian/control
index b761636..8cc6772 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9), automake (>= 1:1.12), gettext,
libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff5-dev,
libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev,
libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils, libxmu-dev,
- libxrandr-dev, dctrl-tools, autotools-dev
+ libxrandr-dev, dctrl-tools, dh-autoreconf
Homepage: http://windowmaker.org/
Package: wmaker
diff --git a/debian/rules b/debian/rules
index 8dfd436..fda2056 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,10 +36,9 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \
--with-gnustepdir=$(GNUSTEPDIR)
%:
- dh $@ --parallel --with autotools-dev
+ dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- ./autogen.sh
LINGUAS="$(LINGUAS)" ./configure $(COMMON_OPTIONS) \
$(WMAKER_OPTIONS) $(shell dpkg-buildflags --export=configure)
--
2.6.4
>From c862774ecbb6ef4265312a0b4278bd83a3044357 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sun, 27 Dec 2015 15:24:48 +0100
Subject: [PATCH 3/5] Simplify debian/rules.
Use dh_auto_configure, especially for handling dpkg-buildflags.
---
debian/changelog | 2 ++
debian/rules | 17 ++++-------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 089adaf..11c8a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ wmaker (0.95.7-1) unstable; urgency=medium
* 56_ignore_runstatedir.diff: Ignore missing documentation for --runstatedir
in INSTALL.
* Use dh_autoreconf instead of invoking autogen.sh in the configure target.
+ * Simplify debian/rules and use dh_auto_configure, especially for handling
+ dpkg-buildflags.
-- Rodolfo García Peñas (kix) <k...@debian.org> Thu, 13 Aug 2015 20:19:33 +0200
diff --git a/debian/rules b/debian/rules
index fda2056..684800e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
# export DH_VERBOSE=1
-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`
+export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR=\"GNUstep/Defaults\"
LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po))
@@ -17,20 +14,14 @@ DEBIAN_TMP := debian/tmp
# Be careful with the leading / because some of these values are going
# to be hardcoded into the executables
BASEDIR := /usr
-CONFDIR := /etc
INCLUDEDIR := $(BASEDIR)/include
SHAREDIR := $(BASEDIR)/share
-MANDIR := $(SHAREDIR)/man
NLSDIR := $(SHAREDIR)/locale
GNUSTEPDIR := $(SHAREDIR)/lib/GNUstep/System
WMSHAREDIR := $(SHAREDIR)/WindowMaker
PIXMAPDIR := $(INCLUDEDIR)/X11/pixmaps
-COMMON_OPTIONS := --prefix=$(BASEDIR) \
- --mandir=$(MANDIR) \
- --includedir=$(INCLUDEDIR) \
- --sysconfdir=$(CONFDIR) \
- --datadir=$(SHAREDIR) \
+COMMON_OPTIONS := --datadir=$(SHAREDIR) \
--with-localedir=$(NLSDIR) \
--with-pixmapdir=$(PIXMAPDIR) \
--with-gnustepdir=$(GNUSTEPDIR)
@@ -39,8 +30,8 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \
dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- LINGUAS="$(LINGUAS)" ./configure $(COMMON_OPTIONS) \
- $(WMAKER_OPTIONS) $(shell dpkg-buildflags --export=configure)
+ env LINGUAS="$(LINGUAS)" dh_auto_configure --verbose -- \
+ $(COMMON_OPTIONS) $(WMAKER_OPTIONS) --libdir=/usr/lib
override_dh_installmenu:
dh_installmenu -a --noscripts
--
2.6.4
>From af468b09c88e062140cc1c85606f9a8839a0bebe Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sun, 27 Dec 2015 15:28:39 +0100
Subject: [PATCH 4/5] Fix typo occured. (Thanks, lintian.)
---
debian/README.Debian | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index d8ccc11..0c41336 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -33,7 +33,7 @@ Other sources for documentation
ftp://ftp.windowmaker.org/pub/wmaker/docs/
Please note the manual documents version 0.10.x of Window Maker, and
- many features/changes have occured since then. To find out what has
+ many features/changes have occurred since then. To find out what has
changed, please read file:/usr/share/doc/wmaker/NEWS.gz and
file:/usr/share/doc/wmaker/changelog.gz. A new version of this manual is
being developed. If you want to contribute to the manual please
--
2.6.4
>From 5649063899c0179efe9d8a89cbaba69a3342c968 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametz...@bebt.de>
Date: Sun, 27 Dec 2015 15:46:21 +0100
Subject: [PATCH 5/5] wmaker manpage moved from 1x to 1.
wmaker manpage was also moved from section 1x to 1. Fix pointer in
README.Debian and update-alternatives slave link.
---
debian/README.Debian | 2 +-
debian/changelog | 2 ++
debian/wmaker.postinst | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 0c41336..4ce573b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -17,7 +17,7 @@ and remove other exec lines if present. I have done my best to
overcome certain glitches and gotchas regarding Window Maker
installation. /usr/bin/wmaker is a shell script that tries to
make sure things are properly set up. Take a look at it to see what's
-going on. Please read wmaker(1x).
+going on. Please read wmaker(1).
Other sources for documentation
diff --git a/debian/changelog b/debian/changelog
index 11c8a26..3727ae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ wmaker (0.95.7-1) unstable; urgency=medium
* Use dh_autoreconf instead of invoking autogen.sh in the configure target.
* Simplify debian/rules and use dh_auto_configure, especially for handling
dpkg-buildflags.
+ * wmaker manpage was also moved from section 1x to 1. Fix pointer in
+ README.Debian and update-alternatives slave link.
-- Rodolfo García Peñas (kix) <k...@debian.org> Thu, 13 Aug 2015 20:19:33 +0200
diff --git a/debian/wmaker.postinst b/debian/wmaker.postinst
index d3f1d39..c5e5e85 100644
--- a/debian/wmaker.postinst
+++ b/debian/wmaker.postinst
@@ -22,7 +22,7 @@ case "$1" in
update-alternatives --install /usr/bin/x-window-manager \
x-window-manager /usr/bin/wmaker 50 \
--slave /usr/share/man/man1/x-window-manager.1.gz \
- x-window-manager.1.gz /usr/share/man/man1/wmaker.1x.gz
+ x-window-manager.1.gz /usr/share/man/man1/wmaker.1.gz
if [ -x /usr/bin/update-menus -a -x /usr/bin/install-menu ] ; then
update-menus
--
2.6.4
