From 5c1a6d157558fc44a3c7b4248b6dbd953438d5e7 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 11 Oct 2012 09:03:14 -0600 Subject: [PATCH] 0.2.1 includes my 0.2.0 patches, prepare to upload --- debian/changelog | 6 ++--- debian/patches/makefile-support-hardening | 29 ----------------------- debian/patches/series | 2 -- debian/patches/version-not-beta | 11 --------- 4 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 debian/patches/makefile-support-hardening delete mode 100644 debian/patches/series delete mode 100644 debian/patches/version-not-beta diff --git a/debian/changelog b/debian/changelog index 40f8ee0..00553eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -yforth (0.2.0-1) unstable; urgency=low +yforth (0.2.1-1) unstable; urgency=low * new upstream version under GPLv3, closes: #687348 * update homepage field in control, closes: #688616 - * move to use of dh in rules + * move to use of dh in rules, compat 9 to enable hardening - -- Bdale Garbee Wed, 10 Oct 2012 08:47:55 -0600 + -- Bdale Garbee Thu, 11 Oct 2012 09:02:47 -0600 yforth (0.1beta-23) unstable; urgency=low diff --git a/debian/patches/makefile-support-hardening b/debian/patches/makefile-support-hardening deleted file mode 100644 index 51d26a7..0000000 --- a/debian/patches/makefile-support-hardening +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/Makefile b/Makefile -index 5e0fddb..301fd02 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,3 @@ --OPTIMIZE = -O2 - CC = gcc - MATHLIB = -lm - -@@ -13,16 +12,16 @@ INCLUDES = block.h blocke.h config.h core.h coree.h defaults.h double.h \ - string.h tools.h toolse.h udio.h ver.h ycore.h yforth.h - - yforth: div.h $(OBJECTS) -- $(CC) -o yforth $(OBJECTS) $(MATHLIB) -+ $(CC) -o yforth $(LDFLAGS) $(OBJECTS) $(MATHLIB) - - div.h: div - ./div - - div: division.c -- $(CC) -o div division.c -+ $(CC) -o div $(CFLAGS) $(CPPFLAGS) division.c - - .c.o: -- $(CC) -c -o $@ $(OPTIMIZE) $< -+ $(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) $< - - clean: - rm -f *.o yforth div.h div diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 1f4c1ac..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -makefile-support-hardening -version-not-beta diff --git a/debian/patches/version-not-beta b/debian/patches/version-not-beta deleted file mode 100644 index 176b617..0000000 --- a/debian/patches/version-not-beta +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/ver.h b/ver.h -index 3782906..cfddc40 100644 ---- a/ver.h -+++ b/ver.h -@@ -20,5 +20,5 @@ - - #define VER_HI 0 - #define VER_LO 2 --#define VER_TEST "+beta" -+#define VER_TEST "" - -- 2.30.2