This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via fc6ed78654fa4ac377f46076d9d1f32e0fcc99d6 (commit)
via c11b08d42b7233a1df8a6d19211bcc9f48b68c6f (commit)
via f7e1f5d5f4f2fe65b7ffb186b57f3a8e6fad6502 (commit)
via 4660e5b1eb90698cee192ac9deae298286942170 (commit)
via f58cf6a8cd2f0cb905dfedc1cf5f363173f496e2 (commit)
from 15ae70b159c9728b7a270bd68f4630808cc0f471 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/wmaker-crm.git/commit/fc6ed78654fa4ac377f46076d9d1f32e0fcc99d6
commit fc6ed78654fa4ac377f46076d9d1f32e0fcc99d6
Author: Andreas Metzler <ametz...@bebt.de>
Date: Sun Dec 27 15:46:21 2015 +0100
debian: 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.
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
http://repo.or.cz/wmaker-crm.git/commit/c11b08d42b7233a1df8a6d19211bcc9f48b68c6f
commit c11b08d42b7233a1df8a6d19211bcc9f48b68c6f
Author: Andreas Metzler <ametz...@bebt.de>
Date: Sun Dec 27 15:28:39 2015 +0100
debian: Fix typo occured. (Thanks, lintian.)
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
http://repo.or.cz/wmaker-crm.git/commit/f7e1f5d5f4f2fe65b7ffb186b57f3a8e6fad6502
commit f7e1f5d5f4f2fe65b7ffb186b57f3a8e6fad6502
Author: Andreas Metzler <ametz...@bebt.de>
Date: Sun Dec 27 15:24:48 2015 +0100
debian: Simplify debian/rules.
Use dh_auto_configure, especially for handling dpkg-buildflags.
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
http://repo.or.cz/wmaker-crm.git/commit/4660e5b1eb90698cee192ac9deae298286942170
commit 4660e5b1eb90698cee192ac9deae298286942170
Author: Andreas Metzler <ametz...@bebt.de>
Date: Sun Dec 27 14:48:54 2015 +0100
debian: Use dh_autoreconf.
Use dh_autoreconf instead of invoking autogen.sh in the configure
target.
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)
http://repo.or.cz/wmaker-crm.git/commit/f58cf6a8cd2f0cb905dfedc1cf5f363173f496e2
commit f58cf6a8cd2f0cb905dfedc1cf5f363173f496e2
Author: Andreas Metzler <ametz...@bebt.de>
Date: Sun Dec 27 14:36:11 2015 +0100
debian: 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.
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
-----------------------------------------------------------------------
Summary of changes:
debian/README.Debian | 4 ++--
debian/changelog | 10 ++++++++++
debian/control | 2 +-
debian/patches/56_ignore_runstatedir.diff | 16 ++++++++++++++++
debian/patches/series | 1 +
debian/rules | 20 +++++---------------
debian/wmaker.postinst | 2 +-
7 files changed, 36 insertions(+), 19 deletions(-)
create mode 100644 debian/patches/56_ignore_runstatedir.diff
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
