[Pkg-haskell-commits] [bustle] 03/06: d/patches: drop patches merged upstream

[Hector Oron]

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

zumbi pushed a commit to branch master
in repository bustle.

commit 9d347444195e8ce65fc5098098681c7b3f5d51ec
Author: Héctor Orón Martínez <zumbi at debian.org>
Date:   Wed Sep 24 00:06:10 2014 +0200

    d/patches: drop patches merged upstream
    
    Signed-off-by: Héctor Orón Martínez <zumbi at debian.org>
---
 debian/patches/series                  |  1 -
 debian/patches/use-usr-as-preifx.patch | 40 ----------------------------------
 2 files changed, 41 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 6d36015..23543d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0002-Use-g_thread_try_new-rather-than-g_thread_create.patch
-use-usr-as-preifx.patch
diff --git a/debian/patches/use-usr-as-preifx.patch b/debian/patches/use-usr-as-preifx.patch
deleted file mode 100644
index 3ddc5b3..0000000
--- a/debian/patches/use-usr-as-preifx.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- bustle (0.4.1-1) unstable; urgency=low
- .
-   * Drop build dep on deprecated haskell-dbus-core.
-   * Build depend on haskell-pcap-dev.
-   * Add build-dep-indep on help2man.
-Author: Hector Oron <zumbi at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0)
- PCAP_FLAGS := $(shell pcap-config --cflags pcap-config --libs)
- DESTDIR =
--PREFIX = /usr/local
-+PREFIX = /usr
- BINDIR = $(DESTDIR)$(PREFIX)/bin
- MAN1DIR = $(DESTDIR)$(PREFIX)/share/man/man1
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/bustle.git