Adjust rules for gsmake 2

diff --git a/debian/control b/debian/control
index d0e29f38148fc69cb3dba80c2c236f40b1dd21ca..fae384a86330b68c43ddd93e2522356b1d77831c 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, libobjc1, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev | postgresql-dev, libecpg-dev, apache2-threaded-dev | apache2-prefork-dev | apache2-dev, autotools-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, gobjc | objc-compiler, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev | postgresql-dev, libecpg-dev, apache2-threaded-dev | apache2-prefork-dev | apache2-dev, autotools-dev
 Standards-Version: 3.6.1
 
 Package: libsope4.7-dev

diff --git a/debian/control.in b/debian/control.in
index 18cd5a2a3aabf8a6ae235c6f29cf24f1b9686384..1752484563287da858f19f362831aaae14b9a407 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, libobjc1, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev | postgresql-dev, libecpg-dev, apache2-threaded-dev | apache2-prefork-dev | apache2-dev, autotools-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, gobjc | objc-compiler, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev | postgresql-dev, libecpg-dev, apache2-threaded-dev | apache2-prefork-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 b9dd349bed174b4f65ecb09461e386e1f8e5df68..6f2627a4b52ac646216b83086c96c0847b95e798 100644 (file)
--- a/debian/libsope-appserver_SOPEVER_-dev.install
+++ b/debian/libsope-appserver_SOPEVER_-dev.install
@@ -1,11 +1,11 @@
 usr/include/NGHttp
 usr/include/NGObjWeb
+usr/include/GNUstep/NGObjWeb/*  usr/include/NGObjWeb
 usr/include/WOXML
 usr/include/WOExtensions
 usr/include/WEExtensions
 usr/include/NGXmlRpc
 usr/include/SoOFS
-usr/lib/opengroupware.org/System/Library/Makefiles
 usr/lib/libNGObjWeb.so
 usr/lib/libWOXML.so
 usr/lib/libWOExtensions.so
@@ -13,3 +13,4 @@ usr/lib/libWEExtensions.so
 usr/lib/libNGXmlRpc.so
 usr/lib/libSoOFS.so
 usr/lib/libWEPrototype.so
+usr/share/GNUstep/Makefiles
\ No newline at end of file

diff --git a/debian/libsope-appserver_SOPEVER_.install b/debian/libsope-appserver_SOPEVER_.install
index 9ca6ff89d1075cfc81a4d248c820dae48dc5902f..83781e42f025ddfd00111cf8dc0513b8aa1cb5ad 100644 (file)
--- a/debian/libsope-appserver_SOPEVER_.install
+++ b/debian/libsope-appserver_SOPEVER_.install
@@ -5,6 +5,6 @@ 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
+usr/lib/GNUstep/Libraries/Resources/NGObjWeb
+usr/lib/GNUstep/SoProducts-4.7
+usr/lib/GNUstep/WOxElemBuilders-4.7

diff --git a/debian/libsope-ical_SOPEVER_.install b/debian/libsope-ical_SOPEVER_.install
index 10c420c5c89440566f6bdc4190af24478372ab11..f58198c0220e22a1fe9d9742b58b7315e6f80888 100644 (file)
--- a/debian/libsope-ical_SOPEVER_.install
+++ b/debian/libsope-ical_SOPEVER_.install
@@ -1,2 +1,2 @@
 usr/lib/libNGiCal.so.*
-usr/share/sope-*/saxmappings
+usr/lib/GNUstep/SaxMappings

diff --git a/debian/rules b/debian/rules
index 3b266d560d30834d9bafd5c3e7bc2335682168ec..3b5526c74189b33fdaf4fe0109f664ebde1b7852 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,8 @@ CFLAGS = -Wall -g
 #WARN: doesn't compile/package if HAS_LIBRARY_* options not present (since we use configure now)
 MAKE_FLAGS = messages=yes OPTFLAG=-O0 HAS_LIBRARY_ldap=yes HAS_LIBRARY_pq=yes HAS_LIBRARY_xml2=yes
 
-GNUSTEP_SETUP=/usr/lib/opengroupware.org/System/Library/Makefiles/GNUstep.sh
+GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles
+GNUSTEP_SETUP=$(GNUSTEP_MAKEFILES)/GNUstep.sh
 
 include Version
 SOPEVER=$(MAJOR_VERSION).$(MINOR_VERSION)
@@ -50,16 +51,16 @@ clean-controlfiles:
                done; \
                rm controlfiles.tmp; \
        fi
-       
+
 debian/control: debian/control.in debian/rules
        sed -e s/_SOPEVER_/$(SOPEVER)/g < debian/control.in > debian/control
 
 config.status: configure
        dh_testdir
-       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
-               ./configure
-       
-build: build-stamp controlfiles
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+               ./configure --with-gnustep
+
+build: config.status build-stamp controlfiles
 build-stamp: patch-stamp
        dh_testdir
 
@@ -68,13 +69,13 @@ build-stamp: patch-stamp
        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); \
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) all
 
-       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) APXS="/usr/bin/apxs2" APXS_INCLUDE_DIRS="$(shell apxs2 -q EXTRA_INCLUDES)" \
                -C sope-appserver/mod_ngobjweb all
-       
+
        touch build-stamp
 
 clean: unpatch clean-controlfiles
@@ -96,11 +97,11 @@ clean: unpatch clean-controlfiles
                mv sope-core/NGStreams/config.sub.upstream sope-core/NGStreams/config.sub; \
        fi
 
-       -. $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb clean
-       -. $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb distclean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb clean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) -C sope-appserver/mod_ngobjweb distclean
 
-       -. $(GNUSTEP_SETUP); $(MAKE) clean
-       -. $(GNUSTEP_SETUP); $(MAKE) distclean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) clean
+       -GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) . $(GNUSTEP_SETUP); $(MAKE) distclean
 
        dh_clean 
 
@@ -111,14 +112,16 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/tmp
-       CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES)  CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) install \
-               GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/$$GNUSTEP_SYSTEM_ROOT\
-               INSTALL_ROOT_DIR=$(CURDIR)/debian/tmp\
-               FHS_INSTALL_ROOT=$(CURDIR)/debian/tmp/usr \
+               DESTDIR=$(CURDIR)/debian/tmp \
+               GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
+               FHS_INSTALL_ROOT=/usr \
                FHS_LIB_DIR=$(CURDIR)/debian/tmp/usr/lib/ #WARN: <- trailing slash unbroke build/packages?!
 
-       CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \
+#              GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/$$GNUSTEP_SYSTEM_ROOT\
+
+       GNUSTEP_MAKEFILES=$(GNUSTEP_MAKEFILES) CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \
                $(MAKE) $(MAKE_FLAGS) -C sope-appserver/mod_ngobjweb install \
                GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/usr/lib/apache2/modules
 
@@ -135,7 +138,7 @@ binary-arch: build install
        dh_installchangelogs 
        dh_installdocs
        dh_installexamples
-       dh_install --sourcedir=debian/tmp
+       dh_install --sourcedir=debian/tmp --list-missing
 #      dh_installmenu
 #      dh_installdebconf       
 #      dh_installlogrotate

diff --git a/debian/sope_SOPEVER_-gdl1-postgresql.install b/debian/sope_SOPEVER_-gdl1-postgresql.install
index 937e7ca55b46605dd77be8b9267f7dd7b55049bb..659422b6dad74e303282e8605ad34f70045a11a5 100644 (file)
--- a/debian/sope_SOPEVER_-gdl1-postgresql.install
+++ b/debian/sope_SOPEVER_-gdl1-postgresql.install
@@ -1 +1 @@
-usr/lib/sope-*/dbadaptors/PostgreSQL.gdladaptor
+usr/lib/GNUstep/GDLAdaptors-4.7/PostgreSQL.gdladaptor

diff --git a/debian/sope_SOPEVER_-libxmlsaxdriver.install b/debian/sope_SOPEVER_-libxmlsaxdriver.install
index ce541368357452e63c5fba2346a1ffcc7b1b5b1f..c849ec1813d81dd739315f5fe4f03f468ef2abe8 100644 (file)
--- a/debian/sope_SOPEVER_-libxmlsaxdriver.install
+++ b/debian/sope_SOPEVER_-libxmlsaxdriver.install
@@ -1 +1 @@
-usr/lib/sope-*/saxdrivers/libxmlSAXDriver.sax
+usr/lib/GNUstep/SaxDrivers-4.7/libxmlSAXDriver.sax

diff --git a/debian/sope_SOPEVER_-stxsaxdriver.install b/debian/sope_SOPEVER_-stxsaxdriver.install
index fe70242138b38b9fa1d633e5d62db84bf6902317..83cfadf0dad1d96313d4ad8970d2fda9378250e5 100644 (file)
--- a/debian/sope_SOPEVER_-stxsaxdriver.install
+++ b/debian/sope_SOPEVER_-stxsaxdriver.install
@@ -1 +1 @@
-usr/lib/sope-*/saxdrivers/STXSaxDriver.sax
+usr/lib/GNUstep/SaxDrivers-4.7/STXSaxDriver.sax

diff --git a/debian/sope_SOPEVER_-versitsaxdriver.install b/debian/sope_SOPEVER_-versitsaxdriver.install
index a15e9cfd97826f71e823c7ef1e3f25243398fa3d..0d497b21819408e82a47d94a9ecf4c79e7e7eb66 100644 (file)
--- a/debian/sope_SOPEVER_-versitsaxdriver.install
+++ b/debian/sope_SOPEVER_-versitsaxdriver.install
@@ -1 +1 @@
-usr/lib/sope-*/saxdrivers/versitSaxDriver.sax
+usr/lib/GNUstep/SaxDrivers-4.7/versitSaxDriver.sax