[osm-gps-map] 35/153: 04-tidy_code.patch removed, fixed upstream

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository osm-gps-map.

commit 049ec4eb022cefc3a82a3b3b4857e7bb20dd47d7
Author: David Paleino <dapal at debian.org>
Date:   Fri Jan 22 17:52:34 2010 +0100

    04-tidy_code.patch removed, fixed upstream
---
 debian/changelog                  |  2 --
 debian/patches/04-tidy_code.patch | 57 ---------------------------------------
 debian/patches/series             |  1 -
 3 files changed, 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08426b0..481859b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,6 @@ osm-gps-map (0.5-1) UNRELEASED; urgency=low
     - fixed missing #include in src/osm-gps-map.c (Closes: #564907)
   * debian/patches/:
     - 02-fix_python_library_linking.patch removed, fixed upstream
-    - 04-tidy_code.patch added, fixing some minor issues causing
-      compiler warnings
 
  -- David Paleino <dapal at debian.org>  Fri, 22 Jan 2010 17:49:43 +0100
 
diff --git a/debian/patches/04-tidy_code.patch b/debian/patches/04-tidy_code.patch
deleted file mode 100644
index d78ece6..0000000
--- a/debian/patches/04-tidy_code.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix minor issues in the code, causing some compiler warnings
-Forwarded: no
-
----
- src/osm-gps-map.c |   11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
---- osm-gps-map.orig/src/osm-gps-map.c
-+++ osm-gps-map/src/osm-gps-map.c
-@@ -350,7 +350,7 @@ replace_map_uri(OsmGpsMap *map, const gc
-     url = g_strdup(uri);
-     while (i < URI_FLAG_END)
-     {
--        char *s;
-+        char *s = NULL;
-         char *old;
- 
-         old = url;
-@@ -402,9 +402,6 @@ replace_map_uri(OsmGpsMap *map, const gc
-                 url = replace_string(url, URI_MARKER_R, s);
-                 //g_debug("FOUND " URI_MARKER_R);
-                 break;
--            default:
--                s = NULL;
--                break;
-         }
- 
-         if (s) {
-@@ -588,7 +585,9 @@ osm_gps_map_draw_gps_point (OsmGpsMap *m
-         int x, y;
-         int r = priv->ui_gps_point_inner_radius;
-         int r2 = priv->ui_gps_point_outer_radius;
-+#ifndef USE_CAIRO
-         int lw = priv->ui_gps_track_width;
-+#endif
-         int mr = MAX(r,r2);
- 
-         map_x0 = priv->map_x - EXTRA_BORDER;
-@@ -1267,7 +1266,7 @@ osm_gps_map_constructor (GType gtype, gu
-     GObject *object;
-     OsmGpsMapPrivate *priv;
-     OsmGpsMap *map;
--    const char *uri, *name;
-+    const char *uri;
- 
-     //Always chain up to the parent constructor
-     object = G_OBJECT_CLASS(osm_gps_map_parent_class)->constructor(gtype, n_properties, properties);
-@@ -2194,7 +2193,7 @@ int 
- osm_gps_map_set_zoom (OsmGpsMap *map, int zoom)
- {
-     int zoom_old;
--    double factor;
-+    double factor = 1.0;
-     int width_center, height_center;
-     OsmGpsMapPrivate *priv;
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 67b0538..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-04-tidy_code.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-gps-map.git