update debian/ directory for 1.4.5-1

6 files changed, 50 insertions, 6 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..dadfd37
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,21 @@
+This Debian package uses the tar files upstream releases
+and applies some patches on top. Those patches are already
+applied in the Debian source package, so if you unpackaged
+the Debian source package, you can just modify what you want
+and build and ignore everything less.
+
+If you want to package a new upstream release:
+----------------------------------------------
+
+Just decide which patches from debian/patches you want to
+apply and build the package.
+
+
+If you want to build a package from git:
+----------------------------------------
+
+If you want to build from git, you might also want to apply
+some of the patches. Additionally you either need to increase the
+build dependencies (or ignore that your package has not enough)
+or generate an .orig.tar file with all the needed files processes.
+(This usually happens by calling make dist).
diff --git a/debian/changelog b/debian/changelog
index fc70b87..2cce1b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ratpoison (1.4.5-1) unstable; urgency=low
+
+  * new upstream version
+  - non-interactive exec no longer adds to history (Closes: 478977)
+  - fix fgcolor/bgcolor broken by libXft (Closes: 526174)
+  * make bash-features using sh-script a bash-script (Closes: 530176)
+  * manually remove info/dir.gz, as Debian now uses gnu install-info
+
+ -- Bernhard R. Link <brlink@debian.org>  Tue, 14 Jul 2009 15:40:00 +0200
+
 ratpoison (1.4.4-1) unstable; urgency=low
 
   * new upstream version
diff --git a/debian/control b/debian/control
index 6b2fad5..0ddcd0d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: extra
 Maintainer: Bernhard R. Link <brlink@debian.org>
 Build-Depends: debhelper (>= 5), libx11-dev, libxext-dev, x11proto-core-dev, libxinerama-dev, libxtst-dev, libxft-dev, perl
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 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
diff --git a/debian/patches/530176.diff b/debian/patches/530176.diff
new file mode 100644
index 0000000..a386ab9
--- /dev/null
+++ b/debian/patches/530176.diff
@@ -0,0 +1,10 @@
+Index: ratpoison-1.4.5/contrib/rpshowall.sh
+===================================================================
+--- ratpoison-1.4.5.orig/contrib/rpshowall.sh	2009-07-14 15:10:18.000000000 +0200
++++ ratpoison-1.4.5/contrib/rpshowall.sh	2009-07-14 15:10:25.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ # rpshowall
+ # ratpoison script to show all open windows
diff --git a/debian/patches/series b/debian/patches/_series
index 13e40f1..964105e 100644
--- a/debian/patches/series
+++ b/debian/patches/_series
@@ -1,3 +1,4 @@
 brl-enlarge.diff
 brl-menu.diff
 brl-menu.reconf
+530176.diff
diff --git a/debian/rules b/debian/rules
index 76a731a..2c166bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,10 +37,6 @@ endif
 
 config.status: configure
 	dh_testdir
-	if grep 'install-info --version | fgrep' doc/Makefile.in ; then \
-		echo "incompatible install-info call in doc/Makefile.in!" >&2 ;\
-		exit 1 ; \
-	fi
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	    --prefix=/usr \
 	    --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
@@ -95,6 +91,8 @@ binary-arch: build-arch-stamp
 	dh_installdirs
 
 	$(MAKE) install pkgdatadir=/usr/share/doc/ratpoison/examples DESTDIR=$(CURDIR)/debian/ratpoison
+	# since Debian uses gnu install-info, this seems to need manual removing...
+	find debian/ratpoison -name "dir" -print -delete
 	# Those are installed to different places already by dh_*
 	rm debian/ratpoison/usr/share/doc/ratpoison/COPYING
 	rm debian/ratpoison/usr/share/doc/ratpoison/ChangeLog
@@ -113,6 +111,7 @@ binary-arch: build-arch-stamp
 	dh_link
 	dh_strip
 	dh_compress
+	find debian/ratpoison -name "dir.gz" -print -delete
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
@@ -120,7 +119,7 @@ binary-arch: build-arch-stamp
 	dh_md5sums
 	dh_builddeb
 
-RATPOISON_VERSION=1.4.3
+RATPOISON_VERSION=1.4.5
 
 # some helpers for me
 # just ignore those if you want to do a NMU or a security upload, change the files outside
@@ -130,7 +129,10 @@ maintainer-clean:
 	quilt refresh
 	quilt push -a || true
 	rm -f .pc patches
+	mv debian/patches/series debian/patches/_series
+
 maintainer-unclean:
+	mv debian/patches/_series debian/patches/series
 	ln -s "../pc-ratpoison-$(RATPOISON_VERSION)" .pc
 	ln -s debian/patches patches
 	quilt push -a