From: Art Cancro Date: Fri, 6 May 2016 05:50:50 +0000 (-0400) Subject: Quick hack to buildpackages, use "buildpackages version" to simply have it tell you... X-Git-Tag: Release_902^0 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=1a4ec92c7186ed2c0b9b6bf45afc47b69f3a800a Quick hack to buildpackages, use "buildpackages version" to simply have it tell you what version number it's picking up. --- diff --git a/citadel/buildpackages b/citadel/buildpackages index 280302457..3b9f6f881 100755 --- a/citadel/buildpackages +++ b/citadel/buildpackages @@ -111,6 +111,9 @@ EMAIL=citadel@outgesourced.org \ -chvzf citadel-$CITADEL_VERSION.tar.gz citadel-$CITADEL_VERSION/ ;; + version) + echo This would build citadel-$CITADEL_VERSION + ;; *) echo "Not yet implemented. we have: debian " ;; diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c index edb0a0ab2..6eaa957d3 100644 --- a/citadel/utils/setup.c +++ b/citadel/utils/setup.c @@ -863,7 +863,7 @@ void edit_value(int curr) pw = getpwnam(ctdluidname); if (pw != NULL) { ctdluid = pw->pw_uid; - + } else if (atoi(ctdluidname) > 0) { ctdluid = atoi(ctdluidname); } diff --git a/libcitadel/buildpackages b/libcitadel/buildpackages index 1b31ee801..b7b8ab01d 100755 --- a/libcitadel/buildpackages +++ b/libcitadel/buildpackages @@ -114,6 +114,9 @@ EMAIL=citadel@outgesourced.org \ -chvzf libcitadel-$LIBCITADEL_VERSION.tar.gz libcitadel-$LIBCITADEL_VERSION/ ;; + version) + echo This would build libcitadel-$LIBCITADEL_VERSION + ;; *) echo "Not yet implemented. we have: debian, sourcedist " ;; diff --git a/libcitadel/configure.in b/libcitadel/configure.in index 595f0b6ed..fe0c76f4f 100755 --- a/libcitadel/configure.in +++ b/libcitadel/configure.in @@ -5,25 +5,22 @@ dnl dnl Ensure that libcitadel is configured with autoconf 2.52 or newer AC_PREREQ(2.52) -AC_INIT(libcitadel, 4.9.01, http://uncensored.citadel.org) +AC_INIT(libcitadel, 902, http://uncensored.citadel.org) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) AC_CONFIG_SRCDIR(tests/Makefile.in) dnl -dnl Increment LIBREVISION if source code has changed at all +dnl Set LIBREVISION to the ever-ascending libcitadel version number. dnl -dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0 +dnl If the API has changed, increment LIBCURRENT. dnl -dnl If the API changes compatibly (i.e. simply adding a new function -dnl without changing or removing earlier interfaces), then increment LIBAGE. -dnl -dnl If the API changes incompatibly set LIBAGE back to 0 +dnl Set LIBAGE to 0. dnl LIBCURRENT=4 -LIBREVISION=901 +LIBREVISION=902 LIBAGE=0 sinclude(conftools/libtool.m4) diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 366b8a62c..c0689720a 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -1,7 +1,7 @@ /* * Header file for libcitadel * - * Copyright (c) 1987-2013 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -28,7 +28,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 901 +#define LIBCITADEL_VERSION_NUMBER 902 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/textclient/buildpackages b/textclient/buildpackages index 671e92da5..c784a48c4 100755 --- a/textclient/buildpackages +++ b/textclient/buildpackages @@ -113,6 +113,9 @@ EMAIL=citadel@outgesourced.org \ -chvzf textclient-$CITADEL_VERSION.tar.gz textclient-$CITADEL_VERSION/ ;; + version) + echo This would build textclient-$CITADEL_VERSION + ;; *) echo "Not yet implemented. we have: debian " ;; diff --git a/webcit/buildpackages b/webcit/buildpackages index 49dda2537..511ab7925 100755 --- a/webcit/buildpackages +++ b/webcit/buildpackages @@ -79,6 +79,9 @@ case $1 in ./webcit -G `pwd`/i18n_templatelist.c cd po/webcit; ./create-pot.sh ;; + version) + echo This would build webcit-${WEBCIT_VERSION} + ;; *) echo "Not yet implemented. we have: debian, sourcedist, i18n (needs ready compiled & installed webcit in your system)" ;; diff --git a/webcit/configure.ac b/webcit/configure.ac index a523add56..ac631f331 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([WebCit], [901], [http://www.citadel.org/]) +AC_INIT([WebCit], [902], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/webcit.h b/webcit/webcit.h index fe34c23da..d8fa7089b 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2016 by the citadel.org team * * This program is open source software; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 3. @@ -127,9 +127,9 @@ extern char *ssl_cipher_list; #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 901 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 901 /* Minimum required version of Citadel server */ -#define LIBCITADEL_MIN 901 /* Minimum required version of libcitadel */ +#define CLIENT_VERSION 902 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 902 /* Minimum required version of Citadel server */ +#define LIBCITADEL_MIN 902 /* Minimum required version of libcitadel */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Window target for inline URL's */