[packaging] Branch 'ucs/3.0/kolab-2.3' - 6 commits - debian/changelog debian/control debian/patches debian/pykolab.install

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Dec 6 15:16:05 CET 2012


 debian/changelog                            |    9 +++++++++
 debian/control                              |    3 ++-
 debian/patches/series                       |    1 +
 debian/patches/ucs-3.0-sieve-listener.patch |   17 +++++++++++++++++
 debian/pykolab.install                      |    2 ++
 5 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit b42c6faa6e6874f824b86fcba04069a29389acf9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 6 15:15:37 2012 +0100

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 0ed32ba..3145fe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pykolab (0.6~dev20121206-2) unstable; urgency=low
+
+  [ Jeroen van Meeuwen (Kolab Systems) ]
+  * Include and install kolab_sieve.py
+
+  [ Jeroen van Meeuwen ]
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>  Thu, 06 Dec 2012 15:15:01 +0100
+
 pykolab (0.6~dev20121206-1) unstable; urgency=low
 
   [ Jeroen van Meeuwen (Kolab Systems) ]


commit c28b5fcd84d1f6acd39cea484cd94e72f361c991
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 6 15:13:36 2012 +0100

    Refresh patch to use $(DESTDIR)

diff --git a/debian/patches/ucs-3.0-sieve-listener.patch b/debian/patches/ucs-3.0-sieve-listener.patch
index 7a83366..822992e 100644
--- a/debian/patches/ucs-3.0-sieve-listener.patch
+++ b/debian/patches/ucs-3.0-sieve-listener.patch
@@ -13,5 +13,5 @@
  	$(INSTALL) -p -m 755 bin/kolab_parse_telemetry.py $(DESTDIR)/$(sbindir)/kolab_parse_telemetry
  	$(INSTALL) -p -m 755 bin/kolab_smtp_access_policy.py $(DESTDIR)/$(libexecdir)/postfix/kolab_smtp_access_policy
 +
-+	mkdir -p $(datadir)/pyshared/pykolab/ucs/
-+	$(INSTALL) -p -m 755 ucs/kolab_sieve.py $(datadir)/pyshared/pykolab/ucs/
++	mkdir -p $(DESTDIR)/$(datadir)/pyshared/pykolab/ucs/
++	$(INSTALL) -p -m 755 ucs/kolab_sieve.py $(DESTDIR)/$(datadir)/pyshared/pykolab/ucs/


commit 49c4dac1d1cc78f4737569c6acff3047d9b69ad0
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 6 15:11:24 2012 +0100

    Install kolab_sieve.py

diff --git a/debian/pykolab.install b/debian/pykolab.install
index 1cd8f12..176dba6 100644
--- a/debian/pykolab.install
+++ b/debian/pykolab.install
@@ -21,3 +21,4 @@ usr/lib*/python*/*-packages/pykolab/plugins/sievemgmt/__init__.py
 usr/lib*/python*/*-packages/pykolab/translate.py
 usr/lib*/python*/*-packages/pykolab/utils.py
 usr/share/locale/*/LC_MESSAGES/pykolab.mo
+usr/share/pyshared/pykolab/ucs/kolab_sieve.py


commit d53b2973c8be336a0cef134c3352ef434422c62c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 6 15:10:45 2012 +0100

    Install kolab_sieve.py

diff --git a/debian/patches/series b/debian/patches/series
index e69de29..0725f7c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ucs-3.0-sieve-listener.patch
diff --git a/debian/patches/ucs-3.0-sieve-listener.patch b/debian/patches/ucs-3.0-sieve-listener.patch
new file mode 100644
index 0000000..7a83366
--- /dev/null
+++ b/debian/patches/ucs-3.0-sieve-listener.patch
@@ -0,0 +1,17 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,6 +17,7 @@
+ 	kolabd.py \
+ 	saslauthd.py \
+ 	setup-kolab.py \
++	ucs/kolab_sieve.py \
+ 	wallace.py
+ 
+ EXTRA_DIST = \
+@@ -202,3 +203,6 @@
+ 	$(INSTALL) -p -m 644 cyruslib.py $(DESTDIR)/$(pythondir)
+ 	$(INSTALL) -p -m 755 bin/kolab_parse_telemetry.py $(DESTDIR)/$(sbindir)/kolab_parse_telemetry
+ 	$(INSTALL) -p -m 755 bin/kolab_smtp_access_policy.py $(DESTDIR)/$(libexecdir)/postfix/kolab_smtp_access_policy
++
++	mkdir -p $(datadir)/pyshared/pykolab/ucs/
++	$(INSTALL) -p -m 755 ucs/kolab_sieve.py $(datadir)/pyshared/pykolab/ucs/


commit 13065515c3b89bdfadadd0225d3f83c962c72eb9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 6 15:05:30 2012 +0100

    Include the sievemgmt plugin

diff --git a/debian/pykolab.install b/debian/pykolab.install
index 0319cad..1cd8f12 100644
--- a/debian/pykolab.install
+++ b/debian/pykolab.install
@@ -17,6 +17,7 @@ usr/lib*/python*/*-packages/pykolab/plugins/__init__.py
 usr/lib*/python*/*-packages/pykolab/plugins/defaultfolders/__init__.py
 usr/lib*/python*/*-packages/pykolab/plugins/dynamicquota/__init__.py
 usr/lib*/python*/*-packages/pykolab/plugins/recipientpolicy/__init__.py
+usr/lib*/python*/*-packages/pykolab/plugins/sievemgmt/__init__.py
 usr/lib*/python*/*-packages/pykolab/translate.py
 usr/lib*/python*/*-packages/pykolab/utils.py
 usr/share/locale/*/LC_MESSAGES/pykolab.mo


commit b467758bfde476f073c55a735b8311f884f9d09a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Dec 6 15:03:59 2012 +0100

    Add dependency on python-sievelib (>= 0.5.2), remove dependencies on augeas and cheetah

diff --git a/debian/control b/debian/control
index 54271da..f09f1d1 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Depends: ${shlibs:Depends},
           python-ldap (>= 2.4~),
           python-pyasn1,
           python-pyasn1-modules,
+          python-sievelib (>= 0.5.2),
           python-sqlalchemy,
           adduser (>= 3.11),
           python-icalendar,
@@ -46,7 +47,7 @@ Description: Kolab Groupware daemon and utilities
 
 Package: kolab-cli
 Architecture: all
-Depends: pykolab (= ${binary:Version}), python, ${misc:Depends}, python-augeas, python-cheetah
+Depends: pykolab (= ${binary:Version}), python, ${misc:Depends}
 Description: Command-line utilities for Kolab
  This package includes command-line utilities for Kolab Groupware
 




More information about the packaging-commits mailing list