diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rw-r--r-- | debian/copyright | 6 | ||||
| -rw-r--r-- | debian/patches/brl-menu.reconf | 18 | ||||
| -rw-r--r-- | debian/patches/manpage.diff | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 73 | ||||
| -rw-r--r-- | doc/ratpoison.1 | 4 |
11 files changed, 91 insertions, 79 deletions
diff --git a/Makefile.am b/Makefile.am index a368274..ac23ebc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,14 +37,6 @@ EXTRA_DIST = $(doc_DATA) dist-hook: chmod -R go-w $(distdir) -bin-dist strip-bin-dist: all - -rm -rf $(PACKAGE)-$(VERSION).bin.$(host_triplet) - $(MAKE) $(subst strip-,-strip,install$(subst bin-dist,,$@)) \ - prefix=`pwd`/$(PACKAGE)-$(VERSION).bin.$(host_triplet)/$(prefix) - $(TAR) chof - $(PACKAGE)-$(VERSION).bin.$(host_triplet) \ - | GZIP=$(GZIP_ENV) gzip -c > $(PACKAGE)-$(VERSION).bin.$(host_triplet).tar.gz - -rm -rf $(PACKAGE)-$(VERSION).bin.$(host_triplet) - sense: @echo 42 diff --git a/configure.in b/configure.in index 97c8df1..0af99b7 100644 --- a/configure.in +++ b/configure.in @@ -26,9 +26,6 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(src/config.h) -AC_CANONICAL_HOST -AC_SUBST(host_os) - dnl by default turn off debugging AC_MSG_CHECKING(whether to enable debugging) AC_ARG_ENABLE(debug, diff --git a/debian/changelog b/debian/changelog index 21ccb9f..bba679c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +ratpoison (1.4.3-1) unstable; urgency=low + + * new upstream version + * fix warning in manpage parsing + + -- Bernhard R. Link <brlink@debian.org> Thu, 21 Feb 2008 14:34:20 +0100 + +ratpoison (1.4.2-2) unstable; urgency=low + + * increase standards-version to 3.7.3 + * recode debian/copyright to utf-8 + * add Homepage and Vcs headers + * clean up debian/rules a bit + * don't link against libXext + + -- Bernhard R. Link <brlink@debian.org> Sun, 30 Dec 2007 15:01:18 +0100 + ratpoison (1.4.2-1) unstable; urgency=low * new upstream version diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index a7a2339..74ca1b1 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,11 @@ Source: ratpoison Section: x11 Priority: extra Maintainer: Bernhard R. Link <brlink@debian.org> -Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, x11proto-core-dev, libxinerama-dev, libxtst-dev, libreadline5-dev, perl -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, x11proto-core-dev, libxinerama-dev, libxtst-dev, libreadline5-dev, perl, autotools-dev +Standards-Version: 3.7.3 +Homepage: http://www.nongnu.org/ratpoison/ +Vcs-Browser: http://git.savannah.nongnu.org/gitweb/?p=ratpoison.git +Vcs-Git: git://git.savannah.nongnu.org/ratpoison.git Package: ratpoison Architecture: any @@ -23,5 +26,3 @@ Description: keyboard-only window manager All interaction with the window manager is done through keystrokes. ratpoison has a prefix map to minimize key clobbering. - . - Homepage: http://www.nongnu.org/ratpoison diff --git a/debian/copyright b/debian/copyright index 8098e76..44b86c7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -32,13 +32,15 @@ Trent Buck <fubarbaz at bigpond dot com> jesus c. meyendriesch <jesus at qplay dot org> Bernhard R. Link <brlink at debian dot org> Tobias C. Rittweiler <tcr at freebits dot de> -Antti Nykänen <aon at iki dot fi> +Antti Nykänen <aon at iki dot fi> rubikitch <rubikitch at ruby-lang org> Florian E.J. Fruth <fejf at rommel stw uni-erlangen de> Tim Cooijmans <tim at aapopfiets nl> Andreas Seltenreich <uwi7 at rz uni-karlsruhe de> License: + Copyright (C) 2000, 2001, 2002, 2003, 2004 Shawn Betts <sabetts@vcn.bc.ca> + ratpoison is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) @@ -55,4 +57,4 @@ License: MA 02110-1301, USA. On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/patches/brl-menu.reconf b/debian/patches/brl-menu.reconf index 83535d5..751dbd3 100644 --- a/debian/patches/brl-menu.reconf +++ b/debian/patches/brl-menu.reconf @@ -1,8 +1,8 @@ -Index: ratpoison-1.4.2/configure +Index: ratpoison-1.4.3/configure =================================================================== ---- ratpoison-1.4.2.orig/configure 2007-10-07 11:28:27.000000000 +0200 -+++ ratpoison-1.4.2/configure 2007-10-07 11:28:32.000000000 +0200 -@@ -864,6 +864,7 @@ +--- ratpoison-1.4.3.orig/configure 2008-02-20 18:14:22.000000000 +0100 ++++ ratpoison-1.4.3/configure 2008-02-20 18:24:32.000000000 +0100 +@@ -1312,6 +1312,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-xterm=PROG set the x terminal emulator used by ratpoison @@ -10,7 +10,7 @@ Index: ratpoison-1.4.2/configure --with-x use the X Window System Some influential environment variables: -@@ -1872,6 +1873,27 @@ +@@ -2379,6 +2380,27 @@ _ACEOF @@ -38,11 +38,11 @@ Index: ratpoison-1.4.2/configure if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -Index: ratpoison-1.4.2/src/config.h.in +Index: ratpoison-1.4.3/src/config.h.in =================================================================== ---- ratpoison-1.4.2.orig/src/config.h.in 2007-10-07 11:28:27.000000000 +0200 -+++ ratpoison-1.4.2/src/config.h.in 2007-10-07 11:28:32.000000000 +0200 -@@ -72,6 +72,9 @@ +--- ratpoison-1.4.3.orig/src/config.h.in 2008-02-20 18:14:22.000000000 +0100 ++++ ratpoison-1.4.3/src/config.h.in 2008-02-20 18:24:32.000000000 +0100 +@@ -78,6 +78,9 @@ /* Define to 1 if you have the <X11/extensions/Xinerama.h> header file. */ #undef HAVE_X11_EXTENSIONS_XINERAMA_H diff --git a/debian/patches/manpage.diff b/debian/patches/manpage.diff new file mode 100644 index 0000000..d41bf32 --- /dev/null +++ b/debian/patches/manpage.diff @@ -0,0 +1,29 @@ +Index: ratpoison-1.4.3/doc/ratpoison.1 +=================================================================== +--- ratpoison-1.4.3.orig/doc/ratpoison.1 2008-02-21 14:34:02.000000000 +0100 ++++ ratpoison-1.4.3/doc/ratpoison.1 2008-02-21 14:58:37.000000000 +0100 +@@ -429,7 +429,6 @@ + .cmd msgwait [ seconds ] + Set the duration the message window is shown. + If \fIseconds\fP is zero, wait infinitely. +-.# This will hopefully be changed to set msgwait some day... + .cmd newkmap keymap + Generate a new keymap names \fIkeymap\fP. This keymap can + be used to add new key\-command mapping to it with \fBdefinekey\fP +@@ -555,7 +554,6 @@ + + Default is all allowed i.e.\& 15. + +-.#This will hopefully change to set rudeness and names instead of numbers one day. + .cmd sdump + Output the list of all screens. + The screens are separated by commas. Each screen is shown as 6 values: +@@ -686,7 +684,7 @@ + .br + %W by the unit to resize the window horizontally (width_inc) + .br +-.%x by the xine screen number ++%x by the xine screen number + and + .br + %% by a single % diff --git a/debian/patches/series b/debian/patches/series index ebfdaf9..f8003c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ brl-enlarge.diff -p0 brl-menu.diff brl-menu.reconf +manpage.diff diff --git a/debian/rules b/debian/rules index 17a6fa3..e3c91f5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -9,7 +8,6 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -29,6 +27,12 @@ config.status: configure echo "incompatible install-info call in doc/Makefile.in!" >&2 ;\ exit 1 ; \ fi +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp /usr/share/misc/config.guess config.guess +endif ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ @@ -37,6 +41,11 @@ config.status: configure $(DEPENDENCIES) \ --x-includes="" --x-libraries="" \ CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,syms" + # libXext is not needed for dynamic linking: + sed -i -e '/^LIBS =/s/-lXext //' src/Makefile +# do not delete config.status if above rule failed, +# as that might hide other left over files that need cleaning +.PRECIOUS: config.status build-arch: build-arch-stamp build-arch-stamp: config.status @@ -60,21 +69,18 @@ clean: rm -f build-arch-stamp build-indep-stamp if [ -e config.status ] ; then $(MAKE) distclean ; fi + ! test -f config.log -rm -f contrib/Ratpoison.pm contrib/ratpoison-cmd.el contrib/ratpoison.lisp contrib/ratpoison.py contrib/ratpoison.rb -rm -f rpws.1 -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess -endif + -rm -f config.sub config.guess dh_clean -install: install-arch install-indep - -install-indep: build-indep +# Build architecture-independent files +binary-indep: build-indep-stamp +# We have nothing to do -install-arch: build-arch +# Build architecture-dependent files +binary-arch: build-arch-stamp dh_testdir dh_testroot dh_clean -k @@ -82,21 +88,12 @@ install-arch: build-arch $(MAKE) install pkgdatadir=/usr/share/doc/ratpoison/examples DESTDIR=$(CURDIR)/debian/ratpoison # Those are installed to different places already by dh_* - rm $(CURDIR)/debian/ratpoison/usr/share/doc/ratpoison/COPYING - rm $(CURDIR)/debian/ratpoison/usr/share/doc/ratpoison/ChangeLog + rm debian/ratpoison/usr/share/doc/ratpoison/COPYING + rm debian/ratpoison/usr/share/doc/ratpoison/ChangeLog # not needed two times: - rm $(CURDIR)/debian/ratpoison/usr/share/doc/ratpoison/examples/rpws + rm debian/ratpoison/usr/share/doc/ratpoison/examples/rpws # The menu command: - install -D -m 0755 debian/callmenu.sh $(CURDIR)/debian/ratpoison/etc/X11/ratpoison/ratpoisonmenu - -# Build architecture-independent files here. -binary-indep: build-indep install-indep -# We have nothing to do - -# Build architecture-dependent files here. -binary-arch: build-arch install-arch - dh_testdir - dh_testroot + install -D -m 0755 debian/callmenu.sh debian/ratpoison/etc/X11/ratpoison/ratpoisonmenu dh_install dh_installchangelogs ChangeLog dh_installdocs @@ -115,9 +112,7 @@ binary-arch: build-arch install-arch dh_md5sums dh_builddeb -RATPOISON_VERSION=1.4.2 -RATPOISON_CVSVERSION=1.4.1~CVS$(shell date +%Y%m%d) -RATPOISON_UVERSION=1.4.2-CVS +RATPOISON_VERSION=1.4.3 # some helpers for me # just ignore those if you want to do a NMU or a security upload, change the files outside @@ -131,26 +126,6 @@ maintainer-unclean: ln -s "../pc-ratpoison-$(RATPOISON_VERSION)" .pc ln -s debian/patches patches quilt push -a -maintainer-ready: - test ! -d "../ratpoison-$(RATPOISON_VERSION)" - test ! -d "../pc-ratpoison-$(RATPOISON_VERSION)" - rm -rf "ratpoison-$(RATPOISON_UVERSION)" - tar -xzf "../ratpoison_$(RATPOISON_VERSION).orig.tar.gz" - mv "ratpoison-$(RATPOISON_UVERSION)" "../ratpoison-$(RATPOISON_VERSION)" - cp -a debian "../ratpoison-$(RATPOISON_VERSION)/" - rm -rf "../ratpoison-$(RATPOISON_VERSION)/debian/CVS" - rm -rf "../ratpoison-$(RATPOISON_VERSION)/debian/patches/CVS" - mkdir "../pc-ratpoison-$(RATPOISON_VERSION)" - ln -s "../pc-ratpoison-$(RATPOISON_VERSION)" "../ratpoison-$(RATPOISON_VERSION)/.pc" - ln -s debian/patches "../ratpoison-$(RATPOISON_VERSION)/patches" - cd "../ratpoison-$(RATPOISON_VERSION)" && quilt upgrade && quilt push -a -maintainer-cvs: - make dist - mv "ratpoison-$(RATPOISON_UVERSION).tar.gz" "../ratpoison_$(RATPOISON_CVSVERSION).orig.tar.gz" - ./debian/rules maintainer-ready RATPOISON_VERSION="$(RATPOISON_CVSVERSION)" - cd "../ratpoison-$(RATPOISON_CVSVERSION)" && ./debian/rules maintainer-clean - cd "../ratpoison-$(RATPOISON_CVSVERSION)" && dch -v "$(RATPOISON_CVSVERSION)-0" -D "LOCAL" - binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install get-orig-source make-orig-source-working +.PHONY: build-arch build-indep build clean binary-indep binary-arch binary maintainer-clean maintainer-unclean diff --git a/doc/ratpoison.1 b/doc/ratpoison.1 index 3d83fb1..96549e8 100644 --- a/doc/ratpoison.1 +++ b/doc/ratpoison.1 @@ -429,7 +429,6 @@ is considered a security hole. xterm is one such application. .cmd msgwait [ seconds ] Set the duration the message window is shown. If \fIseconds\fP is zero, wait infinitely. -.# This will hopefully be changed to set msgwait some day... .cmd newkmap keymap Generate a new keymap names \fIkeymap\fP. This keymap can be used to add new key\-command mapping to it with \fBdefinekey\fP @@ -543,7 +542,6 @@ Show or set what kind of windows are allowed to jostle into the foreground. Default is all allowed i.e.\& 15. -.#This will hopefully change to set rudeness and names instead of numbers one day. .cmd sdump Output the list of all screens. The screens are separated by commas. Each screen is shown as 6 values: @@ -674,7 +672,7 @@ The following substitutions happen in format: .br %W by the unit to resize the window horizontally (width_inc) .br -.%x by the xine screen number +%x by the xine screen number and .br %% by a single % |