← Back to branch summary

~ubuntu-branches/ubuntu/natty/libgweather/natty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/01_gettext_not_xml.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-07-28 14:24:16 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20090728142416-s4e6lwvxpve8ypfm
Tags: 2.26.2.1-0ubuntu1
* New upstream version
* debian/patches/01_gettext_not_xml.patch,
  debian/patches/99_ltmain_as-needed.patch:
  - new version update

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_gettext_not_xml.patch
1
1
only in patch2:
2
2
unchanged:
3
 
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/configure.in libgweather-2.26.1.new/configure.in
4
 
--- libgweather-2.26.1/configure.in     2009-04-14 00:07:38.000000000 +0200
5
 
+++ libgweather-2.26.1.new/configure.in 2009-04-23 18:18:50.000000000 +0200
6
 
@@ -38,6 +38,10 @@
 
3
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.2.1/configure.in libgweather-2.26.2.1.new/configure.in
 
4
--- libgweather-2.26.2.1/configure.in   2009-06-30 03:06:53.000000000 +0200
 
5
+++ libgweather-2.26.2.1.new/configure.in       2009-07-28 15:26:55.000000000 +0200
 
6
@@ -39,6 +39,10 @@
7
7
 AM_MAINTAINER_MODE
8
8
 GNOME_MAINTAINER_MODE_DEFINES
9
9
 
14
14
 IT_PROG_INTLTOOL([0.40.3])
15
15
 PKG_PROG_PKG_CONFIG([0.19])
16
16
 
17
 
@@ -48,13 +52,6 @@
 
17
@@ -49,13 +53,6 @@
18
18
 AM_PROG_LIBTOOL
19
19
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
20
20
 
28
28
 AC_ARG_ENABLE(locations-compression,
29
29
         [AC_HELP_STRING([--enable-locations-compression],
30
30
                         [Compress Locations.xml files])],
31
 
@@ -242,7 +239,7 @@
32
 
 Makefile
 
31
@@ -256,7 +253,7 @@
 
32
 shave-libtool
33
33
 doc/Makefile
34
34
 po/Makefile.in
35
35
-po-locations/Makefile
37
37
 libgweather/Makefile
38
38
 libgweather/gweather.pc
39
39
 libgweather/gweather-uninstalled.pc
40
 
@@ -250,12 +247,6 @@
 
40
@@ -264,12 +261,6 @@
41
41
 python/Makefile
42
42
 ])
43
43
 
50
50
 dnl ***************************************************************************
51
51
 dnl *** Display Summary                                                     ***
52
52
 dnl ***************************************************************************
53
 
@@ -265,6 +256,4 @@
 
53
@@ -279,6 +270,4 @@
54
54
        Prefix:                         ${prefix}
55
55
        Source code location:           ${srcdir}
56
56
        Compiler:                       ${CC}
57
57
-       Locations.xml translations:     ${LOCATIONS_XML_TRANSLATIONS}
58
58
-       Locations.xml compression:      ${enable_locations_compression}
59
59
 " >&2
60
 
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/data/Makefile.am libgweather-2.26.1.new/data/Makefile.am
61
 
--- libgweather-2.26.1/data/Makefile.am 2009-04-14 00:00:59.000000000 +0200
62
 
+++ libgweather-2.26.1.new/data/Makefile.am     2009-04-23 18:18:50.000000000 +0200
63
 
@@ -4,55 +4,23 @@
 
60
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.2.1/data/Makefile.am libgweather-2.26.2.1.new/data/Makefile.am
 
61
--- libgweather-2.26.2.1/data/Makefile.am       2009-05-02 02:22:54.000000000 +0200
 
62
+++ libgweather-2.26.2.1.new/data/Makefile.am   2009-07-28 15:27:09.000000000 +0200
 
63
@@ -6,55 +6,23 @@
64
64
 libgweatherlocationsdir = $(pkgdatadir)
65
65
 libgweatherlocations_in_files = Locations.xml.in
66
66
 
71
71
-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
72
72
-
73
73
-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
74
 
-       LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`
 
74
-       $(QUIET_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
75
75
-       if test "x$(COMPRESS_EXT)" = "x.gz"; then                               \
76
76
-               gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;     \
77
77
-       fi
94
94
 $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
95
95
 
96
96
-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
97
 
-       LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data)
 
97
-       LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
98
98
-       for pofile in $(PO_LOCATIONS); do \
99
99
-               locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;     \
100
100
-               xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
103
103
-               if test "x$(COMPRESS_EXT)" = "x.gz"; then               \
104
104
-                       gzip --force Locations.$$locale.xml;            \
105
105
-               fi;                                                     \
106
 
-       done
107
 
-       xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data)
108
 
-       rm -f C/$(libgweatherlocations_data)
 
106
-       done &&                                                         \
 
107
-       xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
 
108
-       rm -f C/$(libgweatherlocations_data) &&                         \
109
109
+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
110
 
+       LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
111
 
+       xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
112
 
+       rm -f C/$(libgweatherlocations_DATA)
113
 
        test -d C && rmdir C
 
110
+       LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)  && \
 
111
+       xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \
 
112
+       rm -f C/$(libgweatherlocations_DATA) &&                         \
 
113
        test -d C && rmdir C &&                                         \
114
114
-       if test "x$(COMPRESS_EXT)" = "x.gz"; then                       \
115
115
-               gzip --force Locations.xml;                             \
116
 
-       fi
 
116
-       fi &&                                                           \
117
117
        touch $@
118
118
 
119
119
-endif # USE_ONE_BIG_XML
121
121
 check:
122
122
        xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
123
123
        $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
124
 
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/libgweather/gweather-location.c libgweather-2.26.1.new/libgweather/gweather-location.c
125
 
--- libgweather-2.26.1/libgweather/gweather-location.c  2009-04-14 00:00:47.000000000 +0200
126
 
+++ libgweather-2.26.1.new/libgweather/gweather-location.c      2009-04-23 18:19:23.000000000 +0200
 
124
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.2.1/libgweather/gweather-location.c libgweather-2.26.2.1.new/libgweather/gweather-location.c
 
125
--- libgweather-2.26.2.1/libgweather/gweather-location.c        2009-04-19 19:41:11.000000000 +0200
 
126
+++ libgweather-2.26.2.1.new/libgweather/gweather-location.c    2009-07-28 15:26:55.000000000 +0200
127
127
@@ -22,11 +22,14 @@
128
128
 #include <config.h>
129
129
 #endif
162
162
            xmlFree (value);
163
163
            normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
164
164
            loc->sort_name = g_utf8_casefold (normalized, -1);
165
 
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/libgweather/gweather-timezone.c libgweather-2.26.1.new/libgweather/gweather-timezone.c
166
 
--- libgweather-2.26.1/libgweather/gweather-timezone.c  2009-04-14 00:00:47.000000000 +0200
167
 
+++ libgweather-2.26.1.new/libgweather/gweather-timezone.c      2009-04-23 18:19:37.000000000 +0200
 
165
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.2.1/libgweather/gweather-timezone.c libgweather-2.26.2.1.new/libgweather/gweather-timezone.c
 
166
--- libgweather-2.26.2.1/libgweather/gweather-timezone.c        2009-06-04 16:41:13.000000000 +0200
 
167
+++ libgweather-2.26.2.1.new/libgweather/gweather-timezone.c    2009-07-28 15:26:55.000000000 +0200
168
168
@@ -23,6 +23,7 @@
169
169
 #endif
170
170
 
173
173
 
174
174
 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
175
175
 #include "gweather-timezone.h"
176
 
@@ -155,7 +156,7 @@
 
176
@@ -151,7 +152,7 @@
177
177
 parse_timezone (GWeatherParser *parser)
178
178
 {
179
179
     GWeatherTimezone *zone = NULL;
182
182
     int offset, dst_offset;
183
183
     gboolean has_dst = FALSE;
184
184
 
185
 
@@ -178,27 +179,34 @@
 
185
@@ -174,27 +175,34 @@
186
186
                continue;
187
187
            }
188
188
 
221
221
     if (name)
222
222
        xmlFree (name);
223
223
 
224
 
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/LINGUAS libgweather-2.26.1.new/po-locations/LINGUAS
225
 
--- libgweather-2.26.1/po-locations/LINGUAS     1970-01-01 01:00:00.000000000 +0100
226
 
+++ libgweather-2.26.1.new/po-locations/LINGUAS 2009-04-23 18:18:50.000000000 +0200
 
224
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.2.1/po-locations/LINGUAS libgweather-2.26.2.1.new/po-locations/LINGUAS
 
225
--- libgweather-2.26.2.1/po-locations/LINGUAS   1970-01-01 01:00:00.000000000 +0100
 
226
+++ libgweather-2.26.2.1.new/po-locations/LINGUAS       2009-07-28 15:26:55.000000000 +0200
227
227
@@ -0,0 +1,78 @@
228
228
+ang
229
229
+ar
303
303
+zh_CN
304
304
+zh_HK
305
305
+zh_TW
306
 
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/Makefile.in.in libgweather-2.26.1.new/po-locations/Makefile.in.in
307
 
--- libgweather-2.26.1/po-locations/Makefile.in.in      1970-01-01 01:00:00.000000000 +0100
308
 
+++ libgweather-2.26.1.new/po-locations/Makefile.in.in  2009-04-23 18:18:50.000000000 +0200
 
306
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.2.1/po-locations/Makefile.in.in libgweather-2.26.2.1.new/po-locations/Makefile.in.in
 
307
--- libgweather-2.26.2.1/po-locations/Makefile.in.in    1970-01-01 01:00:00.000000000 +0100
 
308
+++ libgweather-2.26.2.1.new/po-locations/Makefile.in.in        2009-07-28 15:26:55.000000000 +0200
309
309
@@ -0,0 +1,217 @@
310
310
+# Makefile for program source directory in GNU NLS utilities package.
311
311
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
524
524
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
525
525
+# Otherwise a system limit (for SysV at least) may be exceeded.
526
526
+.NOEXPORT:
527
 
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/po-locations/POTFILES.in libgweather-2.26.1.new/po-locations/POTFILES.in
528
 
--- libgweather-2.26.1/po-locations/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
529
 
+++ libgweather-2.26.1.new/po-locations/POTFILES.in     2009-04-23 18:18:50.000000000 +0200
 
527
diff -Nur -x '*.orig' -x '*~' libgweather-2.26.2.1/po-locations/POTFILES.in libgweather-2.26.2.1.new/po-locations/POTFILES.in
 
528
--- libgweather-2.26.2.1/po-locations/POTFILES.in       1970-01-01 01:00:00.000000000 +0100
 
529
+++ libgweather-2.26.2.1.new/po-locations/POTFILES.in   2009-07-28 15:26:55.000000000 +0200
530
530
@@ -0,0 +1,4 @@
531
531
+# This list should contain *only* data/Locations.xml.in.
532
532
+# Everything else should be in POTFILES.skip.