- Add mod_ngobjweb for apache2 package

- Minor cleanups

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@437 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/debian/control b/debian/control
index 794cb3b4aa9389416bedbb0cc955d410c3544b70..8f6c812506e9c1a225faef19f60937037a27fc44 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -271,4 +271,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.8), apache-common (>= 1.3
 Description: Apache module for the SOPE application server
  This package contains an apache module which enables the apache
  webserver to deliver pages generated by the SOPE application server.
-  
+
+Package: libapache2-mod-ngobjweb
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-common
+Description: Apache2 module for the SOPE application server
+ This package contains an apache module which enables the apache2
+ webserver to deliver pages generated by the SOPE application server.

diff --git a/debian/control.in b/debian/control.in
index 21d731cd431ec5e4801920b0207d66e099def005..a95a66e52a01b35af2e1d3b5c151aedafa53ee98 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -271,4 +271,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.8), apache-common (>= 1.3
 Description: Apache module for the SOPE application server
  This package contains an apache module which enables the apache
  webserver to deliver pages generated by the SOPE application server.
-  
+
+Package: libapache2-mod-ngobjweb
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-common
+Description: Apache2 module for the SOPE application server
+ This package contains an apache module which enables the apache2
+ webserver to deliver pages generated by the SOPE application server.

diff --git a/debian/libapache-mod-ngobjweb.dirs b/debian/libapache-mod-ngobjweb.dirs
index 13bab4d6be4cd85c3153342685f721f2eafef241..554b50e190a7dc92cdc44b2068aa0b0bc774519f 100644 (file)
--- a/debian/libapache-mod-ngobjweb.dirs
+++ b/debian/libapache-mod-ngobjweb.dirs
@@ -1,2 +1 @@
 usr/lib/apache/1.3
-usr/share/opengroupware.org/mod_ngobjweb

diff --git a/debian/libapache2-mod-ngobjweb.dirs b/debian/libapache2-mod-ngobjweb.dirs
new file mode 100644 (file)
index 0000000..ab4fbe8
--- /dev/null
+++ b/debian/libapache2-mod-ngobjweb.dirs
@@ -0,0 +1,2 @@
+usr/lib/apache2/modules
+etc/apache2/mods-available

diff --git a/debian/libapache2-mod-ngobjweb.install b/debian/libapache2-mod-ngobjweb.install
new file mode 100644 (file)
index 0000000..3f5d088
--- /dev/null
+++ b/debian/libapache2-mod-ngobjweb.install
@@ -0,0 +1 @@
+usr/lib/apache2

diff --git a/debian/libapache2-mod-ngobjweb.postinst b/debian/libapache2-mod-ngobjweb.postinst
new file mode 100755 (executable)
index 0000000..681adee
--- /dev/null
+++ b/debian/libapache2-mod-ngobjweb.postinst
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+if [ -e /etc/apache2/httpd.conf ]; then
+       a2enmod ngobjweb
+fi
+if [ -x /usr/sbin/invoke-rc.d ] && [ -x /etc/init.d/apache2 ]; then
+       invoke-rc.d apache2 force-reload || true
+elif [ -x /etc/init.d/apache2 ]; then
+       /etc/init.d/apache2 force-reload || true
+fi
+
+#DEBHELPER#

diff --git a/debian/libapache2-mod-ngobjweb.prerm b/debian/libapache2-mod-ngobjweb.prerm
new file mode 100755 (executable)
index 0000000..cf4a2ee
--- /dev/null
+++ b/debian/libapache2-mod-ngobjweb.prerm
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+if [ -e /etc/apache2/httpd.conf ]; then
+       a2dismod ngobjweb
+fi
+if [ -x /usr/sbin/invoke-rc.d ] && [ -x /etc/init.d/apache2 ]; then
+       invoke-rc.d apache2 force-reload || true
+elif [ -x /etc/init.d/apache2 ]; then
+       /etc/init.d/apache2 force-reload || true
+fi
+
+#DEBHELPER#

diff --git a/debian/ngobjweb.load b/debian/ngobjweb.load
new file mode 100644 (file)
index 0000000..7a3c101
--- /dev/null
+++ b/debian/ngobjweb.load
@@ -0,0 +1 @@
+LoadModule ngobjweb_module /usr/lib/apache2/modules/mod_ngobjweb.so

diff --git a/debian/patches/00list b/debian/patches/00list
index 5dfcf4a8e15b94bdd6d21e48cf80dd1b4e025bd1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +0,0 @@
-01_build_modngobjweb

diff --git a/debian/patches/01_build_modngobjweb.dpatch b/debian/patches/01_build_modngobjweb.dpatch
deleted file mode 100755 (executable)
index 0ca7d39..0000000
--- a/debian/patches/01_build_modngobjweb.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh -e
-## XX_PATCHNAME.dpatch by YOUR NAME <YOUR EMAIL>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Configure and build mod_ngobjweb
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
-       echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-       exit 1
-fi
-case "$1" in
-       -patch) 
-               patch $patch_opts -p1 < $0;;
-       -unpatch) 
-               patch $patch_opts -p1 -R < $0;;
-       *)
-               echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-               exit 1;;
-esac
-
-exit 0
-@DPATCH@
-diff -urN sope.orig/sope-appserver/mod_ngobjweb/GNUmakefile sope/sope-appserver/mod_ngobjweb/GNUmakefile
---- sope.orig/sope-appserver/mod_ngobjweb/GNUmakefile  2004-09-26 14:15:22.000000000 +0200
-+++ sope/sope-appserver/mod_ngobjweb/GNUmakefile       2004-09-26 14:17:43.000000000 +0200
-@@ -5,7 +5,7 @@
- # config
- 
- APACHE = /usr
--APXS   = $(APACHE)/sbin/apxs
-+APXS   = $(APACHE)/bin/apxs
- 
- ifneq ($(apxs),no)
- ifneq ($(apxs),yes)

diff --git a/debian/rules b/debian/rules
index 56d9ae2c8101f4a46963d087274fac29f4903698..1d5be4faafc2b4bf4c0e60fa59ce2b80e2216ddd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,14 @@ build-stamp: patch-stamp
        CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) all
 
-       CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \
-               $(MAKE) $(MAKE_FLAGS) -C sope-appserver/mod_ngobjweb all
+       cp -R sope-appserver/mod_ngobjweb sope-appserver/mod_ngobjweb-apache2
+
+       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+               $(MAKE) $(MAKE_FLAGS) APXS=/usr/bin/apxs -C sope-appserver/mod_ngobjweb all
+       
+       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+               $(MAKE) $(MAKE_FLAGS) APXS="/usr/bin/apxs2" APXS_INCLUDE_DIRS="$(shell apxs2 -q EXTRA_INCLUDES)"\
+               -C sope-appserver/mod_ngobjweb-apache2 all
 
        touch build-stamp
 
@@ -75,6 +81,7 @@ clean: unpatch clean-controlfiles
        dh_testroot
        rm -f configure-stamp
        rm -f build-stamp
+       rm -rf sope-appserver/mod_ngobjweb-apache2
 
        if [-l sope-core/NGStreams/config.guess ]; then \
                rm sope-core/NGStreams/config.guess; \
@@ -114,7 +121,12 @@ install: build
                $(MAKE) $(MAKE_FLAGS) -C sope-appserver/mod_ngobjweb install \
                GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/usr/lib/apache/1.3
 
+       CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \
+               $(MAKE) $(MAKE_FLAGS) -C sope-appserver/mod_ngobjweb-apache2 install \
+               GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/usr/lib/apache2/modules
+
        install -m 644 debian/500mod_ngobjweb.info $(CURDIR)/debian/libapache-mod-ngobjweb/usr/lib/apache/1.3
+       install -m 644 debian/ngobjweb.load $(CURDIR)/debian/libapache2-mod-ngobjweb/etc/apache2/mods-available
 
 # Build architecture-independent files here.
 binary-indep: build install