Bug#258640: Changelog for NMU elvis-tiny 1.4-18.1

[Christoph Berg]

diff -u elvis-tiny-1.4/debian/rules elvis-tiny-1.4/debian/rules
--- elvis-tiny-1.4/debian/rules
+++ elvis-tiny-1.4/debian/rules
@@ -17,8 +17,8 @@
 build:
 # Builds the binary package.
        $(checkdir)
-       make CC="gcc -fsigned-char"
-       cc -O2 -s -o debian/wrapper debian/wrapper.c
+       make CC="$(CC) -fsigned-char"
+       $(CC) -O2 -s -o debian/wrapper debian/wrapper.c
        touch build
 
 # Architecture independant files.
diff -u elvis-tiny-1.4/debian/changelog elvis-tiny-1.4/debian/changelog
--- elvis-tiny-1.4/debian/changelog
+++ elvis-tiny-1.4/debian/changelog
@@ -1,3 +1,13 @@
+elvis-tiny (1.4-18.1) unstable; urgency=low
+
+  * 0-day NMU from the QA meeting.
+  * Correcting conflicting types for 'malloc' (closes: #258640)
+  * Replacing "gcc" with "$(CC)" for being able to cross-compile
+    (closes: #285295)
+  * Removing obsolete code for /usr/doc support (closes: #254913)
+
+ -- Axel Beckert <[EMAIL PROTECTED]>  Sun, 11 Sep 2005 02:08:26 +0200
+
 elvis-tiny (1.4-18) unstable; urgency=low
 
   * Include string.h in tmp.c to solve prototype problem on
diff -u elvis-tiny-1.4/debian/postinst elvis-tiny-1.4/debian/postinst
--- elvis-tiny-1.4/debian/postinst
+++ elvis-tiny-1.4/debian/postinst
@@ -40,7 +39,0 @@
-# Compatibility symlinks into /usr/doc
-if [ -d /usr/doc -a ! -e /usr/doc/elvis-tiny \
-        -a -d /usr/share/doc/elvis-tiny ]
-then
-        ln -sf ../share/doc/elvis-tiny /usr/doc/elvis-tiny
-fi
-
diff -u elvis-tiny-1.4/debian/prerm elvis-tiny-1.4/debian/prerm
--- elvis-tiny-1.4/debian/prerm
+++ elvis-tiny-1.4/debian/prerm
@@ -1,11 +1,5 @@
 #! /bin/sh
 
-case "$1" in
-  upgrade|remove)
-       [ -L /usr/doc/elvis-tiny ] && rm -f /usr/doc/elvis-tiny
-  ;;
-esac
-
 if [ "$1" = "remove" ]
 then
        update-alternatives --remove vi     /usr/bin/elvis-tiny
only in patch2:
unchanged:
--- elvis-tiny-1.4.orig/config.h
+++ elvis-tiny-1.4/config.h
@@ -178,13 +178,6 @@
 # define uchar         unsigned char
 #endif
 
-/* Some compilers prefer to have malloc declared as returning a (void *) */
-#if BSD
-extern void *malloc();
-#else
-extern char *malloc();
-#endif
-
 /* Most compilers could benefit from using the "register" storage class */
 #if 1
 # define REG   register
only in patch2:
unchanged:
--- elvis-tiny-1.4.orig/debian/bug#258640.patch
+++ elvis-tiny-1.4/debian/bug#258640.patch
@@ -0,0 +1,17 @@
+diff -urN ../tmp-orig/elvis-tiny-1.4/config.h ./config.h
+--- ../tmp-orig/elvis-tiny-1.4/config.h 1991-08-04 23:20:32.000000000 +0200
++++ ./config.h  2004-07-10 21:39:44.742474908 +0200
+@@ -178,13 +178,6 @@
+ # define uchar         unsigned char
+ #endif
+
+-/* Some compilers prefer to have malloc declared as returning a (void *) */
+-#if BSD
+-extern void *malloc();
+-#else
+-extern char *malloc();
+-#endif
+-
+ /* Most compilers could benefit from using the "register" storage class */
+ #if 1
+ # define REG   register

Christoph

signature.asc
Description: Digital signature