[Pkg-ocaml-maint-commits] [SCM] ocsigenserver packaging branch, master, updated. debian/2.1-1-5-g7c9937b

Stephane Glondu steph at glondu.net
Thu Dec 6 22:34:48 UTC 2012


The following commit has been merged in the master branch:
commit 6391ac4d9d0e95764e268041d225c14e373e63be
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Dec 6 23:23:43 2012 +0100

    Remove patch (merged upstream)

diff --git a/debian/patches/0001-Fix-typo-in-Makefile.patch b/debian/patches/0001-Fix-typo-in-Makefile.patch
deleted file mode 100644
index 38b1123..0000000
--- a/debian/patches/0001-Fix-typo-in-Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sat, 17 Mar 2012 11:56:53 +0100
-Subject: Fix typo in Makefile
-
-Caused FTBFS with /bin/sh -> bash.
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 7928b12..64923ae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -138,7 +138,7 @@ logrotate:
- 	     | sed s%USER%$(OCSIGENUSER)%g \
- 	     | sed s%GROUP%$(OCSIGENGROUP)%g \
- 	     | sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
--	     > $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME) }
-+	     > $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME)
- 
- ###
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 298bee5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-typo-in-Makefile.patch

-- 
ocsigenserver packaging



More information about the Pkg-ocaml-maint-commits mailing list