[Pkg-samba-maint] r2100 - trunk/openchange/debian

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2008-08-02 02:15:14 +0000 (Sat, 02 Aug 2008)
New Revision: 2100

Modified:
   trunk/openchange/debian/libmapi0.install
   trunk/openchange/debian/openchangeserver.install
   trunk/openchange/debian/rules
Log:
Avoid inclusion of files in two differnet packages, use prefix for datapath under /usr/share/openchange rather than /usr/share.

Modified: trunk/openchange/debian/libmapi0.install
===================================================================
--- trunk/openchange/debian/libmapi0.install	2008-08-01 20:18:38 UTC (rev 2099)
+++ trunk/openchange/debian/libmapi0.install	2008-08-02 02:15:14 UTC (rev 2100)
@@ -1,5 +1,4 @@
 usr/lib/libmapi.so.*
-usr/share/js/oc_profiles.js
-usr/share/setup/oc_profiles_basedn.ldif
-usr/share/setup/oc_profiles_init.ldif
-usr/share/setup/oc_profiles_schema.ldif
+usr/share/openchange/setup/oc_profiles_basedn.ldif
+usr/share/openchange/setup/oc_profiles_init.ldif
+usr/share/openchange/setup/oc_profiles_schema.ldif

Modified: trunk/openchange/debian/openchangeserver.install
===================================================================
--- trunk/openchange/debian/openchangeserver.install	2008-08-01 20:18:38 UTC (rev 2099)
+++ trunk/openchange/debian/openchangeserver.install	2008-08-02 02:15:14 UTC (rev 2100)
@@ -1,3 +1,4 @@
 usr/lib/samba/dcerpc_server/dcesrv_exchange.so
-usr/share/setup/*
-usr/share/js/*
+usr/share/openchange/setup/oc_provision_schema.ldif
+usr/share/openchange/setup/oc_provision_schema_modify.ldif
+usr/share/openchange/setup/oc_provision_configuration.ldif

Modified: trunk/openchange/debian/rules
===================================================================
--- trunk/openchange/debian/rules	2008-08-01 20:18:38 UTC (rev 2099)
+++ trunk/openchange/debian/rules	2008-08-02 02:15:14 UTC (rev 2100)
@@ -13,7 +13,7 @@
 build: build-stamp
 build-stamp: configure
 	dh_testdir
-	$(MAKE) all
+	$(MAKE) datadir=/usr/share/openchange all
 	touch $@
 
 clean:
@@ -39,7 +39,7 @@
 	dh_installdirs
 	mkdir -p $(CURDIR)/debian/tmp/usr/modules/dcerpc_server
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/nagios/plugins
-	$(MAKE) install installman DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) datadir=/usr/share/openchange install installman DESTDIR=$(CURDIR)/debian/tmp
 	mv $(CURDIR)/debian/tmp/usr/lib/nagios/check_exchange \
 	   $(CURDIR)/debian/tmp/usr/lib/nagios/plugins/check_exchange 
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/samba/dcerpc_server
@@ -54,6 +54,11 @@
 	dh_link -plibocpf0 usr/lib/libocpf.so.0.8 usr/lib/libocpf.so.0
 	# Don't install the testsuite for now
 	rm -f $(CURDIR)/debian/tmp/usr/torture/openchange.so
+	# JavaScript doesn't work, don't bother installing
+	rm -f $(CURDIR)/debian/tmp/usr/share/openchange/js/oc_profiles.js
+	rm -f $(CURDIR)/debian/tmp/usr/share/openchange/js/oc_provision.js
+	rm -f $(CURDIR)/debian/tmp/usr/share/openchange/setup/oc_provision
+	rm -f $(CURDIR)/debian/tmp/usr/share/openchange/setup/oc_profiles
 	dh_install --sourcedir=debian/tmp --list-missing --fail-missing
 
 get-orig-source: