Improve Debian packages

packaging/debian/compat

@@ -1 +1 @@
-7
+8

packaging/debian/control

@@ -1,9 +1,9 @@
 Source: sogo
 Priority: optional
 Maintainer: Inverse Support <support@inverse.ca>
-Build-Depends: debhelper (>= 7.0.15), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libwbxml2-dev (>= 0.11.2), liblasso3-dev (>= 2.3.5)
+Build-Depends: debhelper (>= 8.0.0), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libwbxml2-dev (>= 0.11.2), liblasso3-dev (>= 2.3.5)
 Section: web
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: sogo
 Section: web

packaging/debian/control-squeeze

@@ -1,69 +0,0 @@
-Source: sogo
-Priority: optional
-Maintainer: Inverse Support <support@inverse.ca>
-Build-Depends: debhelper (>= 7.0.15), gobjc | objc-compiler, libgnustep-base-dev, libsope-appserver4.9-dev, libsope-core4.9-dev, libsope-gdl1-4.9-dev, libsope-ldap4.9-dev, libsope-mime4.9-dev, libsope-xml4.9-dev, libmemcached-dev, libxml2-dev, libsbjson-dev, libssl-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libmapi-dev, libmapistore-dev, libmapiproxy-dev, libwbxml2-dev, liblasso3-dev (>= 2.3.5)
-Section: web
-Standards-Version: 3.9.1
-
-Package: sogo
-Section: web
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, sope4.9-libxmlsaxdriver, sope4.9-db-connector, gnustep-make, libcurl3, liblasso3 (>= 2.3.5)
-Recommends: memcached
-Suggests: nginx
-Description: a modern and scalable groupware
- SOGo is a groupware server built around OpenGroupware.org (OGo) and
- the SOPE application server with focus on scalability.
- The Inverse edition of this project has many feature enhancements:
-  * CalDAV and GroupDAV compliance
-  * full handling of vCard as well as vCalendar/iCalendar formats
-  * support for folder sharing and ACLs
- .
- The Web interface has been rewritten in an AJAX fashion to provide a faster
- UI for the users, consistency in look and feel with the Mozilla applications,
- and to reduce the load of the transactions on the server.
-
-Package: sogo-dev
-Section: devel
-Architecture: any
-Depends: sogo (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: sogo (<< ${binary:Version})
-Description: a modern and scalable groupware - development files
- SOGo is a groupware server built around OpenGroupware.org (OGo) and
- the SOPE application server with focus on scalability.
- .
- This package contains the development files for developing SOGo modules.
-
-Package: sogo-openchange
-Section: net
-Priority: extra
-Architecture: any
-Depends: sogo (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: a modern and scalable groupware - OpenChange backend
- SOGo is a groupware server built around OpenGroupware.org (OGo) and
- the SOPE application server with focus on scalability.
- .
- This package contains the backend plugin for using SOGo as a backend
- to OpenChange.
-
-Package: sogo-activesync
-Section: web
-Priority: extra
-Architecture: any
-Depends: sogo (= ${binary:Version}), libwbxml2-0,  ${shlibs:Depends}, ${misc:Depends}
-Description: a modern and scalable groupware - ActiveSync module
- SOGo is a groupware server built around OpenGroupware.org (OGo) and
- the SOPE application server with focus on scalability.
- .
- This package provides Microsoft EAS support for SOGo.
-
-Package: sogo-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: sogo (= ${binary:Version}), ${misc:Depends}
-Description: a modern and scalable groupware - debugging symbols
- SOGo is a groupware server built around OpenGroupware.org (OGo) and
- the SOPE application server with focus on scalability.
- .
- This package contains the debugging symbols for SOGo.

packaging/debian/rules

@@ -4,11 +4,8 @@ export DH_VERBOSE=1
 # export DH_OPTIONS="-p sogo"
 
 DESTDIR=$(CURDIR)/debian/tmp
-DIST_CODENAME=$(shell lsb_release -cs)
 
-#ifeq ($(DIST_CODENAME), squeeze)
 SAML2_CONFIG=--enable-saml2
-#endif
 
 include /etc/GNUstep/GNUstep.conf
 include /usr/share/GNUstep/Makefiles/common.make
@@ -43,11 +40,11 @@ clean:
 #	  then \
 #	    (cd OpenChange; make clean); \
 #	  fi; \
-	  (cd ActiveSync; $(MAKE) clean); \
 	  make clean; \
 	fi
 #	-rm -f OpenChange/MAPIStorePropertySelectors.*
 	-rm -f config.make
+	(cd ActiveSync; $(MAKE) clean); \
 	dh_clean 
 
 install: install-arch
@@ -105,7 +102,7 @@ binary-arch: build-arch install-arch
 	  ln -s GNUstep/Frameworks/SOGo.framework/Versions/*/libSOGo* ./ )
 	dh_compress -X.py -X.sh
 	dh_fixperms
-	dh_makeshlibs -X/usr/lib/mapistore_backends
+#	dh_makeshlibs -X/usr/lib/mapistore_backends
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol

packaging/debian/sogo-openchange.install

@@ -1,2 +0,0 @@
-usr/lib/mapistore_backends/*
-usr/lib/GNUstep/SOGo/SOGoBackend.MAPIStore

packaging/debian/sogo.overrides

@@ -1,4 +1 @@
-sogo: embedded-javascript-library usr/lib/GNUstep/SOGo/WebServerResources/prototype.js
-sogo: embedded-javascript-library usr/lib/GNUstep/SOGo/WebServerResources/jquery.js
-sogo: embedded-javascript-library usr/lib/GNUstep/SOGo/WebServerResources/jquery-ui.js
 sogo: package-name-doesnt-match-sonames libGDLContentStore4.9 libNGCards4.9 libSOGoUI1.0