[DRE-commits] [gitlab-workhorse] 04/04: drop patch

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab-workhorse.

commit ed691b7ad8a5b3958bcd3840a1824baf1251dae4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Feb 5 22:57:04 2016 +0530

    drop patch
---
 debian/changelog                  |  1 +
 debian/patches/modify-paths.patch | 16 ----------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eba525d..55b6959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gitlab-workhorse (0.6.3-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Drop patch: modify-paths.patch (merged upstream)
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 05 Feb 2016 22:54:09 +0530
 
diff --git a/debian/patches/modify-paths.patch b/debian/patches/modify-paths.patch
deleted file mode 100644
index d9d0701..0000000
--- a/debian/patches/modify-paths.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Forwarded: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/8
-
-Index: gitlab-workhorse-0.5.0/Makefile
-===================================================================
---- gitlab-workhorse-0.5.0.orig/Makefile
-+++ gitlab-workhorse-0.5.0/Makefile
-@@ -5,7 +5,8 @@ gitlab-workhorse: $(wildcard *.go)
- 	go build -ldflags "-X main.Version ${VERSION}" -o gitlab-workhorse
- 
- install: gitlab-workhorse
--	install gitlab-workhorse ${PREFIX}/bin/
-+	mkdir -p $(DESTDIR)${PREFIX}/bin/
-+	install gitlab-workhorse $(DESTDIR)${PREFIX}/bin/
- 
- .PHONY: test
- test: test/data/group/test.git clean-workhorse gitlab-workhorse
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5c020b7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-modify-paths.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab-workhorse.git