diff -u nedit-5.5/debian/changelog nedit-5.5/debian/changelog --- nedit-5.5/debian/changelog +++ nedit-5.5/debian/changelog @@ -1,3 +1,37 @@ +nedit (1:5.5-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #299318): + - Added build-dep to libxext-dev and libxp-dev. + * debian/control: Replaced lesstif2 with libmotif-dev, because with Ubuntu's + new lesstif2 version nedit doesn't work + + -- Nick Ellery Sun, 16 Nov 2008 11:05:43 +0000 + +nedit (1:5.5-3) unstable; urgency=low + + * QA upload + * Trigger relinking by uploading (Closes: 431973) + * Standards-Version changed to 3.8.0 (necessary changes included below) + * Added debian/watch file + * Changed build-dependency x-dev (obsolete) to x11proto-core-dev + * Changed build-dependency debhelper to > 5 + * Added debian/compat level 5 + * Removed DH_COMPAT line from debian/rules (handeled by debian/compat) + * Added -Wall to CFLAGS in debian/rules to match debian-policy 10.1 + * Changed maintainers to QA and removed uploaders (package is orhaned, see + bug #499316) + * Added homepage to debian/control + * Fixed doc-base-invalid-document-field lintian error by converting capitals + in docid + * Fixed doc-base-uses-applications-section lintian warning by removing + unneeded "Apps/" part + * Converted debian/copyright to UTF-8 + * Fixed menu-item-uses-apps-section lintian warning by replacing Apps by + Applications in section field + * Escaped 3 hyphens in doc/nc.man + + -- Paul Gevers Sat, 15 Nov 2008 14:04:40 -0600 + nedit (1:5.5-2ubuntu3) feisty; urgency=low * Added build-dep libxext-dev to fix FTBFS. Again. diff -u nedit-5.5/debian/control nedit-5.5/debian/control --- nedit-5.5/debian/control +++ nedit-5.5/debian/control @@ -3,9 +3,9 @@ Priority: optional XSBC-Original-Maintainer: Alexandre Pineau Maintainer: Ubuntu MOTU Developers -Build-Depends: debhelper (>= 4.1.26), libmotif-dev, libx11-dev, libxt-dev, x-dev, bison, x11proto-print-dev, libxp-dev, libxext-dev -Uploaders: Thorsten Haude -Standards-Version: 3.6.2.2 +Build-Depends: debhelper (>= 5), libmotif-dev, libx11-dev, libxt-dev, x11proto-core-dev, bison, libxp-dev, libxext-dev +Homepage: http://www.nedit.org/ +Standards-Version: 3.8.0 Package: nedit Architecture: any diff -u nedit-5.5/debian/menu nedit-5.5/debian/menu --- nedit-5.5/debian/menu +++ nedit-5.5/debian/menu @@ -1,3 +1,3 @@ -?package(nedit): needs="X11" section="Apps/Editors" command="nedit" \ +?package(nedit): needs="X11" section="Applications/Editors" command="nedit" \ title="NEdit" longtitle="Flexible editor for X11" \ icon="/usr/share/pixmaps/Nedit.xpm" diff -u nedit-5.5/debian/copyright nedit-5.5/debian/copyright --- nedit-5.5/debian/copyright +++ nedit-5.5/debian/copyright @@ -10,7 +10,7 @@ Upstream authors: NEdit was written by Mark Edel, Joy Kyriakopulos, Christopher Conrad, Jim Clark, Arnulfo Zepeda-Navratil, Suresh Ravoor, Tony Balinski, Max -Vohlken, Yunliang Yu, Donna Reid, Arne Førlie, Eddy De Greef, Steve +Vohlken, Yunliang Yu, Donna Reid, Arne Førlie, Eddy De Greef, Steve LoBasso, Alexander Mai, Scott Tringali, Thorsten Haude, and Steve Haehn. For more detailed informations about the authors of Nedit and its diff -u nedit-5.5/debian/rules nedit-5.5/debian/rules --- nedit-5.5/debian/rules +++ nedit-5.5/debian/rules @@ -1,15 +1,12 @@ #!/usr/bin/make -f -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - # define installation dir export INSTALLDIR=$(shell pwd)/debian/nedit DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -g +CFLAGS = -g -Wall ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else diff -u nedit-5.5/debian/nedit.doc-base nedit-5.5/debian/nedit.doc-base --- nedit-5.5/debian/nedit.doc-base +++ nedit-5.5/debian/nedit.doc-base @@ -1,8 +1,8 @@ -Document: NEdit +Document: nedit Title: NEdit User's Manual Author: The NEdit developers Abstract: This document describes the use of NEdit. -Section: Apps/Editors +Section: Editors Format: HTML Index: /usr/share/doc/nedit/html/nedit.html only in patch2: unchanged: --- nedit-5.5.orig/debian/compat +++ nedit-5.5/debian/compat @@ -0,0 +1 @@ +5 only in patch2: unchanged: --- nedit-5.5.orig/debian/watch +++ nedit-5.5/debian/watch @@ -0,0 +1,6 @@ +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://sf.net/nedit/nedit-([\d.]*)-src\.tar\.gz only in patch2: unchanged: --- nedit-5.5.orig/doc/nc.man +++ nedit-5.5/doc/nc.man @@ -148,7 +148,7 @@ explicitly by running NEdit in server mode: .PP .Vb 1 -\& nedit -server +\& nedit \-server .Ve .PP If no server is running, \fBnc\fR will start one unless configured otherwise. @@ -275,12 +275,12 @@ .IP "incorrect:" 4 .IX Item "incorrect:" .Vb 1 -\& nc file.c -line 25 +\& nc file.c \-line 25 .Ve .IP "correct:" 4 .IX Item "correct:" .Vb 1 -\& nc -line 25 file.c +\& nc \-line 25 file.c .Ve .PP For more information see NEdit's online help, or \fInedit.doc\fR in the NEdit