Package: aee
Version: 2.2.15b-3
Severity: normal
Tags: patch
Dear maintainer,
I've prepared an NMU for aee (versioned as 2.2.15b-3.1) and
uploaded it to DELAYED/7.
Cheers,
Julien
diff -u aee-2.2.15b/debian/changelog aee-2.2.15b/debian/changelog
--- aee-2.2.15b/debian/changelog
+++ aee-2.2.15b/debian/changelog
@@ -1,3 +1,15 @@
+aee (2.2.15b-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop obsolete build dep on x-dev (closes: #515355).
+ * Drop 'Provides: editor' since no alternatives are installed (closes:
+ #421080).
+ * Apply patch by Wesley J Landaker to fix wrong assumption about char
+ signedness (closes: #163978).
+ * Don't strip if DEB_BUILD_OPTIONS contains nostrip (closes: #436381).
+
+ -- Julien Cristau <jcris...@debian.org> Fri, 07 Aug 2009 11:59:17 +0200
+
aee (2.2.15b-3) unstable; urgency=low
* New Maintainer (Closes: #347736)
diff -u aee-2.2.15b/debian/control aee-2.2.15b/debian/control
--- aee-2.2.15b/debian/control
+++ aee-2.2.15b/debian/control
@@ -2,12 +2,11 @@
Section: editors
Priority: optional
Maintainer: Mario Iseli <ad...@marioiseli.com>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libx11-dev, x-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, libx11-dev
Standards-Version: 3.6.2
Package: aee
Architecture: any
-Provides: editor
Depends: ${shlibs:Depends}
Description: An easy to use screen-based editor
aee (advanced easy editor) is intended to be an easy to use screen-based
diff -u aee-2.2.15b/debian/patches/01-build.dpatch aee-2.2.15b/debian/patches/01-build.dpatch
--- aee-2.2.15b/debian/patches/01-build.dpatch
+++ aee-2.2.15b/debian/patches/01-build.dpatch
@@ -85,10 +85,10 @@
+ mkdir -p $(DESTDIR)/usr/bin
+ mkdir -p $(DESTDIR)/usr/share/man/man1
+ gzip -c -9 aee.1 > aee.1.gz
-+ install -s aee $(DESTDIR)/usr/bin
-+ install -s xae $(DESTDIR)/usr/bin
++ install aee $(DESTDIR)/usr/bin
++ install xae $(DESTDIR)/usr/bin
+ install aee.1.gz $(DESTDIR)/usr/share/man/man1/aee.1.gz
-+ install aee.1.gz $(DESTDIR)/usr/share/man/man1/xae.1.gz
++ ln -s aee.1.gz $(DESTDIR)/usr/share/man/man1/xae.1.gz
+ rm aee.1.gz
clean :
diff -u aee-2.2.15b/make.aee aee-2.2.15b/make.aee
--- aee-2.2.15b/make.aee
+++ aee-2.2.15b/make.aee
@@ -1,6 +1,6 @@
DEFINES = -DSYS5 -DBSD_SELECT -DNCURSE
-CFLAGS = -DHAS_UNISTD -DHAS_STDLIB -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -s -DSLCT_HDR
+CFLAGS = -DHAS_UNISTD -DHAS_STDLIB -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -Wall -g -O2 -DSLCT_HDR
all : aee
diff -u aee-2.2.15b/xae_dir/make.xae aee-2.2.15b/xae_dir/make.xae
--- aee-2.2.15b/xae_dir/make.xae
+++ aee-2.2.15b/xae_dir/make.xae
@@ -1,6 +1,6 @@
DEFINES = -DXAE -Dxae11
-CFLAGS = -DHAS_UNISTD -DHAS_STDLIB -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -I/usr/X11R6/include -L/usr/X11R6/lib -s
+CFLAGS = -DHAS_UNISTD -DHAS_STDLIB -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -Wall -g -O2
all : xae
only in patch2:
unchanged:
--- aee-2.2.15b.orig/debian/patches/02-unsigned-char.dpatch
+++ aee-2.2.15b/debian/patches/02-unsigned-char.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-unsigned-char.dpatch by Wesley J Landaker <w...@icecavern.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix wrong assumption on char signedness (debian bug#163978)
+
+...@dpatch@
+diff -urNad aee-2.2.15b~/mark.c aee-2.2.15b/mark.c
+--- aee-2.2.15b~/mark.c 1996-05-07 05:21:29.000000000 +0200
++++ aee-2.2.15b/mark.c 2009-08-07 11:48:25.000000000 +0200
+@@ -199,7 +199,7 @@
+ pst_pos++;
+ pst_pnt++;
+ }
+- if (*pst_pnt == -1)
++ if (*pst_pnt == -1 || *pst_pnt == 255)
+ *pst_pnt = (char) NULL;
+ cpste_line = cpste_line->next_line;
+ }
