[Pkg-ocaml-maint-commits] [ocamlnet] 07/07: Refresh patches

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository ocamlnet.

commit c2ae4317bc5e722376bd25b2cb3a9fa221afa991
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Feb 26 10:56:21 2015 +0100

    Refresh patches
---
 debian/patches/0001-Avoid-shipping-GPL-license-text.patch     | 4 ++--
 debian/patches/0002-Create-installation-directories.patch     | 4 ++--
 debian/patches/0004-Force-major-version-for-apache-to-2.patch | 4 ++--
 debian/patches/0005-Fix-upstream-cleaning-rules.patch         | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
index 9e5286f..0256d53 100644
--- a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
+++ b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
@@ -23,7 +23,7 @@ index d1c93f6..16d6c54 100644
  
  include $(TOP_DIR)/Makefile.rules
 diff --git a/src/nethttpd/Makefile.pre b/src/nethttpd/Makefile.pre
-index 1f8f334..603bc29 100644
+index 9d370c0..2f2ae8f 100644
 --- a/src/nethttpd/Makefile.pre
 +++ b/src/nethttpd/Makefile.pre
 @@ -4,7 +4,7 @@ PRE = 1
@@ -33,6 +33,6 @@ index 1f8f334..603bc29 100644
 -INSTALL_EXTRA += LICENSE
 +INSTALL_EXTRA +=
  
- PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
+ PP_OPTIONS = -pp $(CPPO)
  
 -- 
diff --git a/debian/patches/0002-Create-installation-directories.patch b/debian/patches/0002-Create-installation-directories.patch
index 78bda4d..e33ea4c 100644
--- a/debian/patches/0002-Create-installation-directories.patch
+++ b/debian/patches/0002-Create-installation-directories.patch
@@ -10,10 +10,10 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index ce83c7b..e47c8f8 100644
+index a0f4228..b8b5efc 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -46,6 +46,7 @@ doc:
+@@ -48,6 +48,7 @@ doc:
  # The following PHONY rule is important for Cygwin:
  .PHONY: install
  install:
diff --git a/debian/patches/0004-Force-major-version-for-apache-to-2.patch b/debian/patches/0004-Force-major-version-for-apache-to-2.patch
index 3f37c67..e646ad0 100644
--- a/debian/patches/0004-Force-major-version-for-apache-to-2.patch
+++ b/debian/patches/0004-Force-major-version-for-apache-to-2.patch
@@ -12,10 +12,10 @@ Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 5661533..246baaa 100755
+index 17811cf..32c245b 100755
 --- a/configure
 +++ b/configure
-@@ -859,8 +859,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -863,8 +863,8 @@ if [ $enable_apache -gt 0 ]; then
  	apache=`get_path apache`
      fi
  
diff --git a/debian/patches/0005-Fix-upstream-cleaning-rules.patch b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
index 731e770..4d58800 100644
--- a/debian/patches/0005-Fix-upstream-cleaning-rules.patch
+++ b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
@@ -24,10 +24,10 @@ index 4f2f44b..2c83034 100644
 +distclean::
 +	$(RM) -rf .libs/ *.cds
 diff --git a/src/netsys/Makefile b/src/netsys/Makefile
-index adee57d..92a8a99 100644
+index 391def8..46a0b50 100644
 --- a/src/netsys/Makefile
 +++ b/src/netsys/Makefile
-@@ -100,7 +100,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
+@@ -99,7 +99,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
  
  
  clean::
@@ -39,10 +39,10 @@ index adee57d..92a8a99 100644
  
  include depend
 diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre
-index f4c849b..9c79f40 100644
+index 1e22495..9ab2036 100644
 --- a/src/netsys/Makefile.pre
 +++ b/src/netsys/Makefile.pre
-@@ -19,4 +19,6 @@ include $(TOP_DIR)/Makefile.rules
+@@ -20,4 +20,6 @@ include $(TOP_DIR)/Makefile.rules
  distclean::
  	rm -f Makefile.conf config.h
  	rm -f configtests/*.cmi configtests/*.cmo configtests/*.o

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlnet.git