propagate from branch 'ca.inverse.sogo.1_3_17' (head f4ba8f9b9e95c37f5efc0f2b75a7a8968237c3ca)
to branch 'ca.inverse.sogo' (head 416420cf52205aeff9f09edaf779bee70939318d) Monotone-Parent: 416420cf52205aeff9f09edaf779bee70939318d Monotone-Parent: f4ba8f9b9e95c37f5efc0f2b75a7a8968237c3ca Monotone-Revision: 30fe613e38d8656f1c490d6fb5d1a29f2125aa2b Monotone-Author: jraby@inverse.ca Monotone-Date: 2012-07-25T19:15:52 Monotone-Branch: ca.inverse.sogomaint-2.0.2
Jean Raby
commit
136e83ba60
|
|
@ -6,6 +6,10 @@
|
|||
|
||||
2012-07-25 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* SoObjects/Mailer/SOGoMailFolder.m
|
||||
(-deleteUIDs:useTrashFolder:inContext:): fixed comparison with the
|
||||
trash folder name when using subfolders (ex: INBOX/Trash).
|
||||
|
||||
* SoObjects/SOGo/SOGoSieveManager.m
|
||||
(-updateFiltersForLogin:authname:password:account:): write the
|
||||
filters before the vacation auto-reply.
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ static NSString *defaultUserID = @"anyone";
|
|||
|
||||
// If we are deleting messages within the Trash folder itself, we
|
||||
// do not, of course, try to move messages to the Trash folder.
|
||||
if ([folderName isEqualToString: [self relativeImap4Name]])
|
||||
if ([folderName isEqualToString: [imap4 imap4FolderNameForURL: [self imap4URL]]])
|
||||
{
|
||||
*withTrash = NO;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,20 +35,6 @@ Description: a modern and scalable groupware - development files
|
|||
.
|
||||
This package contains the development files for developing SOGo modules.
|
||||
|
||||
Package: sogo-openchange
|
||||
Pre-Depends: ${misc:Pre-Depends}
|
||||
Multi-Arch: same
|
||||
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-dbg
|
||||
Section: debug
|
||||
Priority: extra
|
||||
|
|
|
|||
|
|
@ -20,9 +20,6 @@ build-arch: build-arch-stamp
|
|||
build-arch-stamp: config.make
|
||||
# Add here commands to compile the arch part of the package.
|
||||
$(MAKE)
|
||||
if pkg-config --atleast-version=1.0 libmapi; \
|
||||
then (cd OpenChange; $(MAKE)); \
|
||||
fi
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
|
|
@ -34,15 +31,8 @@ clean:
|
|||
-find Tests -name "*.pyc" -exec rm -f {} \;
|
||||
if [ -f config.make ]; \
|
||||
then \
|
||||
if pkg-config --atleast-version=1.0 libmapi; \
|
||||
then \
|
||||
(cd OpenChange; make clean); \
|
||||
fi; \
|
||||
make clean; \
|
||||
fi
|
||||
-rm -f OpenChange/MAPIStorePropertySelectors.*
|
||||
-find OpenChange -type d -name "unrtf-*" -exec rm -rf {} \;
|
||||
-rm -f OpenChange/unrtf*-stamp
|
||||
-rm -f config.make
|
||||
dh_clean
|
||||
|
||||
|
|
@ -60,18 +50,6 @@ install-arch: build-arch
|
|||
# dh_installdirs -s
|
||||
|
||||
$(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install
|
||||
if pkg-config --atleast-version=1.0 libmapi; \
|
||||
then \
|
||||
(cd OpenChange; \
|
||||
$(MAKE) \
|
||||
DESTDIR=$(DESTDIR) \
|
||||
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
|
||||
install); \
|
||||
rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so.1; \
|
||||
rm -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so; \
|
||||
mv -f $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/libMAPIStoreSOGo.so.1.0.0 \
|
||||
$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/mapistore_backends/SOGo.so; \
|
||||
fi
|
||||
|
||||
mkdir -p debian/tmp/etc/default
|
||||
cp Scripts/sogo-default debian/tmp/etc/default/sogo
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@ build-arch: build-arch-stamp
|
|||
build-arch-stamp: config.make
|
||||
# Add here commands to compile the arch part of the package.
|
||||
$(MAKE)
|
||||
if pkg-config --atleast-version=1.0 libmapi; \
|
||||
then (cd OpenChange; $(MAKE)); \
|
||||
fi
|
||||
touch $@
|
||||
|
||||
clean:
|
||||
|
|
@ -33,15 +30,8 @@ clean:
|
|||
-find Tests -name "*.pyc" -exec rm -f {} \;
|
||||
if [ -f config.make ]; \
|
||||
then \
|
||||
if pkg-config --atleast-version=1.0 libmapi; \
|
||||
then \
|
||||
(cd OpenChange; make clean); \
|
||||
fi; \
|
||||
make clean; \
|
||||
fi
|
||||
-rm -f OpenChange/MAPIStorePropertySelectors.*
|
||||
-find OpenChange -type d -name "unrtf-*" -exec rm -rf {} \;
|
||||
-rm -f OpenChange/unrtf*-stamp
|
||||
-rm -f config.make
|
||||
dh_clean
|
||||
|
||||
|
|
@ -59,18 +49,6 @@ install-arch: build-arch
|
|||
# dh_installdirs -s
|
||||
|
||||
$(MAKE) DESTDIR=$(DESTDIR) GNUSTEP_INSTALLATION_DOMAIN=SYSTEM install
|
||||
if pkg-config --atleast-version=1.0 libmapi; \
|
||||
then \
|
||||
(cd OpenChange; \
|
||||
$(MAKE) \
|
||||
DESTDIR=$(DESTDIR) \
|
||||
GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \
|
||||
install); \
|
||||
rm -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so.1; \
|
||||
rm -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so; \
|
||||
mv -f $(DESTDIR)/usr/lib/mapistore_backends/libMAPIStoreSOGo.so.1.0.0 \
|
||||
$(DESTDIR)/usr/lib/mapistore_backends/SOGo.so; \
|
||||
fi
|
||||
|
||||
mkdir -p debian/tmp/etc/default
|
||||
cp Scripts/sogo-default debian/tmp/etc/default/sogo
|
||||
|
|
|
|||
Loading…
Reference in New Issue