r17663 - in /desktop/experimental/libgweather/debian: changelog control control.in libgweather-common.install patches/01_compress_locations.patch patches/99_ltmain_as-needed.patch python-gweather.install rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Nov 21 21:00:00 UTC 2008 

Author: joss
Date: Fri Nov 21 21:00:00 2008
New Revision: 17663

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17663
Log:
* New upstream release.
* Bump build-dependencies.
* Set shlibs version to 2.23.92.
* 01_compress_locations.patch: updated to apply again.
* 99_ltmain_as-needed.patch: update for new version.
* Prepare everything needed to build python-gweather, but disable it 
  for the moment since the API is unstable.

Added:
    desktop/experimental/libgweather/debian/python-gweather.install
Modified:
    desktop/experimental/libgweather/debian/changelog
    desktop/experimental/libgweather/debian/control
    desktop/experimental/libgweather/debian/control.in
    desktop/experimental/libgweather/debian/libgweather-common.install
    desktop/experimental/libgweather/debian/patches/01_compress_locations.patch
    desktop/experimental/libgweather/debian/patches/99_ltmain_as-needed.patch
    desktop/experimental/libgweather/debian/rules

Modified: desktop/experimental/libgweather/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/changelog?rev=17663&op=diff
==============================================================================
--- desktop/experimental/libgweather/debian/changelog (original)
+++ desktop/experimental/libgweather/debian/changelog Fri Nov 21 21:00:00 2008
@@ -1,3 +1,15 @@
+libgweather (2.24.1-1) experimental; urgency=low
+
+  * New upstream release.
+  * Bump build-dependencies.
+  * Set shlibs version to 2.23.92.
+  * 01_compress_locations.patch: updated to apply again.
+  * 99_ltmain_as-needed.patch: update for new version.
+  * Prepare everything needed to build python-gweather, but disable it 
+    for the moment since the API is unstable.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 21 Nov 2008 20:25:35 +0100
+
 libgweather (2.22.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/experimental/libgweather/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/control?rev=17663&op=diff
==============================================================================
--- desktop/experimental/libgweather/debian/control (original)
+++ desktop/experimental/libgweather/debian/control Fri Nov 21 21:00:00 2008
@@ -8,11 +8,11 @@
                libxml2-dev (>= 2.6.0),
                libglib2.0-dev (>= 2.13.0),
                libgtk2.0-dev (>= 2.11.0),
-               libgnomevfs2-dev (>= 2.15.4),
+               libsoup2.4-dev (>= 2.4.0),
                libgconf2-dev (>= 2.8.0),
                gconf2,
                gnome-pkg-tools,
-               libxml-parser-perl,
+               intltool (>= 0.40.0),
                libxml2-utils
 Standards-Version: 3.8.0
 Section: libs
@@ -21,14 +21,17 @@
 Section: libdevel
 Architecture: any
 Depends: libgweather1 (>= ${binary:Version}),
+         libxml2-dev (>= 2.6.0),
+         libglib2.0-dev (>= 2.13.0),
          libgtk2.0-dev (>= 2.11.0),
-         libgnomevfs2-dev (>= 2.15.4)
+         libsoup2.4-dev (>= 2.4.0),
+         libgconf2-dev (>= 2.8.0)
 Replaces: gnome-applets-dev (<< 2.21.3)
 Description: GWeather development files
  libgweather is a library to access weather information from online
  services for numerous locations.
  .
- This package contains the include files and static library
+ This package contains the include files and static library.
 
 Package: libgweather1
 Section: libs
@@ -41,7 +44,7 @@
  libgweather is a library to access weather information from online
  services for numerous locations.
  .
- This package contains shared libraries
+ This package contains shared libraries.
 
 Package: libgweather-common
 Architecture: all
@@ -53,5 +56,16 @@
  libgweather is a library to access weather information from online
  services for numerous locations.
  .
- This package contains the weather locations
+ This package contains the weather locations.
 
+# Package: python-gweather
+# Architecture: any
+# Section: python
+# Depends: ${shlibs:Depends},
+#          ${misc:Depends},
+#          ${python:Depends}
+# Description: Python bindings for GWeather
+#  libgweather is a library to access weather information from online
+#  services for numerous locations.
+#  .
+#  This package contains the Python bindings.

Modified: desktop/experimental/libgweather/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/control.in?rev=17663&op=diff
==============================================================================
--- desktop/experimental/libgweather/debian/control.in (original)
+++ desktop/experimental/libgweather/debian/control.in Fri Nov 21 21:00:00 2008
@@ -8,11 +8,11 @@
                libxml2-dev (>= 2.6.0),
                libglib2.0-dev (>= 2.13.0),
                libgtk2.0-dev (>= 2.11.0),
-               libgnomevfs2-dev (>= 2.15.4),
+               libsoup2.4-dev (>= 2.4.0),
                libgconf2-dev (>= 2.8.0),
                gconf2,
                gnome-pkg-tools,
-               libxml-parser-perl,
+               intltool (>= 0.40.0),
                libxml2-utils
 Standards-Version: 3.8.0
 Section: libs
@@ -21,14 +21,17 @@
 Section: libdevel
 Architecture: any
 Depends: libgweather1 (>= ${binary:Version}),
+         libxml2-dev (>= 2.6.0),
+         libglib2.0-dev (>= 2.13.0),
          libgtk2.0-dev (>= 2.11.0),
-         libgnomevfs2-dev (>= 2.15.4)
+         libsoup2.4-dev (>= 2.4.0),
+         libgconf2-dev (>= 2.8.0)
 Replaces: gnome-applets-dev (<< 2.21.3)
 Description: GWeather development files
  libgweather is a library to access weather information from online
  services for numerous locations.
  .
- This package contains the include files and static library
+ This package contains the include files and static library.
 
 Package: libgweather1
 Section: libs
@@ -41,7 +44,7 @@
  libgweather is a library to access weather information from online
  services for numerous locations.
  .
- This package contains shared libraries
+ This package contains shared libraries.
 
 Package: libgweather-common
 Architecture: all
@@ -53,5 +56,16 @@
  libgweather is a library to access weather information from online
  services for numerous locations.
  .
- This package contains the weather locations
+ This package contains the weather locations.
 
+# Package: python-gweather
+# Architecture: any
+# Section: python
+# Depends: ${shlibs:Depends},
+#          ${misc:Depends},
+#          ${python:Depends}
+# Description: Python bindings for GWeather
+#  libgweather is a library to access weather information from online
+#  services for numerous locations.
+#  .
+#  This package contains the Python bindings.

Modified: desktop/experimental/libgweather/debian/libgweather-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/libgweather-common.install?rev=17663&op=diff
==============================================================================
--- desktop/experimental/libgweather/debian/libgweather-common.install (original)
+++ desktop/experimental/libgweather/debian/libgweather-common.install Fri Nov 21 21:00:00 2008
@@ -1,4 +1,3 @@
 debian/tmp/etc/gconf/schemas
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/libgweather
-

Modified: desktop/experimental/libgweather/debian/patches/01_compress_locations.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/patches/01_compress_locations.patch?rev=17663&op=diff
==============================================================================
--- desktop/experimental/libgweather/debian/patches/01_compress_locations.patch (original)
+++ desktop/experimental/libgweather/debian/patches/01_compress_locations.patch Fri Nov 21 21:00:00 2008
@@ -1,20 +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 @@
+--- libgweather/parser.c.orig	2008-11-21 21:02:29.052844635 +0100
++++ libgweather/parser.c	2008-11-21 21:02:55.254514539 +0100
+@@ -168,7 +168,7 @@
+     /* First try to load a locale-specific XML. It's much faster. */
+     filename = NULL;
+     for (i = 0; parser->locales[i] != NULL; i++) {
+-	filename = g_strdup_printf ("%s/Locations.%s.xml",
++	filename = g_strdup_printf ("%s/Locations.%s.xml.gz",
+ 				    GWEATHER_XML_LOCATION_DIR,
+ 				    parser->locales[i]);
  
-   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]);
+@@ -183,7 +183,7 @@
+      * the english names (depending on the configure flags).
+      */
+     if (!filename)
+-	filename = g_strdup (GWEATHER_XML_LOCATION_DIR "/Locations.xml");
++	filename = g_strdup (GWEATHER_XML_LOCATION_DIR "/Locations.xml.gz");
  
-       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);
+     /* Open the xml file containing the different locations */
+     parser->xml = xmlNewTextReaderFilename (filename);

Modified: desktop/experimental/libgweather/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/patches/99_ltmain_as-needed.patch?rev=17663&op=diff
==============================================================================
--- desktop/experimental/libgweather/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/libgweather/debian/patches/99_ltmain_as-needed.patch Fri Nov 21 21:00:00 2008
@@ -27,6 +27,6 @@
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"

Added: desktop/experimental/libgweather/debian/python-gweather.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/python-gweather.install?rev=17663&op=file
==============================================================================
--- desktop/experimental/libgweather/debian/python-gweather.install (added)
+++ desktop/experimental/libgweather/debian/python-gweather.install Fri Nov 21 21:00:00 2008
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/python*

Modified: desktop/experimental/libgweather/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgweather/debian/rules?rev=17663&op=diff
==============================================================================
--- desktop/experimental/libgweather/debian/rules (original)
+++ desktop/experimental/libgweather/debian/rules Fri Nov 21 21:00:00 2008
@@ -7,5 +7,34 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_DH_MAKESHLIBS_ARGS_libgweather1 := -V 'libgweather1 (>= 2.23.92)'
+#DEB_BUILDDIR := $(CURDIR)/build-base
+#PYTHON_LDFLAGS := $(LDFLAGS) -Wl,-O1 -Wl,--as-needed
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
+#PYVERS := $(shell pyversions -vr)
+
+#configure/python-gweather:: $(PYVERS:%=build-%/config.status)
+#build-%/config.status:
+#	mkdir -p build-$*
+#	cd build-$* && \
+#		PYTHON=/usr/bin/python$* \
+#		$(DEB_CONFIGURE_SCRIPT_ENV) LDFLAGS="$(PYTHON_LDFLAGS)" \
+#		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) \
+#		$(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) \
+#		--enable-python
+#
+#build/python-gweather:: $(PYVERS:%=build-%/build-stamp)
+#build-%/build-stamp:
+#	$(MAKE) -C build-$* SUBDIRS="libgweather python"
+#	touch $@
+#
+#install/python-gweather:: $(PYVERS:%=install-%)
+#install-%:
+#	$(MAKE) -C build-$*/python install DESTDIR=$(DEB_DESTDIR)
+#
+#clean::
+#	rm -rf build-*
+#
+#binary-post-install/python-gweather::
+#	dh_pysupport -ppython-gweather

More information about the pkg-gnome-commits mailing list