[SCM] kstars packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kstars.git;a=commitdiff;h=1e5b8ba

The following commit has been merged in the master branch:
commit 1e5b8bac1dd0c549e4bf061068992e0608d697c8
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 1 11:30:59 2013 +0200

    Remove upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff, already applied upstream.
---
 debian/changelog                                   |    3 ++-
 debian/patches/series                              |    1 -
 ...#undef-TIME_UTC-to-fix-conflict-with-glibc.diff |   24 --------------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71a8b67..8198c22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kstars (4:4.10.4-2) UNRELEASED; urgency=low
 
-  * 
+  * Remove upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff,
+    already applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Jul 2013 11:29:14 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 343ab35..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff
diff --git a/debian/patches/upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff b/debian/patches/upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff
deleted file mode 100644
index bae01b6..0000000
--- a/debian/patches/upstream_#undef-TIME_UTC-to-fix-conflict-with-glibc.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit a3dfa72dada14952d3477712c758ad6d884173e5
-Author: Kevin Kofler <kevin.kofler at chello.at>
-Date:   Sun Jun 10 23:41:42 2012 +0200
-
-    #undef TIME_UTC to fix conflict with glibc
-    
-    TIME_UTC is now defined as a macro, so it needs to be undefined before being
-    used in an enum.
-    
-    This is a safer fix for the build failure.
-
-diff --git a/kstars/indi/indielement.h b/kstars/indi/indielement.h
-index cd05717..93be2ba 100644
---- a/kstars/indi/indielement.h
-+++ b/kstars/indi/indielement.h
-@@ -44,6 +44,8 @@ typedef enum {PG_NONE = 0, PG_TEXT, PG_NUMERIC, PG_BUTTONS,
-               PG_RADIO, PG_MENU, PG_LIGHTS, PG_BLOB} PGui;
- 
- /* INDI std properties */
-+/* new versions of glibc define TIME_UTC as a macro */
-+#undef TIME_UTC
- /* N.B. Need to modify corresponding entry in indidevice.cpp when changed */
- enum stdProperties { CONNECTION, DEVICE_PORT, TIME_UTC, TIME_LST, TIME_UTC_OFFSET, GEOGRAPHIC_COORD,   /* General */
-                      EQUATORIAL_COORD, EQUATORIAL_EOD_COORD, EQUATORIAL_EOD_COORD_REQUEST, HORIZONTAL_COORD,  /* Telescope */

-- 
kstars packaging