Imported Upstream version 1.26.91

3 files changed, 82 insertions, 14 deletions

diff --git a/admin/generate-man b/admin/generate-man
index 5b8520a..edded71 100755
--- a/admin/generate-man
+++ b/admin/generate-man
@@ -115,36 +115,92 @@ gammurc(5) for more details about it.
 .TP
 Save text message up to standard 160 chars:
 
+.RS
+.sp
+.nf
+.ne 7
 echo "All your base are belong to us" | gammu savesms TEXT
+.fi
+.sp
+.RE
+.PP
 
 or 
 
+.RS
+.sp
+.nf
+.ne 7
 gammu savesms TEXT \\-text "All your base are belong to us"
+.fi
+.sp
+.RE
+.PP
 
 .TP
 Save long text message:
 
+.RS
+.sp
+.nf
+.ne 7
 echo "All your base are belong to us" | gammu savesms TEXT \\-len 400
+.fi
+.sp
+.RE
+.PP
 
 or 
 
+.RS
+.sp
+.nf
+.ne 7
 gammu savesms TEXT \\-len 400 \\-text "All your base are belong to us"
+.fi
+.sp
+.RE
+.PP
 
 or
 
+.RS
+.sp
+.nf
+.ne 7
 gammu savesms EMS \\-text "All your base are belong to us"
+.fi
+.sp
+.RE
+.PP
 
 .TP
 Save some funky message with predefined sound and animation from 2 bitmaps:
 
+.RS
+.sp
+.nf
+.ne 7
 gammu savesms EMS \\-text "Greetings" \\-defsound 1 \\-text "from Gammu"
 \\-tone10 axelf.txt \\-animation 2 file1.bmp file2.bmp
+.fi
+.sp
+.RE
+.PP
 
 .TP
 Save protected message with ringtone:
 
+.RS
+.sp
+.nf
+.ne 7
 gammu savesms EMS \\-protected 2 \\-variablebitmaplong ala.bmp
 \\-toneSElong axelf.txt \\-toneSE ring.txt
+.fi
+.sp
+.RE
+.PP
 
 .SS Backups
 
@@ -212,10 +268,18 @@ operating system, it's version and phone information are needed).
 To generate debug log, enable it in gammurc (alternatively you can
 do it on command line using \\-d textall \\-f /tmp/gammu.log):
 
-    [gammu]
-    ...your connection settings...
-    logfile = /tmp/gammu.log
-    logformat = textall
+.RS
+.sp
+.nf
+.ne 7
+[gammu]
+...your connection settings...
+logfile = /tmp/gammu.log
+logformat = textall
+.fi
+.sp
+.RE
+.PP
 
 With this settings, Gammu generates /tmp/gammu.log on each connection to
 phone and stores dump of communication there. You can also find some
@@ -905,10 +969,10 @@ Please note that this adds all content of backup file to phone and
 does not care about current data in the phone (no duplicates are 
 detected).
 
-Use -yes parameter to answer yes to all questions (you want to automatically 
+Use \\-yes parameter to answer yes to all questions (you want to automatically 
 restore all data).
 
-Use -memory parameter to force usage of defined memory type for storing entries 
+Use \\-memory parameter to force usage of defined memory type for storing entries 
 regardless what backu format says.
 '''
 HELP['clearall'] = '''Deletes all private data from the phone.
diff --git a/admin/locales-update b/admin/locales-update
index f93c43e..5f9b7e1 100755
--- a/admin/locales-update
+++ b/admin/locales-update
@@ -32,16 +32,16 @@ xgettext \
     --package-version $ver \
     `find libgammu -name '*.c' -o -name '*.h' | sort`
 
+if [ "x$1" != "x--nopo4a" ] ; then
+    ./admin/po4a
+fi
+
 for loc in $LOCS ; do
     cd locale/$loc
-    msgmerge -U -C ../../../wammu/locale/$loc/wammu.po -C gammu.po -C libgammu.po docs.po ../docs.pot
+    msgmerge -U -C ../../../wammu/locale/$loc/docs.po -C ../../../wammu/locale/$loc/wammu.po -C gammu.po -C libgammu.po docs.po ../docs.pot
     cd ../..
 done
 
-if [ "x$1" != "x--nopo4a" ] ; then
-    ./admin/po4a
-fi
-
 sed -i '
     s/SOME DESCRIPTIVE TITLE/Gammu translation/;
     s/PACKAGE/Gammu/;
@@ -62,14 +62,14 @@ for loc in $LOCS ; do
         s/VERSION/'$ver'/;
         s/Project-Id-Version: Gammu [0-9.]*/Project-Id-Version: Gammu '$ver'/;
         ' locale/$loc/gammu.po
-    msgmerge -C ../wammu/locale/$loc/wammu.po -C locale/$loc/libgammu.po -C locale/$loc/docs.po -U locale/$loc/gammu.po locale/gammu.pot
+    msgmerge -C ../wammu/locale/$loc/docs.po -C ../wammu/locale/$loc/wammu.po -C locale/$loc/libgammu.po -C locale/$loc/docs.po -U locale/$loc/gammu.po locale/gammu.pot
     sed -i '
         s/SOME DESCRIPTIVE TITLE/libGammu translation/;
         s/PACKAGE/libGammu/;
         s/VERSION/'$ver'/;
         s/Project-Id-Version: libGammu [0-9.]*/Project-Id-Version: libGammu '$ver'/;
         ' locale/$loc/libgammu.po
-    msgmerge -C ../wammu/locale/$loc/wammu.po -C locale/$loc/gammu.po -C locale/$loc/docs.po -U locale/$loc/libgammu.po locale/libgammu.pot
+    msgmerge -C ../wammu/locale/$loc/docs.po -C ../wammu/locale/$loc/wammu.po -C locale/$loc/gammu.po -C locale/$loc/docs.po -U locale/$loc/libgammu.po locale/libgammu.pot
     sed -i '
         s/SOME DESCRIPTIVE TITLE/Gammu documentation translation/;
         s/PACKAGE/Gammu-docs/;
diff --git a/admin/make-release b/admin/make-release
index c9f4585..c23213c 100755
--- a/admin/make-release
+++ b/admin/make-release
@@ -39,6 +39,8 @@ signexe() {
 }
 
 checkexe() {
+    # Disabled for now because we don't build Python binaries
+    return
     if /usr/i*mingw*/bin/objdump -x "$1" | grep -qi 'DLL Name.*msvcrt.dll' ; then
         echo "Program $1 is linked to msvcrt.dll!"
         exit 1
@@ -129,8 +131,9 @@ cpack -G ZIP
 mv Gammu-*-Windows-Minimal.* $tmp/
 cd $tmp
 
+if false ; then
 mkdir build-win-python
-for py in 2.4 2.5 ; do
+for py in 2.6 ; do
     pynodot=`echo $py | tr -d '.'`
     echo "Building minimal Windows version with Python $py..."
     cd $tmp/build-win-python
@@ -170,6 +173,7 @@ for py in 2.4 2.5 ; do
     fi
     cd $tmp
 done
+fi
 
 # Sign binaries (not for python-gammu, it breaks some code underneath)
 for bin in $tmp/Gammu*.exe ; do