LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
sogo/SOPE/sope-deb.diff
C Robert 42c44ad910 debian packages stuff 
Monotone-Parent: 0e5ecbd534de16df76709927dc37b1bc83801546
Monotone-Revision: 94772b227e4be6ef77cbed6831b420c774e9d80d

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-28T19:07:51
Monotone-Branch: ca.inverse.sogo
2009-07-28 19:07:51 +00:00

172 lines
6.4 KiB
Diff
Raw Blame History

Index: debian/control
===================================================================
--- debian/control (revision 1660)
+++ debian/control (working copy)
@@ -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/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/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,6 +69,9 @@
ln -s /usr/share/misc/config.sub sope-core/NGStreams/config.sub
CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
+ ./configure --with-gnustep
+
+ CFLAGS="$(CFLAGS)" . $(GNUSTEP_SETUP); \
$(MAKE) $(MAKE_FLAGS) all
cp -R sope-appserver/mod_ngobjweb sope-appserver/mod_ngobjweb-apache2
@@ -119,18 +122,18 @@
# 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
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/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
Reference in a new issue View git blame Copy permalink