From 5d9c1f458c6dd4389b16862025f3504fb76c1156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9vai=20Tam=C3=A1s?= Date: Fri, 16 Sep 2016 09:41:30 +0200 Subject: [PATCH] Release 2.3.2 --- Makefile.am | 2 +- aMule-CVS.spec | 114 ----------------------------- aMule.app/Contents/Info.plist | 8 +- configure.in | 2 +- docs/Changelog | 6 -- docs/Doxyfile | 2 +- src/include/common/ClientVersion.h | 8 +- 7 files changed, 11 insertions(+), 131 deletions(-) delete mode 100644 aMule-CVS.spec diff --git a/Makefile.am b/Makefile.am index 29aa3d55a5..c0e22f0e2c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ endif SUBDIRS += docs src unittests EXTRA_DIST = amule.rc amule.ico amule.png convert.ico \ - README.Debian-Packages aMule-CVS.spec aMule.spec \ + README.Debian-Packages aMule.spec \ amule_build_install.sh autogen.sh \ po/l10n.xsl diff --git a/aMule-CVS.spec b/aMule-CVS.spec deleted file mode 100644 index 1dea1fc0ea..0000000000 --- a/aMule-CVS.spec +++ /dev/null @@ -1,114 +0,0 @@ -%define svndate %(date +%Y%m%d) -%define optflags %{nil} - -Summary: aMule - another eMule p2p client -Name: aMule -Version: SVN -Release: %{svndate} -License: GPL -Group: Applications/Internet -Packager: The aMule Team (http://forum.amule.org/) -Vendor: The aMule Project -URL: http://www.amule.org/ -Source: %{name}-%{version}-%{release}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%description -aMule is a peer to peer file sharing client, based on the well known eMule. -Starting with 2.0.0 aMule works on Linux, Mac, *BSD and Windows, which makes it -the first multi-platform edonkey network client. - -%pre -echo "****************************************************************************" -echo "Warning: This is a svn release!" -echo "This release is made for testing purpose and it may cause several problems," -echo "burn your house, kill your dog, etc, but it *should* be safe to use anyway." -echo "If you would like to test some of the great new features go on and install." -echo "Otherwise you may press ctrl-c within the next 10 seconds to abort the" -echo "installation." -echo -n "Waiting for user... " -for i in $(seq 10 -1 1); do - echo -n "$i, " - sleep 1 -done -echo " 0, ok, here we go then... Muhahaha :), installing." - -%prep -%setup -q -n amule-cvs - -%build -%configure \ - --disable-optimize \ - --enable-debug \ - --enable-cas \ - --enable-wxcas \ - --enable-amulecmd \ - --enable-webserver \ - --enable-ccache -%{__make} %{?_smp_mflags} - -%install -[ ! "$RPM_BUILD_ROOT" = "/" ] && %{__rm} -rf "$RPM_BUILD_ROOT" -%{__make} DESTDIR="$RPM_BUILD_ROOT" install -%find_lang amule - -%clean -[ ! "$RPM_BUILD_ROOT" = "/" ] && %{__rm} -rf "$RPM_BUILD_ROOT" - -%files -f amule.lang -%defattr(-,root,root,-) -%{_bindir}/amule -%{_bindir}/ed2k -%{_bindir}/amulecmd -%{_bindir}/cas -%{_bindir}/wxcas -%{_bindir}/amuleweb -%{_bindir}/autostart-xas -%{_libdir}/xchat/plugins/xas.pl -%{_datadir}/applications/* -%{_datadir}/pixmaps/* -%{_mandir}/man1/* -%{_mandir}/*/man1/* -%docdir %{_datadir}/doc/* -%{_datadir}/doc/* -%{_datadir}/cas -%{_datadir}/amule - -%changelog -* Sun Dec 25 2005 Gerd78 -- Really disable optimizations by defining optflags to nil. - -* Mon Apr 19 2005 Marcelo Jimenez -- Removed curl dependency, aMule now uses wxHTTP. - -* Mon Mar 26 2005 Marcelo Jimenez -- Added a distro test, so we know the distro. -- Tests for UTF-8 enabled LANG to use UTF-8 systray. - -* Mon Mar 21 2005 Marcelo Jimenez -- Removed krb5-libs require and krb5-devel buildprereq. curl-lib and - curl-devel is enough. - -* Tue Mar 08 2005 Marcelo Jimenez -- Made it work with cvs snapshots at their very same day. - -* Wed Jun 16 2004 Ariano Bertacca -- added tool package. - -* Sat May 22 2004 Ariano Bertacca -- added webserver package. - -* Sun Mar 28 2004 Ariano Bertacca -- added libcryptopp to dependencies/BuildPreReq -- getting wx-config and wxbase-config from installed rpm to avoid problems - with people using wxGTK-2.5. - Idea taken from aMule-2.0.0rc1.spec done by - deltaHF and - pure_ascii - -* Tue Feb 10 2004 Ariano Bertacca -- modified the BuildPreReq to satisfy amulecmd build requirements. - -* Sat Jan 23 2004 Ariano Bertacca -- initial amule.spec release - diff --git a/aMule.app/Contents/Info.plist b/aMule.app/Contents/Info.plist index 89707c7b3f..491081cc20 100644 --- a/aMule.app/Contents/Info.plist +++ b/aMule.app/Contents/Info.plist @@ -9,21 +9,21 @@ CFBundleName amule CFBundleGetInfoString - 2.4.0, Copyright 2003-2011 aMule Project (http://www.amule.org) + 2.3.2, Copyright 2003-2011 aMule Project (http://www.amule.org) CFBundleIconFile amule CFBundleIdentifier org.amule.aMule CFBundleInfoDictionaryVersion - 2.4.0 + 2.3.2 CFBundlePackageType APPL CFBundleShortVersionString - 2.4.0 + 2.3.2 CFBundleSignature aMul CFBundleVersion - 2.4.0 + 2.3.2 NSHumanReadableCopyright Copyright 2003-2011 aMule Project (http://www.amule.org) NSMainNibFile diff --git a/configure.in b/configure.in index cd2d3e33d7..b4e808d3fc 100644 --- a/configure.in +++ b/configure.in @@ -24,7 +24,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -AC_INIT([aMule],[SVN],[admin@amule.org]) +AC_INIT([aMule], [2.3.2], [admin@amule.org]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) diff --git a/docs/Changelog b/docs/Changelog index e63f70f792..4906b87e20 100644 --- a/docs/Changelog +++ b/docs/Changelog @@ -1,9 +1,3 @@ -Version 2.4.0 - The river knows. ----------- -201?-??-?? - --------------------------------------------------------------------------------- - Version 2.3.2 - The "don't close tabs" version. ---------- 2016-09-16 diff --git a/docs/Doxyfile b/docs/Doxyfile index dab7c55493..4d32b8b302 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -23,7 +23,7 @@ PROJECT_NAME = aMule # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.4.0 +PROJECT_NUMBER = 2.3.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/src/include/common/ClientVersion.h b/src/include/common/ClientVersion.h index 8398bef251..3022ec52f1 100644 --- a/src/include/common/ClientVersion.h +++ b/src/include/common/ClientVersion.h @@ -44,10 +44,10 @@ // RELEASERS: REMOVE THE DEFINE ON THE RELEASES, PLEASE // AND FIX THE MOD_VERSION_LONG -#define __SVN__ +/* #undef __SVN__ */ #ifndef VERSION - #define VERSION "2.4.0" + #define VERSION "2.3.2" #endif #ifdef __SVN__ @@ -57,8 +57,8 @@ #endif #define VERSION_MJR 2 -#define VERSION_MIN 4 -#define VERSION_UPDATE 0 +#define VERSION_MIN 3 +#define VERSION_UPDATE 2 #ifndef PACKAGE #define PACKAGE "amule"