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

glondu pushed a commit to branch master
in repository ocamlnet.

commit eee9089656e35ff6c045d947fd9e6ef0bbb039b7
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Nov 9 12:30:20 2013 +0100

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

diff --git a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch 
b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
index d869afb..9e5286f 100644
--- a/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
+++ b/debian/patches/0001-Avoid-shipping-GPL-license-text.patch
@@ -6,8 +6,8 @@ We have it in Debian!
 
 Signed-off-by: Stefano Zacchiroli <z...@debian.org>
 ---
- src/nethttpd-for-netcgi2/Makefile.pre |    2 +-
- src/nethttpd/Makefile.pre             |    2 +-
+ src/nethttpd-for-netcgi2/Makefile.pre | 2 +-
+ src/nethttpd/Makefile.pre             | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/nethttpd-for-netcgi2/Makefile.pre 
b/src/nethttpd-for-netcgi2/Makefile.pre
diff --git a/debian/patches/0002-Create-installation-directories.patch 
b/debian/patches/0002-Create-installation-directories.patch
index 1da2156..78bda4d 100644
--- a/debian/patches/0002-Create-installation-directories.patch
+++ b/debian/patches/0002-Create-installation-directories.patch
@@ -6,7 +6,7 @@ Subject: Create installation directories
 
 Signed-off-by: Stefano Zacchiroli <z...@debian.org>
 ---
- Makefile |    1 +
+ Makefile | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
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 1586987..4e7cdae 100644
--- a/debian/patches/0003-Do-not-install-apache.info-file.patch
+++ b/debian/patches/0003-Do-not-install-apache.info-file.patch
@@ -6,7 +6,7 @@ It is not needed with Apache 2.
 
 Signed-off-by: Stefano Zacchiroli <z...@debian.org>
 ---
- src/netcgi2-apache/Makefile.def |    2 +-
+ src/netcgi2-apache/Makefile.def | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
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 6164c3d..3f37c67 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
@@ -8,14 +8,14 @@ apache2-mpm-worker (one of the packages shipping 
/usr/sbin/apache2)
 
 Signed-off-by: Stefano Zacchiroli <z...@upsilon.cc>
 ---
- configure |    4 ++--
+ configure | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 501c633..3816f4d 100755
+index 5661533..246baaa 100755
 --- a/configure
 +++ b/configure
-@@ -833,8 +833,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -859,8 +859,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 7fd5643..731e770 100644
--- a/debian/patches/0005-Fix-upstream-cleaning-rules.patch
+++ b/debian/patches/0005-Fix-upstream-cleaning-rules.patch
@@ -4,10 +4,10 @@ Subject: Fix upstream cleaning rules
 
 Signed-off-by: Stephane Glondu <st...@glondu.net>
 ---
- src/netcgi2-apache/Makefile.pre |    5 ++---
- src/netsys/Makefile             |    5 +++--
- src/netsys/Makefile.pre         |    4 +++-
- src/rpc-auth-local/Makefile.pre |    3 +++
+ src/netcgi2-apache/Makefile.pre | 5 ++---
+ src/netsys/Makefile             | 5 +++--
+ src/netsys/Makefile.pre         | 4 +++-
+ src/rpc-auth-local/Makefile.pre | 3 +++
  4 files changed, 11 insertions(+), 6 deletions(-)
 
 diff --git a/src/netcgi2-apache/Makefile.pre b/src/netcgi2-apache/Makefile.pre
@@ -24,10 +24,10 @@ index 4f2f44b..2c83034 100644
 +distclean::
 +      $(RM) -rf .libs/ *.cds
 diff --git a/src/netsys/Makefile b/src/netsys/Makefile
-index 452aab2..8cf7994 100644
+index adee57d..92a8a99 100644
 --- a/src/netsys/Makefile
 +++ b/src/netsys/Makefile
-@@ -98,7 +98,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
+@@ -100,7 +100,8 @@ netsys_oothr-posix: netsys_oothr_mt.cmx
  
  
  clean::
@@ -39,10 +39,10 @@ index 452aab2..8cf7994 100644
  
  include depend
 diff --git a/src/netsys/Makefile.pre b/src/netsys/Makefile.pre
-index e00996e..cf340c3 100644
+index f4c849b..9c79f40 100644
 --- a/src/netsys/Makefile.pre
 +++ b/src/netsys/Makefile.pre
-@@ -17,4 +17,6 @@ include $(TOP_DIR)/Makefile.rules
+@@ -19,4 +19,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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to