I have been working on packaging Kannel 1.4.4 for my employer.
My 1.4.4 packages are currently based on a combination of:
* The Debian kannel 1.4.3-2 source package.
* Commit f06eabdb677ffe76df1fa99ded318e72ac1435a5 (2013-04-18)
at git://git.debian.org/git/collab-maint/kannel.git
(see also Bug#648084 "kannel: git repository disagrees with the
uploaded source package").
* Upstream gateway-1.4.4.tar.gz, which I imported to the "upstream"
and "pristine-tar" branches. I omitted the "debian" directory
from the "upstream" branch but not from kannel_1.4.4.orig.tar.gz,
which then is exactly the same as gateway-1.4.4.tar.gz.
* Several local patches, some of which fix Debian bugs.
debian/changelog currently looks like this:
kannel (1.4.4-0~procomp1) UNRELEASED; urgency=low
[ Jonas Smedegaard ]
* Drop README.Debian: Contained only outdated or superfluous info.
* Ease building with git-buildpackage:
+ Git-ignore quilt .pc dir.
+ Add source local-options.
* Drop old no longer used clutch from rules file.
* Rewrite rules file using CDBS.
* Build-depend on cdbs.
[ Kalle Niemitalo ]
* New upstream release. Closes: bug#786747.
+ Remove debian/patches/32_va-start-non-null.patch, applied upstream.
+ Build-depend on docbook-xml and sgml-data, rather than docbook.
+ Configure with XML_DCL=/usr/share/xml/declaration/xml1n.dcl.
+ Include /usr/bin/decode_emimsg in the kannel package.
+ Although the sqlbox and opensmppbox add-ons are now part of the
source tree, this version of the packaging does not build them.
* Update debian/copyright from LICENSE. Closes: bug#788335.
* If $START_WAPBOX or $START_SMSBOX is defined but the value is not 1,
then don't start that box. Closes: bug#590544.
* Add patch 34 to use sqlite3_libversion(). Closes: bug#717728.
* Enable FreeTDS support, needed for DLR storage in Microsoft SQL Server.
+ Add patch 35 to recognize dead database connections.
* Remove soap/Makefile when cleaning the source directory.
-- Kalle Niemitalo <kalle.niemit...@procomp.fi> Wed, 10 Jun 2015 15:02:24
+0300
I intend to file most of the patches to the relevant Debian bugs,
and I have permission to do this from my employer.
Here is the patch needed for building 1.4.4.
First merge the Debian 1.4.3-2 sources with collab-maint/kannel.git
and gateway-1.4.4.tar.gz as described above, then apply this patch.
You will probably want to change the version number in debian/changelog.
---
debian/changelog | 11 ++++++++++-
debian/control | 2 +-
debian/kannel.install | 1 +
debian/patches/32_va-start-non-null.patch | 21 ---------------------
debian/patches/series | 1 -
debian/rules | 3 ++-
6 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 debian/patches/32_va-start-non-null.patch
diff --git a/debian/changelog b/debian/changelog
index 7257b69..0e52ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kannel (1.4.3-3) UNRELEASED; urgency=low
+kannel (1.4.4-0~procomp1) UNRELEASED; urgency=low
[ Jonas Smedegaard ]
* Drop README.Debian: Contained only outdated or superfluous info.
@@ -8,6 +8,15 @@ kannel (1.4.3-3) UNRELEASED; urgency=low
* Drop old no longer used clutch from rules file.
* Rewrite rules file using CDBS.
* Build-depend on cdbs.
+
+ [ Kalle Niemitalo ]
+ * New upstream release. Closes: bug#786747.
+ + Remove debian/patches/32_va-start-non-null.patch, applied upstream.
+ + Build-depend on docbook-xml and sgml-data, rather than docbook.
+ + Configure with XML_DCL=/usr/share/xml/declaration/xml1n.dcl.
+ + Include /usr/bin/decode_emimsg in the kannel package.
+ + Although the sqlbox and opensmppbox add-ons are now part of the
+ source tree, this version of the packaging does not build them.
--
diff --git a/debian/control b/debian/control
index 2e58937..e570393 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Paul Dwerryhouse <p...@dwerryhouse.com.au>
Uploaders: Jonas Smedegaard <d...@jones.dk>
Build-Depends: cdbs (>= 0.4.53), debhelper (>> 7.0.0), libxml2-dev, libssl-dev
(>= 0.9.8), openssl, libmysqlclient-dev | libmysqlclient15-dev, libsqlite0-dev,
sqlite, libsqlite3-dev, sqlite3, libpq-dev, libpam0g-dev, autoconf, automake,
autotools-dev, libpcre3-dev
-Build-Depends-Indep: docbook-dsssl, jadetex, transfig, imagemagick,
ghostscript, jade, docbook
+Build-Depends-Indep: docbook-dsssl, jadetex, transfig, imagemagick,
ghostscript, jade, docbook-xml, sgml-data
Vcs-Git: git://git.debian.org/git/collab-maint/kannel.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/kannel.git;a=summary
Homepage: http://www.kannel.org/
diff --git a/debian/kannel.install b/debian/kannel.install
index ae972c1..f24cd07 100644
--- a/debian/kannel.install
+++ b/debian/kannel.install
@@ -2,6 +2,7 @@ usr/bin/wmlsc
usr/bin/wmlsdasm
usr/bin/seewbmp
usr/bin/mtbatch
+usr/bin/decode_emimsg
usr/sbin
usr/share/man
debian/kannel.conf /etc/kannel/
diff --git a/debian/patches/32_va-start-non-null.patch
b/debian/patches/32_va-start-non-null.patch
deleted file mode 100644
index a032672..0000000
--- a/debian/patches/32_va-start-non-null.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Compilation fix for the alpha architecture where va_list is a
struct
-Author: Loic Minier <Loic Minier <l...@dooz.org>
-Last-Update: 2010-02-06
---- a/gwlib/log.c
-+++ b/gwlib/log.c
-@@ -431,13 +431,8 @@
- int translog;
-
- if (level >= sysloglevel && dosyslog) {
-- if (args == NULL) {
-- strncpy(buf, format, sizeof(buf));
-- buf[sizeof(buf) - 1] = '\0';
-- } else {
-- vsnprintf(buf, sizeof(buf), format, args);
-- /* XXX vsnprint not 100% portable */
-- }
-+ vsnprintf(buf, sizeof(buf), format, args);
-+ /* XXX vsnprint not 100% portable */
-
- switch(level) {
- case GW_DEBUG:
diff --git a/debian/patches/series b/debian/patches/series
index e9eb7d6..d0c60d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-32_va-start-non-null.patch
33_docpatch.patch
diff --git a/debian/rules b/debian/rules
index 771f863..06cd96f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
--with-mysql --with-mysql-dir=/usr \
--with-sqlite2 \
--with-sqlite3 \
- --with-pgsql --with-pgsql-dir=/usr
+ --with-pgsql --with-pgsql-dir=/usr \
+ XML_DCL=/usr/share/xml/declaration/xml1n.dcl
DEB_MAKE_INSTALL_TARGET = install install-contrib install-checks install-test
DESTDIR=$(cdbs_make_curdestdir)
--
1.9.1
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
