[Pkg-ocaml-maint-commits] [ocamlnet] 07/13: 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 c59f6c1b795de8801c279db6ddbd0a71bc8f74af
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Oct 15 09:55:40 2015 +0200

    Refresh patches
---
 .../patches/0001-Avoid-shipping-GPL-license-text.patch  | 17 ++---------------
 .../patches/0002-Create-installation-directories.patch  |  4 ++--
 .../patches/0003-Do-not-install-apache.info-file.patch  | 10 +++++-----
 .../0004-Force-major-version-for-apache-to-2.patch      |  4 ++--
 debian/patches/0005-Fix-upstream-cleaning-rules.patch   |  4 ++--
 5 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
index 0256d53..a2e9611 100644
--- a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
+++ b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
@@ -6,22 +6,9 @@ We have it in Debian!
 
 Signed-off-by: Stefano Zacchiroli <zack at debian.org>
 ---
- src/nethttpd-for-netcgi2/Makefile.pre | 2 +-
- src/nethttpd/Makefile.pre             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/nethttpd/Makefile.pre | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/nethttpd-for-netcgi2/Makefile.pre b/src/nethttpd-for-netcgi2/Makefile.pre
-index d1c93f6..16d6c54 100644
---- a/src/nethttpd-for-netcgi2/Makefile.pre
-+++ b/src/nethttpd-for-netcgi2/Makefile.pre
-@@ -4,6 +4,6 @@ PRE = 1
- PKGNAME = nethttpd-for-netcgi2
- GENERATE = META 
- 
--INSTALL_EXTRA += LICENSE
-+INSTALL_EXTRA +=
- 
- include $(TOP_DIR)/Makefile.rules
 diff --git a/src/nethttpd/Makefile.pre b/src/nethttpd/Makefile.pre
 index 9d370c0..2f2ae8f 100644
 --- a/src/nethttpd/Makefile.pre
diff --git a/debian/patches/0002-Create-installation-directories.patch b/debian/patches/0002-Create-installation-directories.patch
index e33ea4c..61865aa 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 a0f4228..b8b5efc 100644
+index e5255c4..504d0da 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -48,6 +48,7 @@ doc:
+@@ -55,6 +55,7 @@ tools:
  # The following PHONY rule is important for Cygwin:
  .PHONY: install
  install:
diff --git a/debian/patches/0003-Do-not-install-apache.info-file.patch b/debian/patches/0003-Do-not-install-apache.info-file.patch
index 4e7cdae..017c3db 100644
--- a/debian/patches/0003-Do-not-install-apache.info-file.patch
+++ b/debian/patches/0003-Do-not-install-apache.info-file.patch
@@ -6,13 +6,13 @@ It is not needed with Apache 2.
 
 Signed-off-by: Stefano Zacchiroli <zack at debian.org>
 ---
- src/netcgi2-apache/Makefile.def | 2 +-
+ src/netcgi2-apache/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index 9efc603..6f6dfeb 100644
---- a/src/netcgi2-apache/Makefile.def
-+++ b/src/netcgi2-apache/Makefile.def
+diff --git a/src/netcgi2-apache/Makefile b/src/netcgi2-apache/Makefile
+index 540141e..218fa7c 100644
+--- a/src/netcgi2-apache/Makefile
++++ b/src/netcgi2-apache/Makefile
 @@ -11,7 +11,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
  DOBJECTS = netcgi_apache.mli netcgi_modtpl.mli
  
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 e646ad0..c138d90 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 17811cf..32c245b 100755
+index 2b9c66e..3a3dabb 100755
 --- a/configure
 +++ b/configure
-@@ -863,8 +863,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -895,8 +895,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 4d58800..32ee98d 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 391def8..46a0b50 100644
+index 44b14e3..be70b5c 100644
 --- a/src/netsys/Makefile
 +++ b/src/netsys/Makefile
-@@ -99,7 +99,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
+@@ -104,7 +104,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
  
  
  clean::

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