xfonts-nexus (0.0.2-16) debian-dir only changes

Summary

 debian/changelog             |   96 +++++++++++++++++++++++++++++++++++++++++++
 debian/compat                |    2 
 debian/control               |   11 +++-
 debian/copyright             |   29 +++++++++++-
 debian/rules                 |    8 ++-
 debian/xfonts-nexus.dirs     |    2 
 debian/xfonts-nexus.files    |    2 
 debian/xfonts-nexus.postinst |    5 --
 debian/xfonts-nexus.postrm   |    5 --
 9 files changed, 139 insertions(+), 21 deletions(-)

    
download this patch

Patch contents

--- xfonts-nexus-0.0.2.orig/debian/changelog
+++ xfonts-nexus-0.0.2/debian/changelog
@@ -1,3 +1,99 @@
+xfonts-nexus (0.0.2-16) unstable; urgency=low
+
+  * Remove spurious commands from postinst and postrm,
+    dh_installxfonts adds everything that is needed.
+    (closes: #591864)
+  * Include license directly in copyright file
+    See: http://lintian.debian.org/tags/copyright-refers-to-deprecated-bsd-license-file.html
+  * Update standards version from 3.8.4 to 3.9.1
+
+ -- Simon Horman <horms@debian.org>  Fri, 06 Aug 2010 11:52:20 +0900
+
+xfonts-nexus (0.0.2-15) unstable; urgency=low
+
+  * Replace build-indep dependency on obsolte xutils package with
+    a build-indep dependency on xfonts-utils: (closes: #579029)
+  * Update standards version from 3.7.3 to 3.8.4
+  * debhelper should be a build dependency rather than a build-indep
+    dependency as it is needed by the clean target.
+    http://lintian.debian.org/tags/clean-should-be-satisfied-by-build-depends.html
+  * Include copyright notice in copyright file
+    http://lintian.debian.org/tags/copyright-without-copyright-notice.html
+  * Update download information in copyright file
+  * Run commands in binary-indep rather than binary-arch
+    as package is architecture independent
+    http://lintian.debian.org/tags/binary-arch-rules-but-pkg-is-arch-indep.html
+  * Update debhelper compatibility level from 4 to 6
+    http://lintian.debian.org/tags/package-uses-deprecated-debhelper-compat-version.html
+  * Install fonts into /usr/share/fonts/X11
+    instead of /usr/X11R6/lib/X11/fonts/
+    http://lintian.debian.org/tags/package-installs-file-to-usr-x11r6.html
+  * Don't ignore errors in postrm and postinst scripts
+    http://lintian.debian.org/maintainer-script-ignores-errors.html
+
+ -- Simon Horman <horms@debian.org>  Fri, 30 Apr 2010 15:33:40 +0900
+
+xfonts-nexus (0.0.2-14) unstable; urgency=low
+
+  * Update standards version from 3.6.2 to 3.7.3
+  * Remove ancient transitional package xfont-nexus (closes: #477546)
+
+ -- Simon Horman <horms@debian.org>  Thu, 24 Apr 2008 11:30:40 +1000
+
+xfonts-nexus (0.0.2-13) unstable; urgency=low
+
+  * Removed uneeded postrm and postinst
+    (Also, moving to the 13th floor the week after next)
+
+ -- Simon Horman <horms@debian.org>  Thu,  4 May 2006 09:41:02 +0900
+
+xfonts-nexus (0.0.2-12) unstable; urgency=low
+
+  * Resolved problem with paths in invocation of mkfontdir in postinst
+    (closes: #362969)
+  * Remove unneeded debian/xfonts-nexus.conffiles that crept in
+    at some stage
+  * Removed unneded debian/xfonts-nexus.dirs
+
+ -- Simon Horman <horms@debian.org>  Mon, 17 Apr 2006 11:00:29 +0900
+
+xfonts-nexus (0.0.2-11) unstable; urgency=low
+
+  * Place fonts in /usr/share/fonts/X11 instead of /usr/X11R6/lib/X11/fonts
+    - Modify top-level makefile to allow the font and alias directory
+      to be specified at build-time
+    - Update versioned build-dependancy on debhelper from 4.0.0 to 5.0.29
+    - Depend on the new xfonts-utils package
+      + Call dh_installxfonts
+      + depend on ${misc:Depend}
+    (closes: #362393)
+  * Remove seeminly unneeded dependancy on xbase-clients
+  * Add /etc/X11/fonts/misc/nex6x10.alias to conffiles, as its in /etc
+
+ -- Simon Horman <horms@debian.org>  Fri, 14 Apr 2006 09:53:05 +0900
+
+xfonts-nexus (0.0.2-10) unstable; urgency=low
+
+  * Yet another take at getting rid of xfont-nexus:
+    Create a transitional packagae built by this source.
+    That is a package which contains no files and depends on xfonts-nexus.
+    Then make xfonts-nexus provide and replace xfont-nexus,
+    but not conflict with it.
+    (closes: #341025)
+  * Update to standards version 3.6.2
+  * Add versioned dependancy on utils (>> 4.0.3) as per
+    policy manual 11.8.5
+
+ -- Simon Horman <horms@debian.org>  Tue, 14 Feb 2006 11:41:57 +0900
+
+xfonts-nexus (0.0.2-9) unstable; urgency=low
+
+  * Add Replaces, Conflicts and Provides xfont-nexus as per
+    section 7.5.2 of the policy manual.
+    (closes: Bug#270892)
+
+ -- Simon Horman <horms@debian.org>  Fri, 10 Sep 2004 11:03:14 +0900
+
 xfonts-nexus (0.0.2-8) unstable; urgency=low
 
   * Re-releasing 0.0.2-7.1 as the maintainer. Thanks Andreas.
--- xfonts-nexus-0.0.2.orig/debian/xfonts-nexus.postrm
+++ xfonts-nexus-0.0.2/debian/xfonts-nexus.postrm
@@ -2,10 +2,7 @@
 
 #DEBHELPER#
 
-if test -d /usr/X11R6/lib/X11/fonts/misc; then
-	( cd /usr/X11R6/lib/X11/fonts/misc ; /usr/X11R6/bin/mkfontdir )
-	update-fonts-alias misc
-fi
+set -e
 
 exit 0
 
--- xfonts-nexus-0.0.2.orig/debian/xfonts-nexus.files
+++ xfonts-nexus-0.0.2/debian/xfonts-nexus.files
@@ -1,2 +1,2 @@
-usr/X11R6/lib/X11/fonts/misc/nex6x10.pcf.gz
+usr/share/fonts/X11/misc/nex6x10.pcf.gz
 /etc/X11/fonts/misc/nex6x10.alias
--- xfonts-nexus-0.0.2.orig/debian/control
+++ xfonts-nexus-0.0.2/debian/control
@@ -1,13 +1,18 @@
 Source: xfonts-nexus
-Build-Depends-Indep: xutils, debhelper (>= 4.0.0)
+Build-Depends-Indep: xfonts-utils
+Build-Depends: debhelper (>= 6)
 Section: x11
 Priority: optional
 Maintainer: Simon Horman <horms@debian.org>
-Standards-Version: 3.6.1
+Standards-Version: 3.9.1
 
 Package: xfonts-nexus
 Architecture: all
-Depends: xbase-clients
+Depends: ${misc:Depends}
+Provides: xfont-nexus
+Replaces: xfont-nexus
 Description: Nexus font for X
  A sans-serif, fixed with font with iso8859 encoding.
  Only available as 10 point with medium weight.
+
+
--- xfonts-nexus-0.0.2.orig/debian/compat
+++ xfonts-nexus-0.0.2/debian/compat
@@ -1 +1 @@
-4
+6
--- xfonts-nexus-0.0.2.orig/debian/xfonts-nexus.dirs
+++ xfonts-nexus-0.0.2/debian/xfonts-nexus.dirs
@@ -1,2 +1,2 @@
-usr/X11R6/lib/X11/fonts/misc
+usr/share/fonts/X11/misc
 
--- xfonts-nexus-0.0.2.orig/debian/xfonts-nexus.postinst
+++ xfonts-nexus-0.0.2/debian/xfonts-nexus.postinst
@@ -2,10 +2,7 @@
 
 #DEBHELPER#
 
-if [ "$1" = "configure" ]; then
-    ( cd /usr/X11R6/lib/X11/fonts/misc ; /usr/X11R6/bin/mkfontdir )
-    update-fonts-alias misc
-fi
+set -e
 
 exit 0
 
--- xfonts-nexus-0.0.2.orig/debian/rules
+++ xfonts-nexus-0.0.2/debian/rules
@@ -22,17 +22,17 @@
 	dh_clean -k
 	dh_installdirs
 
-	DESTDIR="$(pwd)/debian/tmp" make install
+	DESTDIR="$(pwd)/debian/tmp" FONTDIR="/usr/share/fonts/X11/misc" \
+		ALIASDIR="/etc/X11/fonts/misc" make install
 
 	dh_movefiles --source=debian/tmp
 
 binary-indep: build install
-
-binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
 	dh_installchangelogs
+	dh_installxfonts
 	dh_link
 	dh_strip
 	dh_compress
@@ -44,5 +44,7 @@
 	dh_md5sums
 	dh_builddeb
 
+binary-arch: build install
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
--- xfonts-nexus-0.0.2.orig/debian/copyright
+++ xfonts-nexus-0.0.2/debian/copyright
@@ -1,6 +1,7 @@
 nexus
 Font for X
 
+Copyright 1995-2001
 Raster: <raster@rasterman.com>
        aka. Carsten Haitzler
 Jonathan Perkin: <sketch@rd.bbc.co.uk>
@@ -11,9 +12,29 @@
 
 This font is released under the terms of the BSD licence.
 
-The full text of this licence can be found in the file
-/usr/share/common-licenses/BSD
+Copyright (c) The Regents of the University of California.
+All rights reserved.
 
-This package is available by FTP from:
-ftp://ftp.vergenet.net/pub/nexus/
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
 
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.