diff -u gsmlib-1.10/gsmlib/gsm_unix_serial.cc gsmlib-1.10/gsmlib/gsm_unix_serial.cc
--- gsmlib-1.10/gsmlib/gsm_unix_serial.cc
+++ gsmlib-1.10/gsmlib/gsm_unix_serial.cc
@@ -27,6 +27,7 @@
 #include <sys/ioctl.h>
 #include <signal.h>
 #include <pthread.h>
+#include <cstring>
 
 using namespace std;
 using namespace gsmlib;
diff -u gsmlib-1.10/apps/gsmsmsd.cc gsmlib-1.10/apps/gsmsmsd.cc
--- gsmlib-1.10/apps/gsmsmsd.cc
+++ gsmlib-1.10/apps/gsmsmsd.cc
@@ -40,6 +40,7 @@
 #include <iostream>
 #include <gsmlib/gsm_me_ta.h>
 #include <gsmlib/gsm_event.h>
+#include <cstring>
 
 using namespace std;
 using namespace gsmlib;
diff -u gsmlib-1.10/scripts/config.guess gsmlib-1.10/scripts/config.guess
diff -u gsmlib-1.10/scripts/config.sub gsmlib-1.10/scripts/config.sub
diff -u gsmlib-1.10/debian/control gsmlib-1.10/debian/control
--- gsmlib-1.10/debian/control
+++ gsmlib-1.10/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Mark Purcell <msp@debian.org>
 Build-Depends: debhelper (>= 3.0.0), chrpath
-Standards-Version: 3.2.1
+Standards-Version: 3.7.3
 
 Package: libgsmme-dev
 Section: libdevel
diff -u gsmlib-1.10/debian/rules gsmlib-1.10/debian/rules
--- gsmlib-1.10/debian/rules
+++ gsmlib-1.10/debian/rules
@@ -39,7 +39,7 @@
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) INSTALL_PROGRAM=$(INSTALL_PROGRAM) \
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" INSTALL_PROGRAM=$(INSTALL_PROGRAM) \
 	./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info
 
@@ -80,7 +80,7 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	chrpath -d debian/tmp/usr/bin/*
 	cp contrib/gsmsmsspool contrib/gsmsmsrequeue debian/tmp/usr/bin
-	cp contrib/gsm-utils.init contrib/gsm-utils.default debian
+#	cp contrib/gsm-utils.init contrib/gsm-utils.default debian
 	cp contrib/gsm-utils.cron.d debian
 
 
diff -u gsmlib-1.10/debian/gsm-utils.init gsmlib-1.10/debian/gsm-utils.init
--- gsmlib-1.10/debian/gsm-utils.init
+++ gsmlib-1.10/debian/gsm-utils.init
@@ -1,4 +1,11 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:          gsm-utils
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
 #
 # /etc/init.d/gsm-utils: Controls the GSM SMS send daemon
 #
diff -u gsmlib-1.10/debian/changelog gsmlib-1.10/debian/changelog
--- gsmlib-1.10/debian/changelog
+++ gsmlib-1.10/debian/changelog
@@ -1,3 +1,58 @@
+gsmlib (1.10-12.5ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian (LP: #239045), remaining changes:
+    - debian/gsm-utils.postinst, debian/gsm-utils.init:
+      Create /var/run/gsm-utils if it does not exist
+    - Actually fix the init script (note, it wasn't fixed by this. See below)
+  * Finally, once and for all fix the init script. Version from contrib/ was
+    being installed whereas the version from debian/ should have been. Add LSB
+    header to debian/ version and comment out copying of contrib/ copy in
+    rules file
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Wed, 11 Jun 2008 02:36:22 +0100
+
+gsmlib (1.10-12.5) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Yet another bashism that was later on reported on the old bug report, thus
+    again closes: #464981
+  * Also found a shell related problem in debian/rules and fixed it.
+  * Bumped standard to 3.7.3.
+
+ -- Michael Meskes <meskes@debian.org>  Mon, 14 Apr 2008 10:48:19 +0200
+
+gsmlib (1.10-12.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Argh, somehow I mananged to upload without fixing the bug completely,
+    sorry. Added those missing braces, closes: #464981.
+
+ -- Michael Meskes <meskes@debian.org>  Wed, 09 Apr 2008 14:46:08 +0200
+
+gsmlib (1.10-12.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Removed bashism in contrib/gsmsmsrequeue (Closes: #464981).
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 06 Apr 2008 15:37:35 +0200
+
+gsmlib (1.10-12.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with GCC 4.3: 'strerror' was not declared in this scope, thanks
+    to Cyril Brulebois for the patch (Closes: #455402).
+
+ -- Christoph Berg <myon@debian.org>  Fri, 04 Apr 2008 18:01:05 +0200
+
+gsmlib (1.10-12.1) unstable; urgency=low
+
+  * Non-maintainer upload to solve release goal.
+  * Add LSB dependency header to init.d scripts (Closes: #464061).
+
+ -- Petter Reinholdtsen <pere@debian.org>  Fri, 28 Mar 2008 11:39:20 +0100
+
 gsmlib (1.10-12ubuntu1) hardy; urgency=low
 
   * Merge from Debian unstable. Remaining Ubuntu changes:
diff -u gsmlib-1.10/debian/gsm-utils.default gsmlib-1.10/debian/gsm-utils.default
--- gsmlib-1.10/debian/gsm-utils.default
+++ gsmlib-1.10/debian/gsm-utils.default
@@ -13 +13 @@
-function do_accounting { true; }  # it's your turn
+do_accounting () { true; }  # it's your turn
diff -u gsmlib-1.10/contrib/gsm-utils.default gsmlib-1.10/contrib/gsm-utils.default
--- gsmlib-1.10/contrib/gsm-utils.default
+++ gsmlib-1.10/contrib/gsm-utils.default
@@ -13 +13 @@
-function do_accounting { true; }  # it's your turn
+do_accounting () { true; }  # it's your turn
diff -u gsmlib-1.10/contrib/gsmsmsrequeue gsmlib-1.10/contrib/gsmsmsrequeue
--- gsmlib-1.10/contrib/gsmsmsrequeue
+++ gsmlib-1.10/contrib/gsmsmsrequeue
@@ -9,7 +9,8 @@
 SMSADMIN=root
 SUBJECT="SMS delivery report:"
 
-function send_notify {
+send_notify()
+{
   tmpfile="$SPOOLDIR/tmp/"`basename "$1"`
   status="$2"
   if mv "$1" "$tmpfile" 2>/dev/null; then
@@ -21,7 +22,10 @@
     rm "$tmpfile"
   fi
 }
-function do_accounting { true; }
+do_accounting()
+{
+  true;
+}
 
 test -r /etc/default/gsm-utils && . /etc/default/gsm-utils
 
diff -u gsmlib-1.10/contrib/gsm-utils.init gsmlib-1.10/contrib/gsm-utils.init
--- gsmlib-1.10/contrib/gsm-utils.init
+++ gsmlib-1.10/contrib/gsm-utils.init
@@ -1,4 +1,11 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:          gsm-utils
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+### END INIT INFO
 #
 # /etc/init.d/gsm-utils: Controls the GSM SMS send daemon
 #
only in patch2:
unchanged:
--- gsmlib-1.10.orig/gsmlib/gsm_sorted_phonebook.cc
+++ gsmlib-1.10/gsmlib/gsm_sorted_phonebook.cc
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <fstream>
 #include <limits.h>
+#include <cstring>
 
 const int MAX_LINE_SIZE = 1000;
 
only in patch2:
unchanged:
--- gsmlib-1.10.orig/gsmlib/gsm_unix_serial.loT
+++ gsmlib-1.10/gsmlib/gsm_unix_serial.loT
@@ -0,0 +1,7 @@
+# gsm_unix_serial.lo - a libtool object file
+# Generated by ltmain.sh - GNU libtool 1.5.20 Debian 1.5.20-2 (1.1220.2.287 2005/08/31 18:54:15)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.