update 'debian/'-files to new upload

4 files changed, 63 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 875f030..4b37b71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-ratpoison (1.4.1~CVS) UNRELEASED; urgency=low
+ratpoison (1.4.2~CVS-0) UNRELEASED; urgency=low
 
+ -- Bernhard R. Link <brlink@debian.org>  Tue, 20 Dec 2006 20:23:00 +0100
+
+ratpoison (1.4.1-1) experimental; urgency=low
+
+  * new upstream version
   * re-add doc-base file listing info document.
   * update brl-menu.diff to current cvs.
-  * drop build-dependency to texinfo
+  * drop texinfo build-dependency, update x-dev dependency
 
- -- Bernhard R. Link <brlink@debian.org>  Tue, 21 Nov 2006 12:36:00 +0100
+ -- Bernhard R. Link <brlink@debian.org>  Tue, 20 Dec 2006 20:23:00 +0100
 
 ratpoison (1.4.1~CVS20061026-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index eff8850..b6efcda 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ratpoison
 Section: x11
 Priority: extra
 Maintainer: Bernhard R. Link <brlink@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, x-dev, libxinerama-dev | xlibs-static-dev (<< 1:7.0), libxtst-dev, libreadline5-dev | libreadline4-dev
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxext-dev, x11proto-core-dev | x-dev, libxinerama-dev | xlibs-static-dev (<< 1:7.0), libxtst-dev, libreadline5-dev | libreadline4-dev
 Standards-Version: 3.7.2
 
 Package: ratpoison
diff --git a/debian/copyright b/debian/copyright
index 3e8adae..8098e76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,58 @@
-This package was debianized by Gergely Nagy <algernon@debian.org>
+This package was debianized by Bernhard R. Link <brlink@debian.org> on
+Sat, 20 May 2006 13:45:34 +0200.
 
-It was downloaded from
-	ftp://ratpoison.sourceforge.net/pub/ratpoison/
+It was downloaded from http://savannah.nongnu.org/download/ratpoison/
 
-Upstream Authors: Shawn Betts <sabetts@users.sourceforge.net>
-		  Ryan Yeske <rcyeske@vcn.bc.ca>
+Upstream Authors:
 
-Copyright:
+Shawn Betts (sabetts@users.sourceforge.net)
+Ryan Yeske (rcyeske@vcn.bc.ca)
 
-ratpoison is covered by the GNU GPL v2. The complete text can be found in
-/usr/share/common-licenses/GPL
+Other Contributors:
 
-Modifications for Debian are also covered by the GNU GPL.
+Ben Leslie <benno at sesgroup dot net>
+Chr. v. Stuckrad <stucki at math dot fu-berlin dot de>
+Dan Aloni <da-x at gmx dot net>
+Doug Kearns <djkea2 at mugc dot its dot monash dot edu dot au>
+Gergely Nagy <algernon at debian dot org>
+Henrik Enberg <henrik at enberg dot org>
+Jonathan Walther <krooger at debian dot org>
+Martin Samuelsson <rp-contrib at cos dot user dot lysator dot liu dot se>
+Mike Meyer <mwm at mired dot org>
+Nicklas Lindgren <nili at lysator dot liu dot se>
+Pasi Kallinen <pkalli at cs dot joensuu dot fi>
+Rupert <rupert dot debian at hotpop dot com>
+Tim Goodwin <tjg at star dot le dot ac dot uk>
+Joshua Neuheisel <jneuheisel at msn dot com>
+Thien-Thi Nguyen <ttn at surf dot glug dot org>
+Joshua Neuheisel <jneuheisel at msn dot com>
+Sylvain BEUCLER <beuc at beuc dot net>
+Cameron Patrick <cameron at patrick dot wattle dot id dot au>
+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>
+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:
+ 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)
+ any later version.
+
+ ratpoison is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this software; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ 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'.
diff --git a/debian/rules b/debian/rules
index 85b35a1..0e7aec7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,7 +106,7 @@ binary-arch: build install
 	dh_md5sums
 	dh_builddeb
 
-RATPOISON_VERSION=1.4.0
+RATPOISON_VERSION=1.4.1
 RATPOISON_CVSVERSION=1.4.1~CVS$(shell date +%Y%m%d)
 RATPOISON_UVERSION=1.4.1-CVS