From 664d25a3706b096be09ef9df0ae3dadfef43df3e Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sat, 4 Apr 2015 19:03:03 +0200
Subject: [PATCH] Fixed Debian packaging stuff

---
 dist/debian/precise/debian/ryzom                       | 0
 dist/debian/{ryzom_version.sh => ryzomcore_version.sh} | 0
 dist/debian/trusty/debian/control                      | 2 +-
 dist/debian/trusty/debian/ryzom                        | 0
 dist/debian/update.sh                                  | 8 ++------
 dist/debian/update_debian.sh                           | 2 +-
 dist/debian/utopic/debian/ryzom                        | 0
 dist/debian/vivid/debian/ryzom                         | 0
 8 files changed, 4 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 dist/debian/precise/debian/ryzom
 rename dist/debian/{ryzom_version.sh => ryzomcore_version.sh} (100%)
 mode change 100644 => 100755 dist/debian/trusty/debian/ryzom
 mode change 100644 => 100755 dist/debian/utopic/debian/ryzom
 mode change 100644 => 100755 dist/debian/vivid/debian/ryzom

diff --git a/dist/debian/precise/debian/ryzom b/dist/debian/precise/debian/ryzom
old mode 100644
new mode 100755
diff --git a/dist/debian/ryzom_version.sh b/dist/debian/ryzomcore_version.sh
similarity index 100%
rename from dist/debian/ryzom_version.sh
rename to dist/debian/ryzomcore_version.sh
diff --git a/dist/debian/trusty/debian/control b/dist/debian/trusty/debian/control
index cf8840bb2..e662d1f37 100644
--- a/dist/debian/trusty/debian/control
+++ b/dist/debian/trusty/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.6), libxml2-dev,
  libvorbis-dev, libsquish-dev, libcurl4-openssl-dev, libluabind-dev,
  libboost-dev, libwww-dev, libmysqlclient-dev,
  libcpptest-dev, libqt4-dev, libqt4-opengl-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Section: games
 Bugs: http://dev.ryzom.com/projects/ryzom/issues
 Homepage: http://dev.ryzom.com
diff --git a/dist/debian/trusty/debian/ryzom b/dist/debian/trusty/debian/ryzom
old mode 100644
new mode 100755
diff --git a/dist/debian/update.sh b/dist/debian/update.sh
index 2086a5247..a68d3edb4 100755
--- a/dist/debian/update.sh
+++ b/dist/debian/update.sh
@@ -1,16 +1,12 @@
 #!/bin/sh
 
 HGBIN="/usr/bin/hg"
-CODEROOT=../..
-
-# download packaging stuff
-echo "Updating packaging files..."
-$HGBIN pull && $HGBIN update
+CODEROOT=../../code
 
 echo "Generating changelogs..."
 $HGBIN log -M --style $CODEROOT/changelog.template > $CODEROOT/changelog
 
-REVISION=`$HGBIN identify -n`
+REVISION=$($HGBIN identify -n | grep -o -P "[0-9]+")
 echo "Found revision $REVISION"
 
 REVISION_H=$CODEROOT/revision.h
diff --git a/dist/debian/update_debian.sh b/dist/debian/update_debian.sh
index b74dd862a..8c2c5dd7d 100755
--- a/dist/debian/update_debian.sh
+++ b/dist/debian/update_debian.sh
@@ -38,7 +38,7 @@ then
   exit 1
 fi
 
-REVISION=`$HGBIN identify -n`
+REVISION=$($HGBIN identify -n | grep -o -P "[0-9]+")
 
 DSTFOLDER=ryzom-core-$VERSION.$REVISION
 
diff --git a/dist/debian/utopic/debian/ryzom b/dist/debian/utopic/debian/ryzom
old mode 100644
new mode 100755
diff --git a/dist/debian/vivid/debian/ryzom b/dist/debian/vivid/debian/ryzom
old mode 100644
new mode 100755