Please unblock viking 0.9.6-2 (was: Re: Please unblock viking 0.9.6-1)
Hi,
Luk Claes wrote:
> Bernd Zeimetz wrote:
>> Hi Release Team,
>>
>> I'd like to ask for a freeze exception for viking 0.9.6-1. Important
>> changes are a fix for the Google map layer support (which is used by a
>> lot of our users) and a large po file update, adding several new
>> translations and updating others.
>
> unblocked
thanks Luk! But unfortunately the Google maps support just broke again,
so I've added another fix for it which will be more durable hopefully.
It would be great if you could upgrade the freeze exception to 0.9.6-2.
Here's the changelog:
viking (0.9.6-2) unstable; urgency=low
* Unfortunately the google maps fix in 0.9.6-1 worked only for a few
days, hopefully the now introduced patch is a durable fix
(Closes: #491631).
- debian/control: Adding quilt to build dependencies.
- debian/patches: Adding viking_google_fix.diff and series file.
The patch is based on the output of
svn diff -r739:740 \
https://viking.svn.sourceforge.net/svnroot/viking/trunk
- debian/rules: Adding quilt.make include and dependencies on
patch/unpatch targets.
-- Bernd Zeimetz <bzed@debian.org> Fri, 08 Aug 2008 12:31:56 +0200
A diff between -1 and -2 is attached.
Thanks again,
Bernd
--
Bernd Zeimetz Debian GNU/Linux Developer
GPG Fingerprint: 06C8 C9A2 EAAD E37E 5B2C BE93 067A AD04 C93B FF79
Index: debian/control
===================================================================
--- debian/control (revision 737)
+++ debian/control (working copy)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: The Debian Vikings <viking-debian@lists.sourceforge.net>
Uploaders: Bernd Zeimetz <bzed@debian.org>, Guilhem BONNEFILLE <guilhem.bonnefille@gmail.com>, Ralf Meyer <ranfyy@gmail.com>
-Build-Depends: debhelper (>= 5), automake1.9, autoconf, autotools-dev, libcurl4-gnutls-dev, libexpat1-dev, libgtk2.0-dev, libglib2.0-dev (>= 2.12.0), libgps-dev, xsltproc, docbook-xsl, docbook-xml, intltool
+Build-Depends: debhelper (>= 5), automake1.9, autoconf, autotools-dev, libcurl4-gnutls-dev, libexpat1-dev, libgtk2.0-dev, libglib2.0-dev (>= 2.12.0), libgps-dev, xsltproc, docbook-xsl, docbook-xml, intltool, quilt
Standards-Version: 3.7.3
Homepage: http://viking.sf.net
Vcs-Svn: https://viking.svn.sourceforge.net/svnroot/viking/pkg-deb/trunk/
Index: debian/changelog
===================================================================
--- debian/changelog (revision 738)
+++ debian/changelog (working copy)
@@ -1,3 +1,17 @@
+viking (0.9.6-2) unstable; urgency=low
+
+ * Unfortunately the google maps fix in 0.9.6-1 worked only for a few days,
+ hopefully the now introduced patch is a durable fix (Closes: #491631).
+ - debian/control: Adding quilt to build dependencies.
+ - debian/patches: Adding viking_google_fix.diff and series file.
+ The patch is based on the output of
+ svn diff -r739:740 \
+ https://viking.svn.sourceforge.net/svnroot/viking/trunk
+ - debian/rules: Adding quilt.make include and dependencies on
+ patch/unpatch targets.
+
+ -- Bernd Zeimetz <bzed@debian.org> Fri, 08 Aug 2008 12:31:56 +0200
+
viking (0.9.6-1) unstable; urgency=low
* New upstream version. The following changes were introduced since
Index: debian/patches/viking_google_fix.diff
===================================================================
--- debian/patches/viking_google_fix.diff (revision 0)
+++ debian/patches/viking_google_fix.diff (revision 0)
@@ -0,0 +1,43 @@
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++2008-08-13
++Quy Tonthat <qtonthat@gmail.com>:
++ * Fixed google map download problem.
++
+ 2008-07-31
+ Guilhem Bonnefille <guilhem.bonnefille@gmail.com>:
+ * Release Viking 0.9.6
+--- a/src/google.c
++++ b/src/google.c
+@@ -105,7 +105,7 @@ static gchar *parse_version_number(gchar
+ static const gchar *google_version_number(MapCoord *mapcoord, GoogleType google_type)
+ {
+ static gboolean first = TRUE;
+- static char *vers[] = { "w2.60", "w2t.60", "20", "w2p.60" };
++ static char *vers[] = { "w2.80", "w2t.80", "30", "w2p.81"};
+ FILE *tmp_file;
+ int tmp_fd;
+ gchar *tmpname;
+@@ -117,7 +117,8 @@ static const gchar *google_version_numbe
+ gsize len;
+ gchar *gvers, *tvers, *kvers, *terrvers, *tmpvers;
+ static DownloadOptions dl_options = { "http://maps.google.com/";, 0, a_check_map_file };
+- static const char *gvers_pat = "http://mt0.google.com/mt?v\\x3d";;
++ /* static const char *gvers_pat = "http://mt0.google.com/mt?v\\x3d";; */
++ static const char *gvers_pat = "http://mt0.google.com/mt";;
+ static const char *kvers_pat = "http://khm0.google.com/kh?v\\x3d";;
+
+ g_assert(google_type < TYPE_GOOGLE_NUM);
+@@ -158,6 +159,11 @@ static const gchar *google_version_numbe
+ while (!gvers || !tvers ||!terrvers) {
+ if ((pat = g_strstr_len(pat, &text[len] - pat, gvers_pat)) != NULL) {
+ pat += strlen(gvers_pat);
++ if ((pat[0] != '/' && pat[0] != '?') ||
++ pat[1] != 'v' || pat[2] != '\\' ||
++ pat[3] != 'x' || pat[4] != '3' || pat[5] != 'd')
++ continue;
++ pat += 6;
+ if ((tmpvers = parse_version_number(pat)) != NULL) {
+ if (strstr(tmpvers, "t."))
+ tvers = tmpvers;
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 0)
+++ debian/patches/series (revision 0)
@@ -0,0 +1 @@
+viking_google_fix.diff
Index: debian/rules
===================================================================
--- debian/rules (revision 738)
+++ debian/rules (working copy)
@@ -5,6 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -28,7 +29,7 @@
configure: config-stamp
-config-stamp:
+config-stamp: patch
dh_testdir
#make building from trunk more easy
@@ -57,7 +58,9 @@
touch $@
-clean:
+clean: clean-patched unpatch
+
+clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp config-stamp
Reply to: