diff --git a/Makefile.dist b/Makefile.dist index b645839fea..f5cd2ab131 100644 --- a/Makefile.dist +++ b/Makefile.dist @@ -143,13 +143,13 @@ astyle: # * The third argument can be empty. Or it can be a string starting with a '.'/dot. old1 = 4 old2 = 3 -old3 = .beta +old3 = 1 new1 = 4 new2 = 3 -new3 = +new3 = 2 set_release: for i in "configure.ac" "include/frepple/utils.h" "contrib/rpm/frepple.spec" "freppledb/__init__.py" "freppledb/locale/nl/LC_MESSAGES/django.po" "freppledb/locale/nl/LC_MESSAGES/djangojs.po" "freppledb/locale/zh_TW/LC_MESSAGES/django.po" "freppledb/locale/zh_TW/LC_MESSAGES/djangojs.po" "freppledb/locale/it/LC_MESSAGES/django.po" "freppledb/locale/it/LC_MESSAGES/djangojs.po" "freppledb/locale/fr/LC_MESSAGES/django.po" "freppledb/locale/fr/LC_MESSAGES/djangojs.po" "freppledb/locale/ja/LC_MESSAGES/django.po" "freppledb/locale/ja/LC_MESSAGES/djangojs.po" "freppledb/locale/zh_CN/LC_MESSAGES/djangojs.po" "freppledb/locale/zh_CN/LC_MESSAGES/django.po" "freppledb/locale/es/LC_MESSAGES/djangojs.po" "freppledb/locale/es/LC_MESSAGES/django.po" "freppledb/locale/pt_PT/LC_MESSAGES/djangojs.po" "freppledb/locale/pt_PT/LC_MESSAGES/django.po" "freppledb/locale/pt_BR/LC_MESSAGES/djangojs.po" "freppledb/locale/pt_BR/LC_MESSAGES/django.po" "bin/frepple.xsd" "contrib/debian/changelog" "doc/conf.py"; do \ - sed 's/$(old1)\.$(old2)$(old3)/$(new1).$(new2)$(new3)/g' $$i >out.tmp; \ + sed 's/$(old1)\.$(old2)\.$(old3)/$(new1).$(new2).$(new3)/g' $$i >out.tmp; \ mv out.tmp $$i; \ done sed 's/version = "$(old1)\.$(old2)"/version = "$(new1).$(new2)"/g' "doc/conf.py" >out.tmp @@ -157,7 +157,7 @@ set_release: sed 's/Version "$(old1)\.$(old2)\./Version "$(new1).$(new2)./g' "contrib/installer/frepple.nsi" >out.tmp sed 's/PRODUCT_VERSION "$(old1)\.$(old2)$(old3)"/PRODUCT_VERSION "$(new1).$(new2)$(new3)"/' out.tmp >"contrib/installer/frepple.nsi" for i in "src/dll.rc" "src/exe.rc"; do \ - sed 's/$(old1),$(old2),/$(new1),$(new2),/g' $$i >out.tmp; \ - sed 's/$(old1), $(old2),/$(new1), $(new2),/g' out.tmp >$$i; \ + sed 's/$(old1),$(old2),$(old3)/$(new1),$(new2),$(new3)/g' $$i >out.tmp; \ + sed 's/$(old1), $(old2), $(old3)/$(new1), $(new2), $(new3)/g' out.tmp >$$i; \ rm out.tmp; \ done diff --git a/bin/frepple.xsd b/bin/frepple.xsd index 077423e733..e06881f446 100644 --- a/bin/frepple.xsd +++ b/bin/frepple.xsd @@ -16,7 +16,7 @@ License along with this program. If not, see . --> + elementFormDefault="unqualified" attributeFormDefault="unqualified" version="4.3.1"> diff --git a/configure.ac b/configure.ac index 245cda4ab2..4c54496ab5 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialization # AC_PREREQ(2.60) -AC_INIT([frepple], [4.3]) +AC_INIT([frepple], [4.3.1]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADER([config.h]) AM_INIT_AUTOMAKE([1.9 tar-ustar]) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 7bf74ceb55..834f157f80 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,5 +1,5 @@ -frepple (4.3-1) stable; urgency=low +frepple (4.3.1-1) stable; urgency=low - * frePPLe community edition 4.3 + * frePPLe community edition 4.3.1 -- Johan De Taeye Mon, 3 Mar 2014 07:36:24 -0400 diff --git a/contrib/installer/frepple.nsi b/contrib/installer/frepple.nsi index 6bdf2ccdec..6b0125f1c0 100644 --- a/contrib/installer/frepple.nsi +++ b/contrib/installer/frepple.nsi @@ -25,7 +25,7 @@ ; Main definitions !define PRODUCT_NAME "frePPLe" -!define PRODUCT_VERSION "4.3" +!define PRODUCT_VERSION "4.3.1" !define PRODUCT_PUBLISHER "frePPLe" !define PRODUCT_WEB_SITE "http://frepple.com" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\frepple.exe" @@ -92,8 +92,8 @@ Page custom FinishOpen FinishLeave !insertmacro MUI_LANGUAGE "TradChinese" ;Version Information -VIProductVersion "4.3.0.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion "4.3.0.0" +VIProductVersion "4.3.1.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion "4.3.1.0" VIAddVersionKey /LANG=${LANG_ENGLISH} ProductName "frePPLe community edition installer" VIAddVersionKey /LANG=${LANG_ENGLISH} Comments "frePPLe community edition installer" VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName "frePPLe" diff --git a/contrib/rpm/frepple.spec b/contrib/rpm/frepple.spec index d44bc5ddb5..68bb125f06 100644 --- a/contrib/rpm/frepple.spec +++ b/contrib/rpm/frepple.spec @@ -16,7 +16,7 @@ # Summary: Free Production PLanning Name: frepple -Version: 4.3 +Version: 4.3.1 Release: 1%{?dist} License: AGPLv3+ Group: Applications/Productivity diff --git a/doc/conf.py b/doc/conf.py index 4b4a06cd44..46c19e8527 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -52,9 +52,9 @@ # built documents. # # The short X.Y version. -version = "4.3" +version = "4.3.1" # The full version, including alpha/beta/rc tags. -release = "4.3" +release = "4.3.1" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/freppledb/__init__.py b/freppledb/__init__.py index 212d06710b..20348ffb00 100644 --- a/freppledb/__init__.py +++ b/freppledb/__init__.py @@ -1,4 +1,4 @@ r''' A Django project implementing a web-based user interface for frePPLe. ''' -VERSION = '4.3' +VERSION = '4.3.1' diff --git a/freppledb/locale/es/LC_MESSAGES/django.po b/freppledb/locale/es/LC_MESSAGES/django.po index ae56cf2aba..5665a8f16e 100644 --- a/freppledb/locale/es/LC_MESSAGES/django.po +++ b/freppledb/locale/es/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:17+0100\n" diff --git a/freppledb/locale/es/LC_MESSAGES/djangojs.po b/freppledb/locale/es/LC_MESSAGES/djangojs.po index 96cb8881dd..efd1be9e8a 100644 --- a/freppledb/locale/es/LC_MESSAGES/djangojs.po +++ b/freppledb/locale/es/LC_MESSAGES/djangojs.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:05+0100\n" diff --git a/freppledb/locale/fr/LC_MESSAGES/django.po b/freppledb/locale/fr/LC_MESSAGES/django.po index 89f38717b5..5a496805de 100644 --- a/freppledb/locale/fr/LC_MESSAGES/django.po +++ b/freppledb/locale/fr/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2018-01-03 19:37+0100\n" diff --git a/freppledb/locale/fr/LC_MESSAGES/djangojs.po b/freppledb/locale/fr/LC_MESSAGES/djangojs.po index 991a3ea0ea..4af981d3cf 100644 --- a/freppledb/locale/fr/LC_MESSAGES/djangojs.po +++ b/freppledb/locale/fr/LC_MESSAGES/djangojs.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2018-01-03 19:44+0100\n" diff --git a/freppledb/locale/it/LC_MESSAGES/django.po b/freppledb/locale/it/LC_MESSAGES/django.po index 00fc383c22..c9e4e1618e 100644 --- a/freppledb/locale/it/LC_MESSAGES/django.po +++ b/freppledb/locale/it/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:39+0100\n" diff --git a/freppledb/locale/it/LC_MESSAGES/djangojs.po b/freppledb/locale/it/LC_MESSAGES/djangojs.po index 3e927e03ef..3627416c33 100644 --- a/freppledb/locale/it/LC_MESSAGES/djangojs.po +++ b/freppledb/locale/it/LC_MESSAGES/djangojs.po @@ -12,7 +12,7 @@ # Joao Ranita , 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:18+0100\n" diff --git a/freppledb/locale/ja/LC_MESSAGES/django.po b/freppledb/locale/ja/LC_MESSAGES/django.po index efef116146..cae7195131 100644 --- a/freppledb/locale/ja/LC_MESSAGES/django.po +++ b/freppledb/locale/ja/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ # Joao Ranita , 2016. msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:46+0100\n" diff --git a/freppledb/locale/ja/LC_MESSAGES/djangojs.po b/freppledb/locale/ja/LC_MESSAGES/djangojs.po index c0168b7826..ff67944a48 100644 --- a/freppledb/locale/ja/LC_MESSAGES/djangojs.po +++ b/freppledb/locale/ja/LC_MESSAGES/djangojs.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:18+0100\n" diff --git a/freppledb/locale/nl/LC_MESSAGES/django.po b/freppledb/locale/nl/LC_MESSAGES/django.po index 5dae387227..5eaee103af 100644 --- a/freppledb/locale/nl/LC_MESSAGES/django.po +++ b/freppledb/locale/nl/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 21:46+0100\n" diff --git a/freppledb/locale/nl/LC_MESSAGES/djangojs.po b/freppledb/locale/nl/LC_MESSAGES/djangojs.po index 123a052510..7eb58ec6f2 100644 --- a/freppledb/locale/nl/LC_MESSAGES/djangojs.po +++ b/freppledb/locale/nl/LC_MESSAGES/djangojs.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 13:54+0100\n" diff --git a/freppledb/locale/pt_BR/LC_MESSAGES/django.po b/freppledb/locale/pt_BR/LC_MESSAGES/django.po index 33a13e669b..225b2d735c 100644 --- a/freppledb/locale/pt_BR/LC_MESSAGES/django.po +++ b/freppledb/locale/pt_BR/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:53+0100\n" diff --git a/freppledb/locale/pt_BR/LC_MESSAGES/djangojs.po b/freppledb/locale/pt_BR/LC_MESSAGES/djangojs.po index 8d294a7cb2..57576357f4 100644 --- a/freppledb/locale/pt_BR/LC_MESSAGES/djangojs.po +++ b/freppledb/locale/pt_BR/LC_MESSAGES/djangojs.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:18+0100\n" diff --git a/freppledb/locale/pt_PT/LC_MESSAGES/django.po b/freppledb/locale/pt_PT/LC_MESSAGES/django.po index 1eb39c4df8..29dc83d1d9 100644 --- a/freppledb/locale/pt_PT/LC_MESSAGES/django.po +++ b/freppledb/locale/pt_PT/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:57+0100\n" diff --git a/freppledb/locale/pt_PT/LC_MESSAGES/djangojs.po b/freppledb/locale/pt_PT/LC_MESSAGES/djangojs.po index baa1e96f2b..db0851283d 100644 --- a/freppledb/locale/pt_PT/LC_MESSAGES/djangojs.po +++ b/freppledb/locale/pt_PT/LC_MESSAGES/djangojs.po @@ -11,7 +11,7 @@ # License along with this program. If not, see . msgid "" msgstr "" -"Project-Id-Version: 4.3\n" +"Project-Id-Version: 4.3.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-12-26 21:44+0100\n" "PO-Revision-Date: 2017-12-26 22:18+0100\n" diff --git a/include/frepple/utils.h b/include/frepple/utils.h index aaccc57dba..2354d6183b 100644 --- a/include/frepple/utils.h +++ b/include/frepple/utils.h @@ -139,7 +139,7 @@ using namespace std; #include #else // Define the version for (windows) compilers that don't use autoconf -#define PACKAGE_VERSION "4.3" +#define PACKAGE_VERSION "4.3.1" #endif // Header for multithreading diff --git a/src/dll.rc b/src/dll.rc index 5dcf6b0f54..df2f37f0cd 100644 --- a/src/dll.rc +++ b/src/dll.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,3,0,0 - PRODUCTVERSION 4,3,0,0 + FILEVERSION 4,3,1,0 + PRODUCTVERSION 4,3,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,13 +43,13 @@ BEGIN VALUE "CompanyName", "frePPLe" VALUE "FileDescription", "frePPLe - open source Production PLanning" - VALUE "FileVersion", "4, 3, 0, 0" + VALUE "FileVersion", "4, 3, 1, 0" VALUE "InternalName", "frepple.dll" VALUE "LegalCopyright", "Licensed under AGPL - Affero General Public License" VALUE "OriginalFilename", "frepple.dll" VALUE "ProductName", " frePPLe" - VALUE "ProductVersion", "4, 3, 0, 0" + VALUE "ProductVersion", "4, 3, 1, 0" END END BLOCK "VarFileInfo" diff --git a/src/exe.rc b/src/exe.rc index c7f2c4513b..4ea37f2e46 100644 --- a/src/exe.rc +++ b/src/exe.rc @@ -28,8 +28,8 @@ IDI_ICON ICON "frepple.ico" // Version VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,3,0,0 - PRODUCTVERSION 4,3,0,0 + FILEVERSION 4,3,1,0 + PRODUCTVERSION 4,3,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -47,13 +47,13 @@ BEGIN VALUE "CompanyName", "frePPLe" VALUE "FileDescription", "frePPLe - open source Production PLanning" - VALUE "FileVersion", "4, 3, 0, 0" + VALUE "FileVersion", "4, 3, 1, 0" VALUE "InternalName", "frepple.exe" VALUE "LegalCopyright", "Licensed under AGPL - Affero General Public License" VALUE "OriginalFilename", "frepple.exe" VALUE "ProductName", "frePPLe" - VALUE "ProductVersion", "4, 3, 0, 0" + VALUE "ProductVersion", "4, 3, 1, 0" END END BLOCK "VarFileInfo"