[Pkg-citadel-commit] r64 - citadel/trunk/debian citadel/trunk/debian/patches webcit/trunk/debian webcit/trunk/debian/patches
dothebart-guest at alioth.debian.org
dothebart-guest at alioth.debian.org
Wed Apr 23 18:39:34 UTC 2008
Author: dothebart-guest
Date: 2008-04-23 18:39:33 +0000 (Wed, 23 Apr 2008)
New Revision: 64
Removed:
citadel/trunk/debian/patches/setup_check_etc_services_env.diff
webcit/trunk/debian/patches/webserver_to_webcit.diff
Modified:
citadel/trunk/debian/changelog
citadel/trunk/debian/citadel-server.install
citadel/trunk/debian/patches/series
citadel/trunk/debian/rules
webcit/trunk/debian/changelog
webcit/trunk/debian/patches/series
Log:
* removed prepatches
* removed moves
* renamed files in citadel-server.install
* updated changelog
Modified: citadel/trunk/debian/changelog
===================================================================
--- citadel/trunk/debian/changelog 2008-04-23 10:25:56 UTC (rev 63)
+++ citadel/trunk/debian/changelog 2008-04-23 18:39:33 UTC (rev 64)
@@ -1,3 +1,11 @@
+citadel (7.35-7) UNRELEASED; urgency=low
+
+ [ Wilfried Goesgens ]
+ * new upstream Version
+ * removed prepatches
+
+ -- Michael Meskes <meskes at debian.org> Wed, 23 Apr 2008 20:03:40 +0200
+
citadel (7.33-6) UNRELEASED; urgency=low
* Added Russian translation, closes: #476830
Modified: citadel/trunk/debian/citadel-server.install
===================================================================
--- citadel/trunk/debian/citadel-server.install 2008-04-23 10:25:56 UTC (rev 63)
+++ citadel/trunk/debian/citadel-server.install 2008-04-23 18:39:33 UTC (rev 64)
@@ -8,12 +8,12 @@
debian/tmp/usr/lib/citadel-server/chkpw
debian/tmp/usr/lib/citadel-server/citserver.unstripped
debian/tmp/usr/lib/citadel-server/migrate_aliases.sh
-debian/tmp/usr/sbin/aidepost
+debian/tmp/usr/lib/citadel-server/aidepost
+debian/tmp/usr/lib/citadel-server/msgform
+debian/tmp/usr/lib/citadel-server/userlist
debian/tmp/usr/sbin/citmail
debian/tmp/usr/sbin/citserver
-debian/tmp/usr/sbin/msgform
debian/tmp/usr/sbin/sendcommand
-debian/tmp/usr/sbin/cituserlist
database_cleanup.sh usr/share/doc/citadel-server/examples
docs/welcomemail.html usr/share/doc/citadel-server
Modified: citadel/trunk/debian/patches/series
===================================================================
--- citadel/trunk/debian/patches/series 2008-04-23 10:25:56 UTC (rev 63)
+++ citadel/trunk/debian/patches/series 2008-04-23 18:39:33 UTC (rev 64)
@@ -1 +1 @@
-setup_check_etc_services_env.diff
+
Deleted: citadel/trunk/debian/patches/setup_check_etc_services_env.diff
===================================================================
--- citadel/trunk/debian/patches/setup_check_etc_services_env.diff 2008-04-23 10:25:56 UTC (rev 63)
+++ citadel/trunk/debian/patches/setup_check_etc_services_env.diff 2008-04-23 18:39:33 UTC (rev 64)
@@ -1,15 +0,0 @@
-Index: setup.c
-===================================================================
---- citadel/setup.c (revision 6192)
-+++ citadel/setup.c (working copy)
-@@ -1237,7 +1237,9 @@
- unlink("citadel.log");
- unlink("weekly");
-
-- check_services_entry(); /* Check /etc/services */
-+ if (((setup_type == UI_SILENT) && (getenv("ALTER_ETC_SERVICES")!=NULL)) ||
-+ (setup_type != UI_SILENT))
-+ check_services_entry(); /* Check /etc/services */
- #ifndef __CYGWIN__
- delete_inittab_entry(); /* Remove obsolete /etc/inittab entry */
- check_xinetd_entry(); /* Check /etc/xinetd.d/telnet */
Modified: citadel/trunk/debian/rules
===================================================================
--- citadel/trunk/debian/rules 2008-04-23 10:25:56 UTC (rev 63)
+++ citadel/trunk/debian/rules 2008-04-23 18:39:33 UTC (rev 64)
@@ -106,7 +106,6 @@
# other packages also have a binary named userlist
# let's rename ours
- -mv $(DEB_DESTDIR)/usr/sbin/userlist $(DEB_DESTDIR)/usr/sbin/cituserlist
dh_install -s
Modified: webcit/trunk/debian/changelog
===================================================================
--- webcit/trunk/debian/changelog 2008-04-23 10:25:56 UTC (rev 63)
+++ webcit/trunk/debian/changelog 2008-04-23 18:39:33 UTC (rev 64)
@@ -1,3 +1,11 @@
+webcit (7.35-4) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * new upstream Version
+ * removed prepatches
+
+ -- Michael Meskes <meskes at debian.org> Wed, 23 Apr 2008 20:03:40 +0200
+
webcit (7.34-dfsg-3) unstable; urgency=low
* Added French translation, closes: #477126
Modified: webcit/trunk/debian/patches/series
===================================================================
--- webcit/trunk/debian/patches/series 2008-04-23 10:25:56 UTC (rev 63)
+++ webcit/trunk/debian/patches/series 2008-04-23 18:39:33 UTC (rev 64)
@@ -1 +1 @@
-webserver_to_webcit.diff
+
Deleted: webcit/trunk/debian/patches/webserver_to_webcit.diff
===================================================================
--- webcit/trunk/debian/patches/webserver_to_webcit.diff 2008-04-23 10:25:56 UTC (rev 63)
+++ webcit/trunk/debian/patches/webserver_to_webcit.diff 2008-04-23 18:39:33 UTC (rev 64)
@@ -1,160 +0,0 @@
-Index: Makefile.in
-===================================================================
---- webcit/Makefile.in (revision 6167)
-+++ webcit/Makefile.in (working copy)
-@@ -22,13 +22,13 @@
-
- # End of configuration section
-
--all: all-progs-recursive webserver setup
-+all: all-progs-recursive webcit setup
-
-
- .SUFFIXES: .cpp .c .o
-
- clean:
-- rm -f *.o webcit webserver setup
-+ rm -f *.o webcit webcit setup
- rm -fr locale/*
-
- distclean: clean
-@@ -40,7 +40,7 @@
- $(CC) setup.o \
- $(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
-
--webserver: webserver.o context_loop.o ical_dezonify.o \
-+webcit: webserver.o context_loop.o ical_dezonify.o \
- cookie_conversion.o locate_host.o floors.o summary.o \
- webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
- roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \
-@@ -64,7 +64,7 @@
- groupdav_options.o autocompletion.o tabs.o smtpqueue.o sieve.o \
- groupdav_put.o http_datestring.o setup_wizard.o fmt_date.o \
- gettext.o downloads.o addressbook_popup.o pushemail.o sysdep.o \
-- $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
-+ $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webcit
-
- .c.o:
- $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) $<
-@@ -88,7 +88,11 @@
-
- install-bin:
- test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
-- $(INSTALL) webserver $(DESTDIR)$(prefix)/webserver
-+ $(INSTALL) webcit $(DESTDIR)$(prefix)/webcit
-+ if test -f $(DESTDIR)$(prefix)/webserver; then \
-+ rm -f $(DESTDIR)$(prefix)/webserver; \
-+ ln -s $(DESTDIR)$(prefix)/webcit $(DESTDIR)$(prefix)/webserver; \
-+ fi
-
-
- install-setupbin: install-bin
-Index: webserver.c
-===================================================================
---- webcit/webserver.c (revision 6167)
-+++ webcit/webserver.c (working copy)
-@@ -145,7 +145,7 @@
-
- i = unlink(sockpath);
- if (i != 0) if (errno != ENOENT) {
-- lprintf(1, "webserver: can't unlink %s: %s\n",
-+ lprintf(1, "webcit: can't unlink %s: %s\n",
- sockpath, strerror(errno));
- exit(WC_EXIT_BIND);
- }
-@@ -156,19 +156,19 @@
-
- s = socket(AF_UNIX, SOCK_STREAM, 0);
- if (s < 0) {
-- lprintf(1, "webserver: Can't create a socket: %s\n",
-+ lprintf(1, "webcit: Can't create a socket: %s\n",
- strerror(errno));
- exit(WC_EXIT_BIND);
- }
-
- if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
-- lprintf(1, "webserver: Can't bind: %s\n",
-+ lprintf(1, "webcit: Can't bind: %s\n",
- strerror(errno));
- exit(WC_EXIT_BIND);
- }
-
- if (listen(s, actual_queue_len) < 0) {
-- lprintf(1, "webserver: Can't listen: %s\n",
-+ lprintf(1, "webcit: Can't listen: %s\n",
- strerror(errno));
- exit(WC_EXIT_BIND);
- }
-@@ -765,7 +765,7 @@
- is_https = 1;
- break;
- default:
-- fprintf(stderr, "usage: webserver "
-+ fprintf(stderr, "usage: webcit "
- "[-i ip_addr] [-p http_port] "
- "[-t tracefile] [-c] [-f] "
- "[-d] "
-Index: README.txt
-===================================================================
---- webcit/README.txt (revision 6167)
-+++ webcit/README.txt (working copy)
-@@ -95,18 +95,18 @@
- may skip the setup program. Instead, open /etc/inittab and add an entry
- something like this:
-
-- wc:2345:respawn:/usr/local/webcit/webserver
-+ wc:2345:respawn:/usr/local/webcit/webcit
-
-
- Several command-line options are also available. Here's the usage for
--the "webserver" program:
-+the "webcit" program:
-
-- webserver [-i ip_addr] [-p http_port] [-s] [-t tracefile]
-+ webcit [-i ip_addr] [-p http_port] [-s] [-t tracefile]
- [-c] [-f] [remotehost [remoteport]]
-
- *or*
-
-- webserver [-i ip_addr] [-p http_port] [-s] [-t tracefile]
-+ webcit [-i ip_addr] [-p http_port] [-s] [-t tracefile]
- [-c] [-f] uds /your/citadel/directory
-
- Explained:
-Index: setup.c
-===================================================================
---- webcit/setup.c (revision 6167)
-+++ webcit/setup.c (working copy)
-@@ -90,11 +90,11 @@
-
- strcpy(init_entry, "");
-
-- /* Determine the fully qualified path name of webserver */
-- snprintf(looking_for, sizeof looking_for, "%s/webserver ", setup_directory);
-+ /* Determine the fully qualified path name of webcit */
-+ snprintf(looking_for, sizeof looking_for, "%s/webcit ", setup_directory);
-
- /* Pound through /etc/inittab line by line. Set have_entry to 1 if
-- * an entry is found which we believe starts webserver.
-+ * an entry is found which we believe starts webcit.
- */
- infp = fopen("/etc/inittab", "r");
- if (infp == NULL) {
-@@ -461,7 +461,7 @@
- "case \"$1\" in\n"
- "\n"
- "start) echo -n \"Starting WebCit... \"\n"
-- " if $WEBCIT_DIR/webserver "
-+ " if $WEBCIT_DIR/webcit "
- "-D/var/run/webcit.pid "
- "-p$HTTP_PORT $CTDL_HOSTNAME $CTDL_PORTNAME\n"
- " then\n"
-@@ -471,7 +471,7 @@
- " fi\n");
- #ifdef HAVE_OPENSSL
- fprintf(fp, " echo -n \"Starting WebCit SSL... \"\n"
-- " if $WEBCIT_DIR/webserver "
-+ " if $WEBCIT_DIR/webcit "
- "-D/var/run/webcit-ssl.pid "
- "-s -p$HTTPS_PORT $CTDL_HOSTNAME $CTDL_PORTNAME\n"
- " then\n"
More information about the Pkg-citadel-commit
mailing list