Index: debian/sope_SOPEVER_-versitsaxdriver.install =================================================================== --- debian/sope_SOPEVER_-versitsaxdriver.install (revision 1660) +++ debian/sope_SOPEVER_-versitsaxdriver.install (working copy) @@ -1 +1,2 @@ usr/lib/sope-*/saxdrivers/versitSaxDriver.sax +usr/lib/GNUstep/SaxDrivers-4.9/versitSaxDriver.sax Index: debian/control =================================================================== --- debian/control (revision 1660) +++ debian/control (working copy) @@ -1,7 +1,7 @@ Source: sope Priority: extra Maintainer: Sebastian Ley -Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make-ogo, gobjc | objc-compiler, libfoundation1.1-dev, libobjc1, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev | postgresql-dev, libecpg-dev, apache-dev, apache2-threaded-dev | apache2-prefork-dev | apache2-dev, autotools-dev +Build-Depends: debhelper (>= 4.0.0), dpatch, gnustep-make, gobjc | objc-compiler, libxml2-dev, libldap2-dev | libldap-dev, libssl-dev, zlib1g-dev, libpq-dev | postgresql-dev, apache2-threaded-dev | apache2-prefork-dev | apache2-dev, autotools-dev Standards-Version: 3.6.1 Package: libsope4.9-dev @@ -265,18 +265,3 @@ . This parser enables SOPE's SAX engine to parse iCal and vCard files. -Package: libapache-mod-ngobjweb -Section: web -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.8), apache-common (>= 1.3.29) -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 | apache2.2-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. Index: debian/libsope-gdl1-_SOPEVER_-dev.install =================================================================== --- debian/libsope-gdl1-_SOPEVER_-dev.install (revision 1660) +++ debian/libsope-gdl1-_SOPEVER_-dev.install (working copy) @@ -1,2 +1,2 @@ -usr/include/GDLAccess +usr/include/GNUstep/GDLAccess usr/lib/libGDLAccess.so Index: debian/sope_SOPEVER_-appserver.install =================================================================== --- debian/sope_SOPEVER_-appserver.install (revision 1660) +++ debian/sope_SOPEVER_-appserver.install (working copy) @@ -1 +1,2 @@ -usr/sbin/sope-* +usr/lib/GNUstep/SoProducts-4.9 +usr/lib/GNUstep/WOxElemBuilders-4.9 Index: debian/control.in =================================================================== --- debian/control.in (revision 1660) +++ debian/control.in (working copy) @@ -264,19 +264,3 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE. . This parser enables SOPE's SAX engine to parse iCal and vCard files. - -Package: libapache-mod-ngobjweb -Section: web -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ucf (>= 0.8), apache-common (>= 1.3.29) -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 | apache2.2-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. Index: debian/libsope-appserver_SOPEVER_-dev.install =================================================================== --- debian/libsope-appserver_SOPEVER_-dev.install (revision 1660) +++ debian/libsope-appserver_SOPEVER_-dev.install (working copy) @@ -1,11 +1,10 @@ -usr/include/NGHttp -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/include/GNUstep/NGHttp +usr/include/GNUstep/NGObjWeb +usr/include/GNUstep/WOXML +usr/include/GNUstep/WOExtensions +usr/include/GNUstep/WEExtensions +usr/include/GNUstep/NGXmlRpc +usr/include/GNUstep/SoOFS usr/lib/libNGObjWeb.so usr/lib/libWOXML.so usr/lib/libWOExtensions.so Index: debian/libsope-ical_SOPEVER_-dev.install =================================================================== --- debian/libsope-ical_SOPEVER_-dev.install (revision 1660) +++ debian/libsope-ical_SOPEVER_-dev.install (working copy) @@ -1,2 +1,2 @@ -usr/include/NGiCal +usr/include/GNUstep/NGiCal usr/lib/libNGiCal.so Index: debian/sope_SOPEVER_-libxmlsaxdriver.install =================================================================== --- debian/sope_SOPEVER_-libxmlsaxdriver.install (revision 1660) +++ debian/sope_SOPEVER_-libxmlsaxdriver.install (working copy) @@ -1 +1,2 @@ usr/lib/sope-*/saxdrivers/libxmlSAXDriver.sax +usr/lib/GNUstep/SaxDrivers-4.9/libxmlSAXDriver.sax Index: debian/libsope-appserver_SOPEVER_.install =================================================================== --- debian/libsope-appserver_SOPEVER_.install (revision 1660) +++ debian/libsope-appserver_SOPEVER_.install (working copy) @@ -6,5 +6,6 @@ usr/lib/libSoOFS.so.* usr/lib/libWEPrototype.so.* usr/share/sope-*/ngobjweb +usr/lib/GNUstep/Libraries/Resources/NGObjWeb usr/lib/sope-*/products usr/lib/sope-*/wox-builders Index: debian/sope_SOPEVER_-stxsaxdriver.install =================================================================== --- debian/sope_SOPEVER_-stxsaxdriver.install (revision 1660) +++ debian/sope_SOPEVER_-stxsaxdriver.install (working copy) @@ -1 +1,2 @@ usr/lib/sope-*/saxdrivers/STXSaxDriver.sax +usr/lib/GNUstep/SaxDrivers-4.9/STXSaxDriver.sax Index: debian/rules =================================================================== --- debian/rules (revision 1660) +++ debian/rules (working copy) @@ -13,7 +13,7 @@ #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_SETUP=/usr/share/GNUstep/Makefiles/GNUstep.sh include Version SOPEVER=$(MAJOR_VERSION).$(MINOR_VERSION) @@ -57,9 +57,9 @@ config.status: configure dh_testdir CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \ - ./configure - -build: build-stamp controlfiles + ./configure --with-gnustep + +build: configure build-stamp controlfiles build-stamp: patch-stamp dh_testdir @@ -69,16 +69,10 @@ ln -s /usr/share/misc/config.sub sope-core/NGStreams/config.sub CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \ - $(MAKE) $(MAKE_FLAGS) all + ./configure --with-gnustep - 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 + $(MAKE) $(MAKE_FLAGS) all touch build-stamp @@ -119,21 +113,21 @@ # Add here commands to install the package into debian/tmp CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \ $(MAKE) $(MAKE_FLAGS) install \ - GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/$$GNUSTEP_SYSTEM_ROOT\ - INSTALL_ROOT_DIR=$(CURDIR)/debian/tmp\ + DESTDIR=$(CURDIR)/debian/tmp GNUSTEP_INSTALLATION_DOMAIN=SYSTEM +# INSTALL_ROOT_DIR=$(CURDIR)/debian/tmp\ FHS_INSTALL_ROOT=$(CURDIR)/debian/tmp/usr \ FHS_LIB_DIR=$(CURDIR)/debian/tmp/usr/lib/ #WARN: <- trailing slash unbroke build/packages?! - CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \ +# CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \ $(MAKE) $(MAKE_FLAGS) -C sope-appserver/mod_ngobjweb install \ - GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/usr/lib/apache/1.3 + GNUSTEP_INSTALLATION_DOMAIN=$(CURDIR)/debian/tmp/usr/lib/apache/1.3 - CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \ +# CFLAGS="$(CFLGAS)" . $(GNUSTEP_SETUP); \ $(MAKE) $(MAKE_FLAGS) -C sope-appserver/mod_ngobjweb-apache2 install \ - GNUSTEP_INSTALLATION_DIR=$(CURDIR)/debian/tmp/usr/lib/apache2/modules + GNUSTEP_INSTALLATION_DOMAIN=$(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 + #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 Index: debian/libsope-ldap_SOPEVER_-dev.install =================================================================== --- debian/libsope-ldap_SOPEVER_-dev.install (revision 1660) +++ debian/libsope-ldap_SOPEVER_-dev.install (working copy) @@ -1,2 +1,2 @@ -usr/include/NGLdap +usr/include/GNUstep/NGLdap usr/lib/libNGLdap.so Index: debian/sope_SOPEVER_-gdl1-postgresql.install =================================================================== --- debian/sope_SOPEVER_-gdl1-postgresql.install (revision 1660) +++ debian/sope_SOPEVER_-gdl1-postgresql.install (working copy) @@ -1 +1 @@ -usr/lib/sope-*/dbadaptors/PostgreSQL.gdladaptor +usr/lib/GNUstep/GDLAdaptors-4.9/PostgreSQL.gdladaptor Index: debian/libsope-mime_SOPEVER_-dev.install =================================================================== --- debian/libsope-mime_SOPEVER_-dev.install (revision 1660) +++ debian/libsope-mime_SOPEVER_-dev.install (working copy) @@ -1,4 +1,4 @@ -usr/include/NGMime -usr/include/NGImap4 -usr/include/NGMail +usr/include/GNUstep/NGMime +usr/include/GNUstep/NGImap4 +usr/include/GNUstep/NGMail usr/lib/libNGMime.so Index: debian/libsope-core_SOPEVER_-dev.install =================================================================== --- debian/libsope-core_SOPEVER_-dev.install (revision 1660) +++ debian/libsope-core_SOPEVER_-dev.install (working copy) @@ -1,6 +1,6 @@ -usr/include/NGExtensions -usr/include/EOControl -usr/include/NGStreams +usr/include/GNUstep/NGExtensions +usr/include/GNUstep/EOControl +usr/include/GNUstep/NGStreams usr/lib/libNGExtensions.so usr/lib/libEOControl.so usr/lib/libNGStreams.so Index: debian/libsope-xml_SOPEVER_-dev.install =================================================================== --- debian/libsope-xml_SOPEVER_-dev.install (revision 1660) +++ debian/libsope-xml_SOPEVER_-dev.install (working copy) @@ -1,6 +1,6 @@ -usr/include/DOM -usr/include/SaxObjC -usr/include/XmlRpc +usr/include/GNUstep/DOM +usr/include/GNUstep/SaxObjC +usr/include/GNUstep/XmlRpc usr/lib/libDOM.so usr/lib/libSaxObjC.so usr/lib/libXmlRpc.so