- Fix build problems (NGLdap not built)

- Add WEProtoype
- Fix rules script typos

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

diff --git a/debian/changelog b/debian/changelog
index 70a2f287be7358f9a7c29d4ebf31503aeefa25f3..154f0b2aee8ecab07924a05a5dd7fea314459991 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,8 @@
 sope (4.5.5-0) UNRELEASED; urgency=low
 
-  * New upstream release
-  * Change postgresql dependencies to match version 8.0 packaging
-  * Add real packages as alternatives to virtual build dependencies
-
- -- Sebastian Ley <ley@debian.org>  Thu, 11 Aug 2005 13:12:54 +0200
-
-sope (4.5.0-0) UNRELEASED; urgency=low
-
-  * New upstream release
+  * New upstream release.
 
- -- Sebastian Ley <ley@debian.org>  Mon, 29 Nov 2004 19:40:06 +0100
+ -- Sebastian Ley <ley@debian.org>  Tue, 20 Sep 2005 16:30:26 +0200
 
 sope (4.3.9-1) experimental; urgency=low
 

diff --git a/debian/control b/debian/control
index 1e478fcf321c4ee33f2c5bcada657e2143745a12..7cc03622d1c2186af8d1d14c25a168ea1394907a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: sope
 Priority: extra
 Maintainer: Sebastian Ley <ley@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation1.0-dev | libfoundation-dev, libobjc-lf2-dev | libobjc-lf-dev, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev, libecpg-dev, apache-dev, apache2-threaded-dev | apache2-dev, automake1.7 | automake
+Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation1.0-dev | libfoundation-dev, libobjc-lf2-dev | libobjc-lf-dev, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev, libecpg-dev, apache-dev, apache2-threaded-dev | apache2-dev, autotools-dev
 Standards-Version: 3.6.1
 
 Package: libsope4.5-dev

diff --git a/debian/control.in b/debian/control.in
index e4a03c47a565a3a2f811507f2e62b29531cc9797..127027b9db6231b6ab8c8bd5d21e04780d74cb2e 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,7 @@
 Source: sope
 Priority: extra
 Maintainer: Sebastian Ley <ley@debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation1.0-dev | libfoundation-dev, libobjc-lf2-dev | libobjc-lf-dev, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev, libecpg-dev, apache-dev, apache2-threaded-dev | apache2-dev, automake1.7 | automake
+Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation1.0-dev | libfoundation-dev, libobjc-lf2-dev | libobjc-lf-dev, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev, libecpg-dev, apache-dev, apache2-threaded-dev | apache2-dev, autotools-dev
 Standards-Version: 3.6.1
 
 Package: libsope_SOPEVER_-dev

diff --git a/debian/libsope-appserver_SOPEVER_-dev.install b/debian/libsope-appserver_SOPEVER_-dev.install
index 8d18fd35ac1e22665c9905cac5986556ae1777d0..b9dd349bed174b4f65ecb09461e386e1f8e5df68 100644 (file)
--- a/debian/libsope-appserver_SOPEVER_-dev.install
+++ b/debian/libsope-appserver_SOPEVER_-dev.install
@@ -12,3 +12,4 @@ usr/lib/libWOExtensions.so
 usr/lib/libWEExtensions.so
 usr/lib/libNGXmlRpc.so
 usr/lib/libSoOFS.so
+usr/lib/libWEPrototype.so

diff --git a/debian/libsope-appserver_SOPEVER_.install b/debian/libsope-appserver_SOPEVER_.install
index 78c4e9854c81e1b34cad4b39e7d656b0bac19356..9ca6ff89d1075cfc81a4d248c820dae48dc5902f 100644 (file)
--- a/debian/libsope-appserver_SOPEVER_.install
+++ b/debian/libsope-appserver_SOPEVER_.install
@@ -4,6 +4,7 @@ usr/lib/libWOExtensions.so.*
 usr/lib/libWEExtensions.so.*
 usr/lib/libNGXmlRpc.so.*
 usr/lib/libSoOFS.so.*
+usr/lib/libWEPrototype.so.*
 usr/share/sope-*/ngobjweb
 usr/lib/sope-*/products
 usr/lib/sope-*/wox-builders

diff --git a/debian/rules b/debian/rules
index 1d5be4faafc2b4bf4c0e60fa59ce2b80e2216ddd..f19e026b4107369dea6a7c7820de0b83061da4ab 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 include /usr/share/dpatch/dpatch.make
 
 CFLAGS = -Wall -g
-MAKE_FLAGS = messages=yes OPTFLAG=-O0
+MAKE_FLAGS = messages=yes OPTFLAG=-O0 HAS_LIBRARY_ldap=yes
 
 GNUSTEP_SETUP=/usr/lib/opengroupware.org/System/Library/Makefiles/GNUstep.sh
 
@@ -59,8 +59,8 @@ build-stamp: patch-stamp
 
        -mv sope-core/NGStreams/config.guess sope-core/NGStreams/config.guess.upstream
        -mv sope-core/NGStreams/config.sub sope-core/NGStreams/config.sub.upstream
-       ln -s /usr/share/automake/config.guess sope-core/NGStreams/config.guess
-       ln -s /usr/share/automake/config.sub sope-core/NGStreams/config.sub
+       ln -s /usr/share/misc/config.guess sope-core/NGStreams/config.guess
+       ln -s /usr/share/misc/config.sub sope-core/NGStreams/config.sub
 
        CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) all
@@ -83,10 +83,10 @@ clean: unpatch clean-controlfiles
        rm -f build-stamp
        rm -rf sope-appserver/mod_ngobjweb-apache2
 
-       if [-l sope-core/NGStreams/config.guess ]; then \
+       if [ -l sope-core/NGStreams/config.guess ]; then \
                rm sope-core/NGStreams/config.guess; \
        fi
-       if [-l sope-core/NGStreams/config.sub ]; then \
+       if [ -l sope-core/NGStreams/config.sub ]; then \
                rm sope-core/NGStreams/config.sub; \
        fi
        if [ -f sope-core/NGStreams/config.guess.upstream ]; then \