[pkg-kolab] r1473 - in libkolab-perl: trunk/debian trunk/debian/patches upstream
Mathieu Parent
sathieu at alioth.debian.org
Mon Jan 4 20:53:54 UTC 2010
Author: sathieu
Date: 2010-01-04 20:53:54 +0000 (Mon, 04 Jan 2010)
New Revision: 1473
Added:
libkolab-perl/trunk/debian/patches/60-fix-build.diff
libkolab-perl/upstream/libkolab-perl_2.2.3-20091217.orig.tar.gz
Modified:
libkolab-perl/trunk/debian/changelog
libkolab-perl/trunk/debian/patches/10-invoke-rc.diff
libkolab-perl/trunk/debian/patches/series
libkolab-perl/trunk/debian/uupdate-wrapper
Log:
New release 2.2.3 (20091217)
* Corrected uupdate-wrapper
* added 60-fix-build.diff to fix build
Modified: libkolab-perl/trunk/debian/changelog
===================================================================
--- libkolab-perl/trunk/debian/changelog 2010-01-04 16:39:51 UTC (rev 1472)
+++ libkolab-perl/trunk/debian/changelog 2010-01-04 20:53:54 UTC (rev 1473)
@@ -1,8 +1,11 @@
-libkolab-perl (1:2.2.1-20090331-3~pre1) UNRELEASED; urgency=low
+libkolab-perl (1:2.2.3-20091217-1~pre1) UNRELEASED; urgency=low
* Package snapshot
+ * New release 2.2.3 (20091217)
+ * Corrected uupdate-wrapper
+ * added 60-fix-build.diff to fix build
- -- Mathieu Parent <sathieu at debian.org> Tue, 17 Nov 2009 21:51:39 +0100
+ -- Mathieu Parent <sathieu at debian.org> Mon, 04 Jan 2010 17:44:59 +0100
libkolab-perl (1:2.2.1-20090331-2) unstable; urgency=low
Modified: libkolab-perl/trunk/debian/patches/10-invoke-rc.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/10-invoke-rc.diff 2010-01-04 16:39:51 UTC (rev 1472)
+++ libkolab-perl/trunk/debian/patches/10-invoke-rc.diff 2010-01-04 20:53:54 UTC (rev 1473)
@@ -8,7 +8,7 @@
===================================================================
--- a/lib/Kolab/Conf.pm
+++ b/lib/Kolab/Conf.pm
-@@ -843,38 +843,28 @@
+@@ -855,38 +855,28 @@
{
if ($haschanged{'slapd'}) {
&Kolab::log('K', 'Restarting OpenLDAP...');
@@ -56,7 +56,7 @@
===================================================================
--- a/sbin/kolab_bootstrap.in
+++ b/sbin/kolab_bootstrap.in
-@@ -109,7 +109,7 @@
+@@ -112,7 +112,7 @@
print ("Error: Found $name running on Port $port\n");
print ("Check your installation!\n");
print ("You must stop the service $name before running Kolab\n");
@@ -65,7 +65,7 @@
exit 1;
}
}
-@@ -612,7 +612,7 @@
+@@ -645,7 +645,7 @@
if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
print "\nkill temporary slapd\n\n";
@@ -74,7 +74,7 @@
sleep 1; # actually race should be impossible
system("killall -9 slapd >/dev/null 2>&1");
}
-@@ -665,7 +665,7 @@
+@@ -698,7 +698,7 @@
##### Slave server setup
print "stop running slapd (if any)\n";
@@ -83,7 +83,7 @@
# Make sure that no rogue demons are running
tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
-@@ -787,9 +787,9 @@
+@@ -822,9 +822,9 @@
is copied over to this slave. Please make sure that this slave is entered into the list
of kolabhosts on the master before proceeding.
EOS
@@ -95,11 +95,11 @@
" | $Kolab::config{'TAR'} -C $Kolab::config{'ldapserver_statedir'} -pxf -");
}
-@@ -880,6 +880,6 @@
+@@ -916,6 +916,6 @@
#system("@CONFIG_DIR@/kolab_sslcert.sh $fqdn");
print "kolab is now ready to run!\n";
-print "please run '$Kolab::config{'KOLABRC'} rc all start'\n";
+print "please restart all the daemons\n";
- print ("Use login=manager and passwd=$bind_pw when you log into\n");
+ print ("Use login=manager and passwd=" . Encode::decode_utf8($bind_pw) . " when you log into\n");
print ("the webinterface https://$fqdn$Kolab::config{'kolab_wui'} !\n");
Added: libkolab-perl/trunk/debian/patches/60-fix-build.diff
===================================================================
--- libkolab-perl/trunk/debian/patches/60-fix-build.diff (rev 0)
+++ libkolab-perl/trunk/debian/patches/60-fix-build.diff 2010-01-04 20:53:54 UTC (rev 1473)
@@ -0,0 +1,38 @@
+Goal: Fix build
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Changes are ongoing on HEAD
+
+Index: b/Makefile.PL
+===================================================================
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -170,11 +170,11 @@
+
+ # older versions of ExtUtils:MakeMaker don't support INSTALLVENDORSCRIPT
+ my $installscript = "";
+-if ($ExtUtils::MakeMaker::VERSION >= 6.42) {
++#if ($ExtUtils::MakeMaker::VERSION >= 6.42) {
+ $installscript = "INSTALLVENDORSCRIPT";
+-} else {
+- $installscript = "INSTALLSCRIPT";
+-}
++#} else {
++# $installscript = "INSTALLSCRIPT";
++#}
+
+ WriteMakefile(
+ NAME => 'perl-kolab',
+Index: b/kolab.mk
+===================================================================
+--- a/kolab.mk
++++ b/kolab.mk
+@@ -1,5 +1,6 @@
+ # Set KOLABDIR to the base directory of the OpenPKG/Kolab installation:
+-KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg)
++#KOLABDIR = $(shell openpkg rpm -q --qf '%{INSTALLPREFIX}\n' openpkg)
++KOLABDIR = /notexistentdir
+
+ ifeq ($(KOLABDIR),)
+ $(error Could not determine KOLABDIR!)
Modified: libkolab-perl/trunk/debian/patches/series
===================================================================
--- libkolab-perl/trunk/debian/patches/series 2010-01-04 16:39:51 UTC (rev 1472)
+++ libkolab-perl/trunk/debian/patches/series 2010-01-04 20:53:54 UTC (rev 1473)
@@ -1,3 +1,4 @@
10-invoke-rc.diff
30-bootstrap.diff
40-disable-amavis.diff
+60-fix-build.diff
Modified: libkolab-perl/trunk/debian/uupdate-wrapper
===================================================================
--- libkolab-perl/trunk/debian/uupdate-wrapper 2010-01-04 16:39:51 UTC (rev 1472)
+++ libkolab-perl/trunk/debian/uupdate-wrapper 2010-01-04 20:53:54 UTC (rev 1473)
@@ -1,11 +1,13 @@
#!/bin/sh
+set -e
+
upackage=perl-kolab
dpackage=libkolab-perl
version=$2
file=$3
rpm2cpio "$file" | \
-cpio --extract --quiet --to-stdout "${upackage}-*.tar.gz" | \
+cpio --extract --quiet --to-stdout "${upackage}-*.tar.gz" \
> "${dpackage}_${version}.orig.tar.gz"
rm "$file"
Added: libkolab-perl/upstream/libkolab-perl_2.2.3-20091217.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: libkolab-perl/upstream/libkolab-perl_2.2.3-20091217.orig.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
More information about the pkg-kolab-devel
mailing list