[Pkg-samba-maint] r2493 - in trunk/openchange: . .bzr-builddeb debian

ctrlsoft-guest at alioth.debian.org ctrlsoft-guest at alioth.debian.org
Sat Jan 24 21:25:47 UTC 2009


tags 511941 pending
thanks

Author: ctrlsoft-guest
Date: 2009-01-24 21:25:47 +0000 (Sat, 24 Jan 2009)
New Revision: 2493

Modified:
   trunk/openchange/
   trunk/openchange/.bzr-builddeb/default.conf
   trunk/openchange/debian/build-orig.sh
   trunk/openchange/debian/changelog
   trunk/openchange/debian/compat
   trunk/openchange/debian/control
   trunk/openchange/debian/copyright
   trunk/openchange/debian/libmapi-dev.install
   trunk/openchange/debian/libmapi0.install
   trunk/openchange/debian/libmapi0.links
   trunk/openchange/debian/libmapiadmin-dev.install
   trunk/openchange/debian/libmapiadmin0.install
   trunk/openchange/debian/libmapiadmin0.links
   trunk/openchange/debian/libmapiproxy-dev.install
   trunk/openchange/debian/libmapiproxy0.install
   trunk/openchange/debian/libmapiproxy0.links
   trunk/openchange/debian/libocpf-dev.install
   trunk/openchange/debian/libocpf0.install
   trunk/openchange/debian/libocpf0.links
   trunk/openchange/debian/openchangeclient.install
   trunk/openchange/debian/openchangeproxy.install
   trunk/openchange/debian/openchangeserver.install
   trunk/openchange/debian/rules
   trunk/openchange/debian/watch
Log:
Depend on python and install server provision scripts.


Property changes on: trunk/openchange
___________________________________________________________________
Name: bzr:revision-info
   - 
   + properties: 
	branch-nick: trunk/openchange
	bugs: http://bugs.debian.org/511941 fixed

Name: bzr:file-ids
   - 
   + .bzr-builddeb	2210 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange%2F.bzr-builddeb
.bzr-builddeb/default.conf	2210 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange%2F.bzr-builddeb%2Fdefault.conf
debian	1460 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian
debian/build-orig.sh	1695 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fbuild-orig.sh
debian/changelog	1460 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fchangelog
debian/compat	1460 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fcompat
debian/control	1460 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fcontrol
debian/copyright	1460 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fcopyright
debian/libmapi-dev.install	1463 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibmapi-dev.install
debian/libmapi0.install	1463 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibmapi0.install
debian/libmapi0.links	2107 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange%2Fdebian%2Flibmapi0.links
debian/libmapiadmin-dev.install	1695 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibmapiadmin-dev.install
debian/libmapiadmin0.install	1695 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibmapiadmin0.install
debian/libmapiadmin0.links	2107 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange%2Fdebian%2Flibmapiadmin0.links
debian/libmapiproxy-dev.install	1933 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibmapiproxy-dev.install
debian/libmapiproxy0.install	1933 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibmapiproxy0.install
debian/libmapiproxy0.links	2107 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange%2Fdebian%2Flibmapiproxy0.links
debian/libocpf-dev.install	1863 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibocpf-dev.install
debian/libocpf0.install	1863 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Flibocpf0.install
debian/libocpf0.links	2107 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange%2Fdebian%2Flibocpf0.links
debian/openchangeclient.install	1463 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fopenchangeclient.install
debian/openchangeproxy.install	1926 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fopenchangeproxy.install
debian/openchangeserver.install	1695 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fopenchangeserver.install
debian/rules	1460 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Frules
debian/watch	1895 at fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:debian%2Fwatch

Name: bzr:text-parents
   + .bzr-builddeb	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2210
.bzr-builddeb/default.conf	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2210
debian/build-orig.sh	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2167
debian/changelog	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2334
debian/compat	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1460
debian/control	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2334
debian/copyright	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2131
debian/libmapi-dev.install	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2167
debian/libmapi0.install	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2202
debian/libmapi0.links	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2107
debian/libmapiadmin-dev.install	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1863
debian/libmapiadmin0.install	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1695
debian/libmapiadmin0.links	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2107
debian/libmapiproxy-dev.install	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1933
debian/libmapiproxy0.install	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1933
debian/libmapiproxy0.links	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2107
debian/libocpf-dev.install	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1863
debian/libocpf0.install	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1863
debian/libocpf0.links	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2107
debian/openchangeclient.install	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2167
debian/openchangeproxy.install	svn-v3-list-QlpoOTFBWSZTWXjvZgIAABNRgAAQABC6yx4AIAAhpMgZM0hTAATTCKjB2FDYKg0HJiWVLiDdiBPxdyRThQkHjvZgIA..:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk%2Fopenchange:1933
debian/openchangeserver.install	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2334
debian/rules	svn-v4:fc4039ab-9d04-0410-8cac-899223bdd6b0:trunk/openchange:2334


Modified: trunk/openchange/.bzr-builddeb/default.conf
===================================================================

Modified: trunk/openchange/debian/build-orig.sh
===================================================================

Modified: trunk/openchange/debian/changelog
===================================================================
--- trunk/openchange/debian/changelog	2009-01-24 21:22:30 UTC (rev 2492)
+++ trunk/openchange/debian/changelog	2009-01-24 21:25:47 UTC (rev 2493)
@@ -1,3 +1,16 @@
+openchange (1:0.8-2) experimental; urgency=low
+
+  * Depend on python and install server provision scripts.  (Closes: #511941)
+  * Filter code name out of version in debian/watch.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sat, 24 Jan 2009 21:43:19 +0100
+
+openchange (1:0.8-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Wed, 21 Jan 2009 00:56:36 +0100
+
 openchange (1.0~svn991-1) experimental; urgency=low
 
   * New upstream snapshot. (Closes: #504968, #507061)

Modified: trunk/openchange/debian/compat
===================================================================

Modified: trunk/openchange/debian/control
===================================================================
--- trunk/openchange/debian/control	2009-01-24 21:22:30 UTC (rev 2492)
+++ trunk/openchange/debian/control	2009-01-24 21:25:47 UTC (rev 2493)
@@ -2,22 +2,24 @@
 Section: net
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
-Uploaders: Jelmer Vernooij <jelmer at samba.org>
+Uploaders: Jelmer Vernooij <jelmer at debian.org>
 Build-Depends: debhelper (>> 5.0.0), libparse-pidl-perl, libmagic-dev,
-	libdcerpc-dev (>= 4.0.0~alpha5+20090105), libtalloc-dev, 
-	libldb-samba4-dev (>= 4.0.0~alpha5+20090105), 
-	samba4-dev (>= 4.0.0~alpha5+20090105), 
-	libsamba-hostconfig-dev (>= 4.0.0~alpha5+20090105), flex, bison, 
-	libpopt-dev, libtorture-dev, doxygen, pkg-config
+	libdcerpc-dev (>= 4.0.0~alpha6), libtalloc-dev, 
+	libldb-samba4-dev (>= 4.0.0~alpha6), 
+	samba4-dev (>= 4.0.0~alpha6), 
+	libsamba-hostconfig-dev (>= 4.0.0~alpha6), flex, bison, 
+	libpopt-dev, libtorture-dev, doxygen, pkg-config, 
+	python-dev, python-central (>= 0.5)
 Standards-Version: 3.8.0
 Vcs-Bzr: svn://svn.debian.org/pkg-samba/trunk/openchange
 Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/openchange
 Homepage: http://www.openchange.org/
 DM-Upload-Allowed: yes
+XS-Python-Version: >= 2.4
 
 Package: libmapi0
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Client library for the MAPI protocol
  This library provides a client-side implementation of the MAPI protocol 
  that is used by Microsoft Exchange and Outlook.
@@ -28,7 +30,7 @@
 Package: libmapi-dev
 Section: libdevel
 Architecture: any
-Depends: libc6-dev, libmapi0 (= ${binary:Version})
+Depends: libc6-dev, libmapi0 (= ${binary:Version}), ${misc:Depends}
 Description: Development files for the MAPI client library
  This library provides a client-side implementation of the MAPI protocol 
  that is used by Microsoft Exchange and Outlook.
@@ -40,7 +42,7 @@
 
 Package: libocpf0
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Scripting library for the MAPI protocol
  Library that reads and runs files in the OCPF scripting language,
  a domain-specific language for the MAPI protocol.
@@ -51,7 +53,7 @@
 Package: libocpf-dev
 Section: libdevel
 Architecture: any
-Depends: libc6-dev, libocpf0 (= ${binary:Version})
+Depends: libc6-dev, libocpf0 (= ${binary:Version}), ${misc:Depends}
 Description: Development files for the OCPF library
  Library that reads and runs files in the OCPF scripting language,
  a domain-specific language for the MAPI protocol.
@@ -63,14 +65,15 @@
 
 Package: openchangeclient
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Command-line client for the MAPI (Exchange/Outlook) protocol
  Simple command-line client that allows fetching mail from and sending 
  mail using a MAPI server. 
 
 Package: openchangeserver
 Architecture: any
-Depends: ${shlibs:Depends}, samba4 (>= 4.0.0~)
+Depends: ${shlibs:Depends}, samba4 (>= 4.0.0~), ${python:Depends}, ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Experimental MAPI (Exchange/Outlook) server
  This is a plugin for Samba 4 that adds server-side support for the MAPI 
  protocol that is used by Microsoft Outlook and Exchange.
@@ -79,7 +82,8 @@
 
 Package: openchangeproxy
 Architecture: any
-Depends: ${shlibs:Depends}, samba4 (>= 4.0.0~)
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, samba4 (>= 4.0.0~), ${misc:Depends}
 Description: Experimental MAPI (Exchange/Outlook) proxy
  This is a plugin for Samba 4 that provides a proxy for the MAPI protocol.
  .
@@ -88,14 +92,15 @@
 Package: libmapiadmin0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Administration client library for the MAPI (Exchange/Outlook) protocol
  Library that allows remote administration of MAPI (Exchange/Outlook) servers. 
 
 Package: libmapiadmin-dev
 Section: libdevel
 Architecture: any
-Depends: libc6-dev, libmapiadmin0 (= ${binary:Version})
+Depends: libc6-dev, libmapiadmin0 (= ${binary:Version}), ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Development files for the MAPI administration client library
  Library that allows remote administration of MAPI (Exchange/Outlook) servers. 
  .
@@ -104,7 +109,8 @@
 Package: libmapiproxy0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Proxy library for the MAPI (Exchange/Outlook) protocol
  This is a library that allows proxying of the MAPI (Exchange/Outlook) 
  protocol. 
@@ -112,7 +118,8 @@
 Package: libmapiproxy-dev
 Section: libdevel
 Architecture: any
-Depends: libc6-dev, libmapiproxy0 (= ${binary:Version})
+Depends: libc6-dev, libmapiproxy0 (= ${binary:Version}), ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Development files for the MAPI proxy library
  Library that allows proxying of the MAPI (Exchange/Outlook) protocol.
  .

Modified: trunk/openchange/debian/copyright
===================================================================

Modified: trunk/openchange/debian/libmapi-dev.install
===================================================================

Modified: trunk/openchange/debian/libmapi0.install
===================================================================

Modified: trunk/openchange/debian/libmapi0.links
===================================================================

Modified: trunk/openchange/debian/libmapiadmin-dev.install
===================================================================

Modified: trunk/openchange/debian/libmapiadmin0.install
===================================================================

Modified: trunk/openchange/debian/libmapiadmin0.links
===================================================================

Modified: trunk/openchange/debian/libmapiproxy-dev.install
===================================================================

Modified: trunk/openchange/debian/libmapiproxy0.install
===================================================================

Modified: trunk/openchange/debian/libmapiproxy0.links
===================================================================

Modified: trunk/openchange/debian/libocpf-dev.install
===================================================================

Modified: trunk/openchange/debian/libocpf0.install
===================================================================

Modified: trunk/openchange/debian/libocpf0.links
===================================================================

Modified: trunk/openchange/debian/openchangeclient.install
===================================================================

Modified: trunk/openchange/debian/openchangeproxy.install
===================================================================

Modified: trunk/openchange/debian/openchangeserver.install
===================================================================
--- trunk/openchange/debian/openchangeserver.install	2009-01-24 21:22:30 UTC (rev 2492)
+++ trunk/openchange/debian/openchangeserver.install	2009-01-24 21:25:47 UTC (rev 2493)
@@ -3,3 +3,4 @@
 usr/share/openchange/setup/oc_provision_configuration.ldif
 usr/share/openchange/setup/oc_provision_schema_ADSC.ldif
 usr/share/openchange/setup/oc_provision_schema.ldif
+usr/lib/python*/site-packages/openchange

Modified: trunk/openchange/debian/rules
===================================================================
--- trunk/openchange/debian/rules	2009-01-24 21:22:30 UTC (rev 2492)
+++ trunk/openchange/debian/rules	2009-01-24 21:25:47 UTC (rev 2493)
@@ -7,7 +7,8 @@
 	./configure --with-fhs \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
-		--with-modulesdir=/usr/lib/openchange
+		--with-modulesdir=/usr/lib/openchange \
+		--disable-pymapi
 	touch $@
 
 build: build-stamp
@@ -50,14 +51,8 @@
 	dh_testroot
 	# 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 -rf $(CURDIR)/debian/tmp/usr/share/openchange/js
-	rm -f $(CURDIR)/debian/tmp/usr/share/openchange/setup/oc_provision
-	rm -f $(CURDIR)/debian/tmp/usr/share/openchange/setup/oc_profiles
 	# No libmapi++ package for now
 	rm -rf $(CURDIR)/debian/tmp/usr/include/libmapi++
-	# No Python for now..
-	rm -rf $(CURDIR)/debian/tmp/usr/lib/python*
 	dh_install --sourcedir=debian/tmp --list-missing --fail-missing
 
 get-orig-source:
@@ -69,6 +64,7 @@
 	dh_strip -a
 	dh_link -a
 	dh_perl -a
+	dh_pycentral -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a

Modified: trunk/openchange/debian/watch
===================================================================




More information about the Pkg-samba-maint mailing list