r16318 - in /desktop/unstable/libgweather/debian: changelog control control.in libgweather-common.compress patches/01_compress_locations.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Jun 23 16:53:16 UTC 2008


Author: joss
Date: Mon Jun 23 16:53:16 2008
New Revision: 16318

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16318
Log:
* 01_compress_locations.patch: look for .xml.gz files instead of .xml.
* libgweather-common.compress: compress the files with dh_compress.
* Enforce upgrading them together with Depends/Conflicts.

Added:
    desktop/unstable/libgweather/debian/libgweather-common.compress
    desktop/unstable/libgweather/debian/patches/01_compress_locations.patch
Modified:
    desktop/unstable/libgweather/debian/changelog
    desktop/unstable/libgweather/debian/control
    desktop/unstable/libgweather/debian/control.in

Modified: desktop/unstable/libgweather/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/changelog?rev=16318&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/changelog (original)
+++ desktop/unstable/libgweather/debian/changelog Mon Jun 23 16:53:16 2008
@@ -1,8 +1,11 @@
-libgweather (2.22.2-2) UNRELEASED; urgency=low
+libgweather (2.22.2-2) unstable; urgency=low
 
   * Make priority optional.
+  * 01_compress_locations.patch: look for .xml.gz files instead of .xml.
+  * libgweather-common.compress: compress the files with dh_compress.
+  * Enforce upgrading them together with Depends/Conflicts.
 
- -- Josselin Mouette <joss at debian.org>  Mon, 23 Jun 2008 12:43:11 +0200
+ -- Josselin Mouette <joss at debian.org>  Mon, 23 Jun 2008 18:51:31 +0200
 
 libgweather (2.22.2-1) unstable; urgency=low
 

Modified: desktop/unstable/libgweather/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control?rev=16318&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control (original)
+++ desktop/unstable/libgweather/debian/control Mon Jun 23 16:53:16 2008
@@ -35,7 +35,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgweather-common
+         libgweather-common (>= 2.22.2-2)
 Replaces: gnome-applets (<< 2.21.3)
 Description: GWeather shared library
  libgweather is a library to access weather information from online
@@ -48,6 +48,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Replaces: gnome-applets-data (<< 2.21.3)
+Conflicts: libgweather1 (<< 2.22.2-2)
 Description: GWeather common files
  libgweather is a library to access weather information from online
  services for numerous locations.

Modified: desktop/unstable/libgweather/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control.in?rev=16318&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control.in (original)
+++ desktop/unstable/libgweather/debian/control.in Mon Jun 23 16:53:16 2008
@@ -35,7 +35,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgweather-common
+         libgweather-common (>= 2.22.2-2)
 Replaces: gnome-applets (<< 2.21.3)
 Description: GWeather shared library
  libgweather is a library to access weather information from online
@@ -48,6 +48,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Replaces: gnome-applets-data (<< 2.21.3)
+Conflicts: libgweather1 (<< 2.22.2-2)
 Description: GWeather common files
  libgweather is a library to access weather information from online
  services for numerous locations.

Added: desktop/unstable/libgweather/debian/libgweather-common.compress
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/libgweather-common.compress?rev=16318&op=file
==============================================================================
--- desktop/unstable/libgweather/debian/libgweather-common.compress (added)
+++ desktop/unstable/libgweather/debian/libgweather-common.compress Mon Jun 23 16:53:16 2008
@@ -1,0 +1,2 @@
+find usr/share/doc -name 'changelog*' -o -name 'NEWS*'
+find usr/share/libgweather -name '*.xml'

Added: desktop/unstable/libgweather/debian/patches/01_compress_locations.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/01_compress_locations.patch?rev=16318&op=file
==============================================================================
--- desktop/unstable/libgweather/debian/patches/01_compress_locations.patch (added)
+++ desktop/unstable/libgweather/debian/patches/01_compress_locations.patch Mon Jun 23 16:53:16 2008
@@ -1,0 +1,20 @@
+--- libgweather/gweather-xml.c.orig	2008-06-23 13:12:41.597670024 +0200
++++ libgweather/gweather-xml.c	2008-06-23 13:13:10.069669817 +0200
+@@ -384,7 +384,7 @@
+ 
+   for (i = 0; languages[i] != NULL; i++)
+     {
+-      filename = g_strdup_printf ("%s/Locations.%s.xml",
++      filename = g_strdup_printf ("%s/Locations.%s.xml.gz",
+                                   GWEATHER_XML_LOCATION_DIR, languages[i]);
+ 
+       if (g_file_test (filename, G_FILE_TEST_IS_REGULAR))
+@@ -399,7 +399,7 @@
+    * also the file that is advertised in our pkg-config file, so it's
+    * part of the API. */
+   if (!filename)
+-    filename = g_strdup (GWEATHER_XML_LOCATION_DIR"/Locations.xml");
++    filename = g_strdup (GWEATHER_XML_LOCATION_DIR"/Locations.xml.gz");
+ 
+   /* Open the xml file containing the different locations */
+   xml = xmlNewTextReaderFilename (filename);




More information about the pkg-gnome-commits mailing list