Drop debian/patches/do-not-override-CFLAGS - fixed upstream.

diff --git a/debian/changelog b/debian/changelog
index 8831729c7e2837bf46bd5e4c101a9d86b8a1853a..4cc638b8041fcf51fb344da627520b68746dde40 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jattach (2.0-1) UNRELEASED; urgency=medium
   * New upstream release.
     + Adds OpenJ9 support.
     + Improves namespace awareness.
+  * Drop debian/patches/do-not-override-CFLAGS - fixed upstream.
 
  -- Sven Hoexter <sven@stormbind.net>  Mon, 16 Aug 2021 10:50:52 +0200
 

diff --git a/debian/patches/do-not-override-CFLAGS b/debian/patches/do-not-override-CFLAGS
deleted file mode 100644 (file)
index 50774fc..0000000
--- a/debian/patches/do-not-override-CFLAGS
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: do not override CFLAGS
- By default the Makefile ignores the CFLAGS as
- exported by dh.
-Author: Sven Hoexter <hoexter@debian.org>
-
-Index: jattach/Makefile
-===================================================================
---- jattach.orig/Makefile
-+++ jattach/Makefile
-@@ -16,7 +16,7 @@ else
-     SOURCES=$(RPM_ROOT)/SOURCES
-     SPEC_FILE=jattach.spec
-     CC=gcc
--    CFLAGS=-O2
-+    CFLAGS ?= -O2
-     JATTACH_EXE=jattach
-   endif
- endif
-@@ -27,7 +27,7 @@ build:
-       mkdir -p build
- 
- build/jattach: src/jattach_posix.c
--      $(CC) $(CFLAGS) -DJATTACH_VERSION=\"$(JATTACH_VERSION)\" -o $@ $^
-+      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DJATTACH_VERSION=\"$(JATTACH_VERSION)\" -o $@ $^
- 
- build/jattach.exe: src/jattach_windows.c
-       $(CL) $(CFLAGS) /DJATTACH_VERSION=\"$(JATTACH_VERSION)\" /Fobuild/jattach.obj /Fe$@ $^ advapi32.lib /link /SUBSYSTEM:CONSOLE,5.02

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index b96a296..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-do-not-override-CFLAGS