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

Thu Aug 11 11:32:57 UTC 2016

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

glondu pushed a commit to branch master
in repository ocamlnet.

commit 91d345376bffbb008278a9b243d51b213bb4c722
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 11 10:37:50 2016 +0200

    Refresh patches
---
 .../0001-Avoid-shipping-GPL-license-text.patch        |  7 +++----
 .../0002-Create-installation-directories.patch        |  3 +--
 .../0003-Do-not-install-apache.info-file.patch        |  9 ++++-----
 .../0004-Force-major-version-for-apache-to-2.patch    |  5 ++---
 debian/patches/0005-Fix-upstream-cleaning-rules.patch | 19 +++++++++----------
 .../0006-Fix-compilation-of-Apache-module.patch       | 11 +++++------
 6 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
index a2e9611..12f30bd 100644
--- a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
+++ b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
@@ -10,16 +10,15 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/nethttpd/Makefile.pre b/src/nethttpd/Makefile.pre
-index 9d370c0..2f2ae8f 100644
+index ed1dcc8..126e7ae 100644
 --- a/src/nethttpd/Makefile.pre
 +++ b/src/nethttpd/Makefile.pre
-@@ -4,7 +4,7 @@ PRE = 1
+@@ -6,7 +6,7 @@ PRE = 1
  PKGNAME = nethttpd
  GENERATE = META
  
 -INSTALL_EXTRA += LICENSE
 +INSTALL_EXTRA +=
  
- PP_OPTIONS = -pp $(CPPO)
+ PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
  
--- 
diff --git a/debian/patches/0002-Create-installation-directories.patch b/debian/patches/0002-Create-installation-directories.patch
index 61865aa..c673881 100644
--- a/debian/patches/0002-Create-installation-directories.patch
+++ b/debian/patches/0002-Create-installation-directories.patch
@@ -10,7 +10,7 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index e5255c4..504d0da 100644
+index b2f114d..070f6c3 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -55,6 +55,7 @@ tools:
@@ -21,4 +21,3 @@ index e5255c4..504d0da 100644
  	for pkg in $(PKGLIST); do \
  		( cd src/$$pkg && $(MAKE) -f Makefile.pre install ) || exit; \
  	done
--- 
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 017c3db..620bb9d 100644
--- a/debian/patches/0003-Do-not-install-apache.info-file.patch
+++ b/debian/patches/0003-Do-not-install-apache.info-file.patch
@@ -10,16 +10,15 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/netcgi2-apache/Makefile b/src/netcgi2-apache/Makefile
-index 540141e..218fa7c 100644
+index 4e260b8..277ed2c 100644
 --- a/src/netcgi2-apache/Makefile
 +++ b/src/netcgi2-apache/Makefile
-@@ -11,7 +11,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
+@@ -13,7 +13,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
  DOBJECTS = netcgi_apache.mli netcgi_modtpl.mli
  
  ALL_EXTRA = mod_netcgi_apache.so
 -INSTALL_EXTRA = mod_netcgi_apache.so 500netcgi_apache.info
 +INSTALL_EXTRA = mod_netcgi_apache.so
  
- include $(TOP_DIR)/Makefile.rules
- 
--- 
+ OCAMLC_OPTIONS += $(STRING_OPTS)
+ OCAMLOPT_OPTIONS += $(STRING_OPTS)
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 c138d90..127f4c3 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 2b9c66e..3a3dabb 100755
+index 281c918..33147c5 100755
 --- a/configure
 +++ b/configure
-@@ -895,8 +895,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -962,8 +962,8 @@ if [ $enable_apache -gt 0 ]; then
  	apache=`get_path apache`
      fi
  
@@ -26,4 +26,3 @@ index 2b9c66e..3a3dabb 100755
  	apache_libdir="`$apxs -q LIBEXECDIR`"
  	apache_incdir="`$apxs -q INCLUDEDIR`"
  	apache_confdir="`$apxs -q SYSCONFDIR`"
--- 
diff --git a/debian/patches/0005-Fix-upstream-cleaning-rules.patch b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
index 32ee98d..e15304d 100644
--- a/debian/patches/0005-Fix-upstream-cleaning-rules.patch
+++ b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
@@ -11,10 +11,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  4 files changed, 11 insertions(+), 6 deletions(-)
 
 diff --git a/src/netcgi2-apache/Makefile.pre b/src/netcgi2-apache/Makefile.pre
-index 4f2f44b..2c83034 100644
+index e5eec77..d402e1c 100644
 --- a/src/netcgi2-apache/Makefile.pre
 +++ b/src/netcgi2-apache/Makefile.pre
-@@ -33,6 +33,5 @@ include $(TOP_DIR)/Makefile.rules
+@@ -36,6 +36,5 @@ include $(TOP_DIR)/Makefile.rules
  CLEAN_LIST += $(wildcard *.so) $(wildcard *.lo) $(wildcard *.slo) \
    $(wildcard *.la) config.h netcgi_apache_mod.ml 500netcgi_apache.info
  
@@ -24,10 +24,10 @@ index 4f2f44b..2c83034 100644
 +distclean::
 +	$(RM) -rf .libs/ *.cds
 diff --git a/src/netsys/Makefile b/src/netsys/Makefile
-index 44b14e3..be70b5c 100644
+index cbc1ce2..06e7240 100644
 --- a/src/netsys/Makefile
 +++ b/src/netsys/Makefile
-@@ -104,7 +104,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
+@@ -103,7 +103,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
  
  
  clean::
@@ -39,10 +39,10 @@ index 44b14e3..be70b5c 100644
  
  include depend
 diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre
-index 1e22495..9ab2036 100644
+index 8d4084b..c753f6f 100644
 --- a/src/netsys/Makefile.pre
 +++ b/src/netsys/Makefile.pre
-@@ -20,4 +20,6 @@ include $(TOP_DIR)/Makefile.rules
+@@ -21,4 +21,6 @@ include $(TOP_DIR)/Makefile.rules
  distclean::
  	rm -f Makefile.conf config.h
  	rm -f configtests/*.cmi configtests/*.cmo configtests/*.o
@@ -51,14 +51,13 @@ index 1e22495..9ab2036 100644
 +	find configtests -type f -executable -delete
 +	rm -rf tmp
 diff --git a/src/rpc-auth-local/Makefile.pre b/src/rpc-auth-local/Makefile.pre
-index 29c1606..cd6e8fc 100644
+index c8cbbf2..ba1fc1d 100644
 --- a/src/rpc-auth-local/Makefile.pre
 +++ b/src/rpc-auth-local/Makefile.pre
-@@ -5,3 +5,6 @@ PKGNAME = rpc-auth-local
- GENERATE = META
+@@ -9,3 +9,6 @@ GENERATE = META
+ PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
  
  include $(TOP_DIR)/Makefile.rules
 +
 +distclean::
 +	rm -f config.h configtests/*.err configtests/*.o configtests/*.cm*
--- 
diff --git a/debian/patches/0006-Fix-compilation-of-Apache-module.patch b/debian/patches/0006-Fix-compilation-of-Apache-module.patch
index 3788560..894b0ce 100644
--- a/debian/patches/0006-Fix-compilation-of-Apache-module.patch
+++ b/debian/patches/0006-Fix-compilation-of-Apache-module.patch
@@ -9,10 +9,10 @@ option, which does not work when the compiler is apxs2.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/netcgi2-apache/Makefile b/src/netcgi2-apache/Makefile
-index 218fa7c..f5a782f 100644
+index 277ed2c..fa26b04 100644
 --- a/src/netcgi2-apache/Makefile
 +++ b/src/netcgi2-apache/Makefile
-@@ -55,7 +55,9 @@ mod_netcgi_apache.so: $(MOD_OBJECTS)
+@@ -64,7 +64,9 @@ mod_netcgi_apache.so: $(MOD_OBJECTS)
  
  netcgi_apache_mod.lo: netcgi_apache_mod.o
  	echo "$@ generated by the rule for $^"
@@ -20,7 +20,6 @@ index 218fa7c..f5a782f 100644
 +netcgi_apache_mod.o: netcgi_apache_mod.c
 +	$(APXS) -c -o $@ $^
 +netcgi_apache_mod.c: netcgi_apache_mod.ml
- 	$(OCAMLC) -verbose -output-obj -linkall -o $@ -cc $(APXS) \
- 	  dynlink.cma unix.cma findlib.cma $^
- 
--- 
+ 	$(OCAMLC) -verbose -output-obj -linkall -o $@ \
+ 	  -cc "./drive-apxs $(APXS)" \
+ 	  -package "dynlink bytes unix findlib" -linkpkg $^

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

