r20969 - in /desktop/unstable/libgweather/debian: changelog control control.in copyright patches/01_python_include_dir.patch rules
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Mon Aug 17 17:01:57 UTC 2009
Author: pochu-guest
Date: Mon Aug 17 17:01:57 2009
New Revision: 20969
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20969
Log:
* Build the python bindings in python-gweather. Closes: #539091.
* debian/copyright: add "Copyright" to the debian packaging copyright
notice.
* Standards-Version is 3.8.3, no changes needed.
Added:
desktop/unstable/libgweather/debian/patches/01_python_include_dir.patch
Modified:
desktop/unstable/libgweather/debian/changelog
desktop/unstable/libgweather/debian/control
desktop/unstable/libgweather/debian/control.in
desktop/unstable/libgweather/debian/copyright
desktop/unstable/libgweather/debian/rules
Modified: desktop/unstable/libgweather/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/changelog?rev=20969&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgweather/debian/changelog [utf-8] Mon Aug 17 17:01:57 2009
@@ -1,3 +1,12 @@
+libgweather (2.26.1-2) UNRELEASED; urgency=low
+
+ * Build the python bindings in python-gweather. Closes: #539091.
+ * debian/copyright: add "Copyright" to the debian packaging copyright
+ notice.
+ * Standards-Version is 3.8.3, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com> Mon, 17 Aug 2009 18:37:22 +0200
+
libgweather (2.26.1-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/libgweather/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control?rev=20969&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control [utf-8] (original)
+++ desktop/unstable/libgweather/debian/control [utf-8] Mon Aug 17 17:01:57 2009
@@ -1,24 +1,28 @@
Source: libgweather
+Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 5),
autotools-dev,
cdbs,
+ gnome-pkg-tools,
libxml2-dev (>= 2.6.0),
libglib2.0-dev (>= 2.13.0),
libgtk2.0-dev (>= 2.11.0),
libsoup-gnome2.4-dev (>= 2.25.1),
libgconf2-dev (>= 2.8.0),
gconf2,
- gnome-pkg-tools,
intltool (>= 0.40.3),
pkg-config (>= 0.19),
libxml2-utils,
+ python-support,
+ python-all-dev,
+ python-gobject-dev,
+ python-gtk2-dev,
libglib2.0-doc,
libgtk2.0-doc
-Standards-Version: 3.8.1
-Section: libs
+Standards-Version: 3.8.3
Package: libgweather-dev
Section: libdevel
@@ -38,7 +42,6 @@
This package contains the include files and static library.
Package: libgweather1
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -62,14 +65,14 @@
.
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.
+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/unstable/libgweather/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control.in?rev=20969&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control.in [utf-8] (original)
+++ desktop/unstable/libgweather/debian/control.in [utf-8] Mon Aug 17 17:01:57 2009
@@ -1,24 +1,28 @@
Source: libgweather
+Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
autotools-dev,
cdbs,
+ gnome-pkg-tools,
libxml2-dev (>= 2.6.0),
libglib2.0-dev (>= 2.13.0),
libgtk2.0-dev (>= 2.11.0),
libsoup-gnome2.4-dev (>= 2.25.1),
libgconf2-dev (>= 2.8.0),
gconf2,
- gnome-pkg-tools,
intltool (>= 0.40.3),
pkg-config (>= 0.19),
libxml2-utils,
+ python-support,
+ python-all-dev,
+ python-gobject-dev,
+ python-gtk2-dev,
libglib2.0-doc,
libgtk2.0-doc
-Standards-Version: 3.8.1
-Section: libs
+Standards-Version: 3.8.3
Package: libgweather-dev
Section: libdevel
@@ -38,7 +42,6 @@
This package contains the include files and static library.
Package: libgweather1
-Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -62,14 +65,14 @@
.
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.
+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/unstable/libgweather/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/copyright?rev=20969&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/copyright [utf-8] (original)
+++ desktop/unstable/libgweather/debian/copyright [utf-8] Mon Aug 17 17:01:57 2009
@@ -22,12 +22,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -35,5 +35,5 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is (C) 2008, Sebastien Bacher <seb128 at canonical.com> and
-is licensed under the GPL, see above.
+The Debian packaging is Copyright (C) 2008, Sebastien Bacher <seb128 at canonical.com>
+and is licensed under the GPL, see above.
Added: desktop/unstable/libgweather/debian/patches/01_python_include_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/01_python_include_dir.patch?rev=20969&op=file
==============================================================================
--- desktop/unstable/libgweather/debian/patches/01_python_include_dir.patch (added)
+++ desktop/unstable/libgweather/debian/patches/01_python_include_dir.patch [utf-8] Mon Aug 17 17:01:57 2009
@@ -1,0 +1,42 @@
+Description: fix building the python bindings out of tree
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=592109
+
+diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/python/Makefile.am libgweather-2.26.1.new/python/Makefile.am
+--- libgweather-2.26.1/python/Makefile.am 2009-04-14 00:00:46.000000000 +0200
++++ libgweather-2.26.1.new/python/Makefile.am 2009-08-17 18:01:55.000000000 +0200
+@@ -1,5 +1,6 @@
+ if BUILD_PYTHON
+ INCLUDES = \
++ -I$(top_srcdir) \
+ $(PYTHON_INCLUDES) \
+ $(PYGOBJECT_CFLAGS) \
+ $(GTK_CFLAGS)
+@@ -24,7 +25,7 @@
+
+ install-exec-hook:
+ $(MKDIR_P) "$(DESTDIR)$(pyunstabledir)"
+- $(INSTALL_SCRIPT) bad__init__.py "$(DESTDIR)$(pyexecdir)/gweather/__init__.py"
++ $(INSTALL_SCRIPT) $(srcdir)/bad__init__.py "$(DESTDIR)$(pyexecdir)/gweather/__init__.py"
+ touch $(DESTDIR)$(pyunstabledir)/__init__.py
+ chmod a+x $(DESTDIR)$(pyunstabledir)/__init__.py
+
+diff -Nur -x '*.orig' -x '*~' libgweather-2.26.1/python/Makefile.in libgweather-2.26.1.new/python/Makefile.in
+--- libgweather-2.26.1/python/Makefile.in 2009-04-14 00:09:57.000000000 +0200
++++ libgweather-2.26.1.new/python/Makefile.in 2009-08-17 18:02:16.000000000 +0200
+@@ -276,6 +276,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ @BUILD_PYTHON_TRUE at INCLUDES = \
++ at BUILD_PYTHON_TRUE@ -I$(top_srcdir) \
+ @BUILD_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
+ @BUILD_PYTHON_TRUE@ $(PYGOBJECT_CFLAGS) \
+ @BUILD_PYTHON_TRUE@ $(GTK_CFLAGS)
+@@ -583,7 +584,7 @@
+
+ @BUILD_PYTHON_TRUE at install-exec-hook:
+ @BUILD_PYTHON_TRUE@ $(MKDIR_P) "$(DESTDIR)$(pyunstabledir)"
+- at BUILD_PYTHON_TRUE@ $(INSTALL_SCRIPT) bad__init__.py "$(DESTDIR)$(pyexecdir)/gweather/__init__.py"
++ at BUILD_PYTHON_TRUE@ $(INSTALL_SCRIPT) $(srcdir)/bad__init__.py "$(DESTDIR)$(pyexecdir)/gweather/__init__.py"
+ @BUILD_PYTHON_TRUE@ touch $(DESTDIR)$(pyunstabledir)/__init__.py
+ @BUILD_PYTHON_TRUE@ chmod a+x $(DESTDIR)$(pyunstabledir)/__init__.py
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Modified: desktop/unstable/libgweather/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/rules?rev=20969&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/rules [utf-8] (original)
+++ desktop/unstable/libgweather/debian/rules [utf-8] Mon Aug 17 17:01:57 2009
@@ -8,35 +8,35 @@
-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
+DEB_BUILDDIR := $(CURDIR)/build-base
+PYTHON_LDFLAGS := $(LDFLAGS) -Wl,-O1 -Wl,--as-needed
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
DEB_CONFIGURE_EXTRA_FLAGS += --enable-locations-compression
-#PYVERS := $(shell pyversions -vr)
+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
+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