diff -Nru wader-0.5.12/debian/changelog wader-0.5.12/debian/changelog --- wader-0.5.12/debian/changelog 2012-07-06 23:41:47.000000000 +0200 +++ wader-0.5.12/debian/changelog 2015-01-04 00:21:42.000000000 +0200 @@ -1,3 +1,19 @@ +wader (0.5.12-2) unstable; urgency=low + + [ Alex Chiang ] + * debian/control: add Vcs-* (Closes: #662823) + + [ Jakub Wilk ] + * Use canonical URIs for Vcs-* fields. + * Use empty lines to separate paragraphs in debian/control. + + [ Graham Inggs ] + * Change maintainer to Debian Python Applications Team. + * Add myself to uploaders. + * Fix DB apn.network_id / network_info.id type issues. (Closes: #768756) + + -- Graham Inggs Sat, 03 Jan 2015 22:38:10 +0200 + wader (0.5.12-1) unstable; urgency=low * New upstream release diff -Nru wader-0.5.12/debian/control wader-0.5.12/debian/control --- wader-0.5.12/debian/control 2012-07-06 23:41:47.000000000 +0200 +++ wader-0.5.12/debian/control 2015-01-04 00:18:10.000000000 +0200 @@ -1,5 +1,6 @@ Source: wader -Maintainer: Alex Chiang +Maintainer: Debian Python Applications Team +Uploaders: Graham Inggs Section: net Priority: optional Build-Depends: debhelper (>= 7.0.50~), @@ -15,6 +16,8 @@ python-twisted-core, python-tz Standards-Version: 3.9.3 +Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/wader/ +Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/wader/ Homepage: https://github.com/andrewbird/wader Package: wader-core @@ -73,4 +76,3 @@ . This package can also be used to implement an application requiring access to the above listed 3G telephony stack features. - diff -Nru wader-0.5.12/debian/patches/fix-network_info.id-type-issues.patch wader-0.5.12/debian/patches/fix-network_info.id-type-issues.patch --- wader-0.5.12/debian/patches/fix-network_info.id-type-issues.patch 1970-01-01 02:00:00.000000000 +0200 +++ wader-0.5.12/debian/patches/fix-network_info.id-type-issues.patch 2015-01-03 23:30:03.000000000 +0200 @@ -0,0 +1,50 @@ +Description: Fix DB apn.network_id / network_info.id type issues + Previously the DB or its bindings have been been silently fixing or ignoring + this for us, but now this is not the case, so do it properly. + . + This fixes a FTBFS with sqlite3 >= 3.8.7.1. +Origin: upstream, https://github.com/andrewbird/wader/commit/e8b8ce830869506adc4fc7ccb90fb4552fe94561 +Author: Andrew Bird +Bug-Debian: https://bugs.debian.org/768756 +Last-Update: 2014-12-29 +--- a/wader/common/provider.py ++++ b/wader/common/provider.py +@@ -166,7 +166,7 @@ + + NETWORKS_SCHEMA = """ + create table network_info( +- id text primary key, ++ id integer primary key, + name text, + country text); + +@@ -614,7 +614,14 @@ + c = self.conn.cursor() + + for network in networks: +- for netid in network.netid: ++ for snetid in network.netid: ++ ++ # DB field is int not string ++ try: ++ netid = int(snetid) ++ except (ValueError, TypeError): ++ continue ++ + # check if this network object exists in the database + c.execute("select 1 from network_info where id=?", (netid,)) + try: +@@ -706,7 +713,12 @@ + for networkid in getElementsByTagNameNoDescend(gsm, "network-id"): + mcc = getAttributeValue(networkid, "mcc") + mnc = getAttributeValue(networkid, "mnc") +- netid = mcc + mnc ++ ++ # DB field is int not string ++ try: ++ netid = int(mcc + mnc) ++ except (ValueError, TypeError): ++ continue + + # check if this network object exists in the database + c.execute("select 1 from network_info where id=?", (netid,)) diff -Nru wader-0.5.12/debian/patches/series wader-0.5.12/debian/patches/series --- wader-0.5.12/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ wader-0.5.12/debian/patches/series 2015-01-03 23:33:05.000000000 +0200 @@ -0,0 +1 @@ +fix-network_info.id-type-issues.patch