[mupen64plus-ui-console] 158/172: Remove upstream merged patches

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit e8d28dbaeefa8ba741bd2424449e12c3bc530c03
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Sep 5 11:32:17 2014 +0200

    Remove upstream merged patches
---
 debian/changelog                         |  2 ++
 debian/patches/make_header_depends.patch | 26 --------------------------
 debian/patches/series                    |  1 -
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf909eb..c2830e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mupen64plus-ui-console (2.0+18+gfb21340-1) UNRELEASED; urgency=medium
 
   * New Upstream Snapshot from fb21340f22ac17a5f1fdcf51a12f228638e5b332
+  * debian/patches:
+    - Remove upstream merged make_header_depends.patch
 
  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 11:26:36 +0200
 
diff --git a/debian/patches/make_header_depends.patch b/debian/patches/make_header_depends.patch
deleted file mode 100644
index 4e1f510..0000000
--- a/debian/patches/make_header_depends.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Don't fail rebuild when header is removed
- The *.d depends files for make just list the files used when building an
- object file. Removing a file listed in such a dependency file causes make to
- search for a way to recreate it. This usually cannot work because these files
- aren't autogenerated.
- .
- The gcc option -MP can be used to generate empty rule for these files.
- Removing a file in a dependency list will then execute this empty rule and
- continue with the execution of the creation of the object file. This
- compilation process will then automatically correct the dependency file.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 848a3aeb051ec103d355d7468ae349daaefbd5c6..d2082a58a74d9bcd13a7846232a2736eab6f75c2 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -312,7 +312,7 @@ uninstall:
- 	$(RM) "$(DESTDIR)$(BINDIR)/$(TARGET)" "$(DESTDIR)$(MANDIR)/man6/mupen64plus.6"
- 
- # build dependency files
--CFLAGS += -MD
-+CFLAGS += -MD -MP
- -include $(OBJECTS:.o=.d)
- 
- # standard build rules
diff --git a/debian/patches/series b/debian/patches/series
index 8fd2873..5a5a78d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 printf_fixup.patch
-make_header_depends.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git