mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
0845ebb5bd
86 changed files with 28 additions and 38 deletions
|
@ -37,6 +37,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <functional>
|
||||||
|
|
||||||
// NeL georges
|
// NeL georges
|
||||||
#include "nel/georges/load_form.h"
|
#include "nel/georges/load_form.h"
|
||||||
|
|
9
dist/debian/update.sh
vendored
9
dist/debian/update.sh
vendored
|
@ -9,17 +9,12 @@ $HGBIN log -M --style $CODEROOT/changelog.template > $CODEROOT/changelog
|
||||||
REVISION=$($HGBIN identify -n | grep -o -P "[0-9]+")
|
REVISION=$($HGBIN identify -n | grep -o -P "[0-9]+")
|
||||||
echo "Found revision $REVISION"
|
echo "Found revision $REVISION"
|
||||||
|
|
||||||
REVISION_H=$CODEROOT/revision.h
|
REVISION_H=$CODEROOT/revision
|
||||||
|
|
||||||
# Copy revision.h template
|
|
||||||
cp $REVISION_H.in $REVISION_H
|
|
||||||
|
|
||||||
DATE=$(date "+%Y-%m-%d %H:%M:%S")
|
DATE=$(date "+%Y-%m-%d %H:%M:%S")
|
||||||
|
|
||||||
# Update revision.h with revision and build date
|
# Update revision.h with revision and build date
|
||||||
sed -i 's/#cmakedefine/#define/g' $REVISION_H
|
echo $REVISION > $REVISION_H
|
||||||
sed -i 's/${REVISION}/'$REVISION'/g' $REVISION_H
|
|
||||||
sed -i 's/${BUILD_DATE}/'"$DATE"'/g' $REVISION_H
|
|
||||||
|
|
||||||
VERSION=$(./ryzomcore_version.sh)
|
VERSION=$(./ryzomcore_version.sh)
|
||||||
|
|
||||||
|
|
0
dist/debian/utopic/debian/rules → dist/debian/yaketty/debian/rules
vendored
Executable file → Normal file
0
dist/debian/utopic/debian/rules → dist/debian/yaketty/debian/rules
vendored
Executable file → Normal file
0
dist/debian/utopic/debian/ryzom → dist/debian/yaketty/debian/ryzom
vendored
Executable file → Normal file
0
dist/debian/utopic/debian/ryzom → dist/debian/yaketty/debian/ryzom
vendored
Executable file → Normal file
|
@ -1,56 +1,50 @@
|
||||||
ryzom-core (0.8.2802~precise1) precise; urgency=low
|
ryzom-core (0.8.2802~raring1) raring; urgency=low
|
||||||
|
|
||||||
* New upstream release (revision 2802)
|
* New upstream release (revision 2802)
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Sun, 09 Dec 2012 14:19:29 +0100
|
-- Cédric OCHS <kervala@gmail.com> Mon, 10 Dec 2012 11:12:17 +0100
|
||||||
|
|
||||||
ryzom-core (0.8.2801~precise1) precise; urgency=low
|
ryzom-core (0.8.2786~raring1) raring; urgency=low
|
||||||
|
|
||||||
* New upstream release (revision 2801)
|
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Sat, 08 Dec 2012 14:08:35 +0100
|
|
||||||
|
|
||||||
ryzom-core (0.8.2786~precise1) precise; urgency=low
|
|
||||||
|
|
||||||
* New upstream release (revision 2786)
|
* New upstream release (revision 2786)
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Fri, 07 Dec 2012 17:18:02 +0100
|
-- Cédric OCHS <kervala@gmail.com> Fri, 07 Dec 2012 16:33:15 +0100
|
||||||
|
|
||||||
ryzom-core (0.8.2691~precise1) precise; urgency=low
|
ryzom-core (0.8.2691~quantal1) quantal; urgency=low
|
||||||
|
|
||||||
* New upstream release (revision 2691)
|
* New upstream release (revision 2691)
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Sun, 07 Oct 2012 10:00:31 +0200
|
-- Cédric OCHS <kervala@gmail.com> Sun, 07 Oct 2012 09:46:56 +0200
|
||||||
|
|
||||||
ryzom-core (0.8.2683~precise2) precise; urgency=low
|
ryzom-core (0.8.2682~quantal1) quantal; urgency=low
|
||||||
|
|
||||||
* New upstream release (revision 2683)
|
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Thu, 04 Oct 2012 10:11:23 +0200
|
|
||||||
|
|
||||||
ryzom-core (0.8.2683~precise1) precise; urgency=low
|
|
||||||
|
|
||||||
* New upstream release (revision 2683)
|
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Wed, 03 Oct 2012 22:37:14 +0200
|
|
||||||
|
|
||||||
ryzom-core (0.8.2682~precise1) precise; urgency=low
|
|
||||||
|
|
||||||
* New upstream release (revision 2682)
|
* New upstream release (revision 2682)
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Wed, 03 Oct 2012 19:02:23 +0200
|
-- Cédric OCHS <kervala@gmail.com> Wed, 03 Oct 2012 15:59:54 +0200
|
||||||
|
|
||||||
ryzom-core (0.8.2681~precise2) precise; urgency=low
|
ryzom-core (0.8.2681~quantal2) quantal; urgency=low
|
||||||
|
|
||||||
* New upstream release (revision 2681)
|
* New upstream release (revision 2681)
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Tue, 02 Oct 2012 23:06:36 +0200
|
-- Cédric OCHS <kervala@gmail.com> Tue, 02 Oct 2012 17:42:23 +0200
|
||||||
|
|
||||||
ryzom-core (0.8.2681~precise1) precise; urgency=low
|
ryzom-core (0.8.2681~quantal1) quantal; urgency=low
|
||||||
|
|
||||||
* New upstream release (revision 2681)
|
* New upstream release (revision 2681)
|
||||||
|
|
||||||
-- Cédric OCHS <kervala@gmail.com> Tue, 02 Oct 2012 17:19:25 +0200
|
-- Cédric OCHS <kervala@gmail.com> Tue, 02 Oct 2012 17:13:57 +0200
|
||||||
|
|
||||||
|
ryzom-core (0.8.2650~quantal2) quantal; urgency=low
|
||||||
|
|
||||||
|
* New upstream release (revision 2650)
|
||||||
|
|
||||||
|
-- Cédric OCHS <kervala@gmail.com> Mon, 24 Sep 2012 22:06:37 +0200
|
||||||
|
|
||||||
|
ryzom-core (0.8.2650~quantal1) quantal; urgency=low
|
||||||
|
|
||||||
|
* New upstream release (revision 2650)
|
||||||
|
|
||||||
|
-- Cédric OCHS <kervala@gmail.com> Mon, 24 Sep 2012 20:55:19 +0200
|
||||||
|
|
||||||
ryzom-core (0.8.2025~precise1) precise; urgency=low
|
ryzom-core (0.8.2025~precise1) precise; urgency=low
|
||||||
|
|
|
@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
|
||||||
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
|
libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
|
||||||
libboost-dev, libmysqlclient-dev,
|
libboost-dev, libmysqlclient-dev,
|
||||||
libcpptest-dev, libqt4-dev, libqt4-opengl-dev
|
libcpptest-dev, libqt4-dev, libqt4-opengl-dev
|
||||||
Standards-Version: 3.9.3
|
Standards-Version: 3.9.5
|
||||||
Section: games
|
Section: games
|
||||||
Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
|
Bugs: https://bitbucket.org/ryzom/ryzomcore/issues
|
||||||
Homepage: https://bitbucket.org/ryzom/ryzomcore/
|
Homepage: https://bitbucket.org/ryzom/ryzomcore/
|
0
dist/debian/vivid/debian/rules → dist/debian/zesty/debian/rules
vendored
Executable file → Normal file
0
dist/debian/vivid/debian/rules → dist/debian/zesty/debian/rules
vendored
Executable file → Normal file
0
dist/debian/vivid/debian/ryzom → dist/debian/zesty/debian/ryzom
vendored
Executable file → Normal file
0
dist/debian/vivid/debian/ryzom → dist/debian/zesty/debian/ryzom
vendored
Executable file → Normal file
Loading…
Reference in a new issue