net-mail/zarafa: Bump and remove old

(Portage version: 2.2.0_alpha19-r1/svn/Linux x86_64, RepoMan options: --force)

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2814 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2011-01-29 04:42:35 +00:00
parent 4cadbf0954
commit 46f5ca1428
7 changed files with 129 additions and 206 deletions

View File

@@ -0,0 +1,44 @@
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
@@ -34,7 +34,7 @@
build_triplet = @build@
host_triplet = @host@
subdir = php-ext
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
+DIST_COMMON = $(dist_data_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -86,7 +86,7 @@
DIST_SOURCES = $(mapi_la_SOURCES)
dist_dataDATA_INSTALL = $(INSTALL_DATA)
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
+DATA = $(dist_data_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -406,23 +406,6 @@
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
rm -f "$(DESTDIR)$(datadir)/$$f"; \
done
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
- done
-
-uninstall-dist_sysconfDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
- done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \

View File

@@ -0,0 +1,10 @@
--- provider/libserver/ECIndexer.h~ 2011-01-24 15:55:05.000000000 +0000
+++ provider/libserver/ECIndexer.h 2011-01-25 09:56:36.786592403 +0000
@@ -49,6 +49,7 @@
#ifndef ECINDEXER_H
#define ECINDEXER_H
+#endif
class ECConfig;
class ECLogger;

View File

@@ -0,0 +1,19 @@
--- installer/linux/Makefile.in~ 2011-01-24 12:06:15.000000000 +0000
+++ installer/linux/Makefile.in 2011-01-25 10:36:31.784330713 +0000
@@ -693,8 +693,6 @@
fi
install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--- installer/linux/Makefile.am~ 2011-01-24 11:03:45.000000000 +0000
+++ installer/linux/Makefile.am 2011-01-25 10:36:27.234524257 +0000
@@ -108,5 +108,3 @@
fi
install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config