diff -Nru ztex-bmp-20110912/Makefile ztex-bmp-20120314/Makefile --- ztex-bmp-20110912/Makefile 2011-09-12 12:32:17.000000000 +0000 +++ ztex-bmp-20120314/Makefile 2011-10-05 12:30:34.000000000 +0000 @@ -44,8 +44,6 @@ SOURCES=src/bmp.pas src/bmpsys.pas src/textbuf.pas -DESTDIR=/ - UNITS=-Fusrc PCFLAGS:=-Scgm -O3rGp3 -FE. -Xs $(PCEXTRAFLAGS) @@ -86,11 +84,11 @@ endif ifndef BINDIR - BINDIR=$(DESTDIR)/$(PREFIX)/bin + BINDIR=$(DESTDIR)$(PREFIX)/bin endif ifndef MANDIR - MANDIR=$(PREFIX)/share/man/man1 + MANDIR=$(DESTDIR)$(PREFIX)/share/man/man1 endif .PHONY: all install uninstall resetconf clean distclean diff -Nru ztex-bmp-20110912/debian/README.source ztex-bmp-20120314/debian/README.source --- ztex-bmp-20110912/debian/README.source 2011-09-27 19:49:23.000000000 +0000 +++ ztex-bmp-20120314/debian/README.source 2012-07-31 20:47:11.000000000 +0000 @@ -1,8 +1,8 @@ bmp for Debian -------------- -The source code for bmp was separated from the "all in one" tarball -from ztex. +The source code for bmp is typically separated from the "all in one" +tarball from ztex. compilerflags.patch the patch does not help, left in anyway to avoid the diff -Nru ztex-bmp-20110912/debian/changelog ztex-bmp-20120314/debian/changelog --- ztex-bmp-20110912/debian/changelog 2011-09-27 20:03:31.000000000 +0000 +++ ztex-bmp-20120314/debian/changelog 2012-08-18 18:38:09.000000000 +0000 @@ -1,3 +1,16 @@ +ztex-bmp (20120314-2) unstable; urgency=low + + * Fixing debian/changelog's erroneous omission of a previous upload. + This might possibly help closing #685227. + + -- Steffen Moeller Sat, 18 Aug 2012 20:36:23 +0200 + +ztex-bmp (20120314-1) unstable; urgency=low + + * Upstream fixes FTBFS upon pascal compiler update (Closes: #663674) + + -- Steffen Moeller Tue, 31 Jul 2012 22:48:44 +0200 + ztex-bmp (20110912-1) unstable; urgency=low * New upstream version @@ -6,6 +19,12 @@ ztex-bmp (20110903+01-2) UNRELEASED; urgency=low + * Improved description. + + -- Steffen Moeller Sun, 11 Sep 2011 12:35:19 +0200 + +ztex-bmp (20110903+01-2) UNRELEASED; urgency=low + * Improved description. -- Steffen Moeller Sun, 11 Sep 2011 12:35:19 +0200 diff -Nru ztex-bmp-20110912/debian/control ztex-bmp-20120314/debian/control --- ztex-bmp-20110912/debian/control 2011-09-27 19:49:23.000000000 +0000 +++ ztex-bmp-20120314/debian/control 2012-07-31 20:51:04.000000000 +0000 @@ -3,7 +3,7 @@ Priority: extra Maintainer: Steffen Moeller Build-Depends: debhelper (>= 8.0.0), autotools-dev, fp-compiler -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://wiki.ztex.de/doku.php?id=en:software:compilation:bmp Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-escience/ztex-bmp/trunk/ Vcs-Svn: svn://svn.debian.org/svn/pkg-escience/bmp/trunk/ diff -Nru ztex-bmp-20110912/debian/copyright ztex-bmp-20120314/debian/copyright --- ztex-bmp-20110912/debian/copyright 2011-09-03 11:34:24.000000000 +0000 +++ ztex-bmp-20120314/debian/copyright 2012-07-31 20:49:41.000000000 +0000 @@ -9,12 +9,12 @@ Files: debian/* Copyright: 2011 Steffen Moeller -License: GPL-3 +License: GPL-3+ -License: GPL-3 +License: GPL-3+ This package 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 at either version 3 of the License. + the Free Software Foundation at version 3 or later of the License. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff -Nru ztex-bmp-20110912/debian/patches/compilerflags.patch ztex-bmp-20120314/debian/patches/compilerflags.patch --- ztex-bmp-20110912/debian/patches/compilerflags.patch 2011-09-27 19:49:23.000000000 +0000 +++ ztex-bmp-20120314/debian/patches/compilerflags.patch 2012-07-31 20:47:11.000000000 +0000 @@ -1,8 +1,8 @@ -Index: ztex-bmp-20110912/Makefile +Index: ztex-bmp-20120314/Makefile =================================================================== ---- ztex-bmp-20110912.orig/Makefile 2011-09-27 21:48:11.000000000 +0200 -+++ ztex-bmp-20110912/Makefile 2011-09-27 21:48:23.000000000 +0200 -@@ -48,7 +48,7 @@ +--- ztex-bmp-20120314.orig/Makefile 2012-07-31 22:43:51.000000000 +0200 ++++ ztex-bmp-20120314/Makefile 2012-07-31 22:43:51.000000000 +0200 +@@ -46,7 +46,7 @@ UNITS=-Fusrc diff -Nru ztex-bmp-20110912/debian/patches/destdirForMandir.patch ztex-bmp-20120314/debian/patches/destdirForMandir.patch --- ztex-bmp-20110912/debian/patches/destdirForMandir.patch 2011-09-27 20:02:08.000000000 +0000 +++ ztex-bmp-20120314/debian/patches/destdirForMandir.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: ztex-bmp-20110912/Makefile -=================================================================== ---- ztex-bmp-20110912.orig/Makefile 2011-09-27 21:48:23.000000000 +0200 -+++ ztex-bmp-20110912/Makefile 2011-09-27 22:02:05.000000000 +0200 -@@ -91,7 +91,7 @@ - endif - - ifndef MANDIR -- MANDIR=$(PREFIX)/share/man/man1 -+ MANDIR=$(DESTDIR)/$(PREFIX)/share/man/man1 - endif - - .PHONY: all install uninstall resetconf clean distclean diff -Nru ztex-bmp-20110912/debian/patches/series ztex-bmp-20120314/debian/patches/series --- ztex-bmp-20110912/debian/patches/series 2011-09-27 19:56:28.000000000 +0000 +++ ztex-bmp-20120314/debian/patches/series 2012-07-31 20:47:11.000000000 +0000 @@ -1,3 +1,2 @@ touch_not_echo.patch compilerflags.patch -destdirForMandir.patch diff -Nru ztex-bmp-20110912/debian/patches/touch_not_echo.patch ztex-bmp-20120314/debian/patches/touch_not_echo.patch --- ztex-bmp-20110912/debian/patches/touch_not_echo.patch 2011-09-27 19:49:23.000000000 +0000 +++ ztex-bmp-20120314/debian/patches/touch_not_echo.patch 2012-07-31 20:47:11.000000000 +0000 @@ -1,8 +1,8 @@ -Index: ztex-bmp-20110912/Makefile +Index: ztex-bmp-20120314/Makefile =================================================================== ---- ztex-bmp-20110912.orig/Makefile 2011-09-12 14:32:17.000000000 +0200 -+++ ztex-bmp-20110912/Makefile 2011-09-27 21:48:11.000000000 +0200 -@@ -53,10 +53,10 @@ +--- ztex-bmp-20120314.orig/Makefile 2012-07-31 22:43:47.000000000 +0200 ++++ ztex-bmp-20120314/Makefile 2012-07-31 22:44:00.000000000 +0200 +@@ -51,10 +51,10 @@ INSTALLEXE=$(INSTALL) -m 0755 INSTALLFILE=$(INSTALL) -m 0644 RM=rm -f @@ -14,7 +14,7 @@ CONFIGURESCRIPT=./configure PC:=$(shell $(CONFIGURESCRIPT) pc "$(PCFLAGS)") ifndef PC -@@ -75,6 +75,7 @@ +@@ -73,6 +73,7 @@ PC=ppc386 INSTALL=install @@ -22,7 +22,7 @@ ifndef PREFIX PREFIX=c:\usr -@@ -98,7 +99,7 @@ +@@ -96,7 +97,7 @@ all: bmp.made bmp.made: $(TARGETS) diff -Nru ztex-bmp-20110912/src/bmp.pas ztex-bmp-20120314/src/bmp.pas --- ztex-bmp-20110912/src/bmp.pas 2011-07-21 21:23:57.000000000 +0000 +++ ztex-bmp-20120314/src/bmp.pas 2012-03-14 09:48:33.000000000 +0000 @@ -303,14 +303,14 @@ end; constructor CMacroBuf.insert(var mb:CMacroBuf); -var tmp : CMacroBuf; +var db : CTextBuf; begin -tmp:=mb; -inherited create(mb, macrobuf_size); -last:=tmp.last; -tmp.last:=self; -mac:=tmp.mac; -tmp.mac:=nil; +inherited create(db, macrobuf_size); +last:=mb.last; +mb.last:=self; +mac:=mb.mac; +mb.mac:=nil; +mb:=self; end; { ****** destroy ***************************************************** }