r24016 - in /desktop/unstable/libgweather/debian: changelog control.in libgweather-common.install patches/99_ltmain_as-needed.patch patches/series rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sun Apr 25 12:43:38 UTC 2010 

Author: pochu
Date: Sun Apr 25 12:43:33 2010
New Revision: 24016

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24016
Log:
* debian/control.in,
  debian/rules:
  - Switch to CDBS' python-autotools.mk.
* debian/source/format,
  debian/patches/series,
  debian/rules:
  - Switch to quilt and source format 3.0 (quilt).
* debian/patches/99_ltmain_as-needed.patch:
  - Refreshed.
* debian/libgweather-common.install:
  - Install the icons here.
* debian/control.in:
  - Standards-Version is 3.8.4, no changes needed.
  - Tighten the -dev package dependency on the shared library package.

Added:
    desktop/unstable/libgweather/debian/patches/series
    desktop/unstable/libgweather/debian/source/
    desktop/unstable/libgweather/debian/source/format
Modified:
    desktop/unstable/libgweather/debian/changelog
    desktop/unstable/libgweather/debian/control.in
    desktop/unstable/libgweather/debian/libgweather-common.install
    desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch
    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=24016&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgweather/debian/changelog [utf-8] Sun Apr 25 12:43:33 2010
@@ -1,3 +1,22 @@
+libgweather (2.30.0-2) UNRELEASED; urgency=low
+
+  * debian/control.in,
+    debian/rules:
+    - Switch to CDBS' python-autotools.mk.
+  * debian/source/format,
+    debian/patches/series,
+    debian/rules:
+    - Switch to quilt and source format 3.0 (quilt).
+  * debian/patches/99_ltmain_as-needed.patch:
+    - Refreshed.
+  * debian/libgweather-common.install:
+    - Install the icons here.
+  * debian/control.in:
+    - Standards-Version is 3.8.4, no changes needed.
+    - Tighten the -dev package dependency on the shared library package.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 25 Apr 2010 00:35:08 +0200
+
 libgweather (2.30.0-1) unstable; urgency=low
 
   * New upstream stable release:

Modified: desktop/unstable/libgweather/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/control.in?rev=24016&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/control.in [utf-8] (original)
+++ desktop/unstable/libgweather/debian/control.in [utf-8] Sun Apr 25 12:43:33 2010
@@ -5,7 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
                autotools-dev,
-               cdbs,
+               cdbs (>= 0.4.73),
                gnome-pkg-tools,
                libxml2-dev (>= 2.6.0),
                libglib2.0-dev (>= 2.13.0),
@@ -22,12 +22,12 @@
                python-gtk2-dev,
                libglib2.0-doc,
                libgtk2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: libgweather-dev
 Section: libdevel
 Architecture: any
-Depends: libgweather1 (>= ${binary:Version}),
+Depends: libgweather1 (= ${binary:Version}),
          libxml2-dev (>= 2.6.0),
          libglib2.0-dev (>= 2.13.0),
          libgtk2.0-dev (>= 2.11.0),

Modified: desktop/unstable/libgweather/debian/libgweather-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/libgweather-common.install?rev=24016&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/libgweather-common.install [utf-8] (original)
+++ desktop/unstable/libgweather/debian/libgweather-common.install [utf-8] Sun Apr 25 12:43:33 2010
@@ -1,3 +1,4 @@
 debian/tmp/etc/gconf/schemas
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/libgweather
+debian/tmp/usr/share/icons

Modified: desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch?rev=24016&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/libgweather/debian/patches/99_ltmain_as-needed.patch [utf-8] Sun Apr 25 12:43:33 2010
@@ -1,9 +1,7 @@
-Index: nautilus-2.18.1/ltmain.sh
-===================================================================
---- nautilus-2.18.1.orig/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
-@@ -1784,6 +1784,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
  	;;
  
 +      -Wl,--as-needed)
@@ -12,9 +10,9 @@
 +	;;
 +      
        -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2124,6 +2129,15 @@
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5070,6 +5075,15 @@
  	lib=
  	found=no
  	case $deplib in

Added: desktop/unstable/libgweather/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/patches/series?rev=24016&op=file
==============================================================================
--- desktop/unstable/libgweather/debian/patches/series (added)
+++ desktop/unstable/libgweather/debian/patches/series [utf-8] Sun Apr 25 12:43:33 2010
@@ -1,0 +1,1 @@
+99_ltmain_as-needed.patch

Modified: desktop/unstable/libgweather/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/rules?rev=24016&op=diff
==============================================================================
--- desktop/unstable/libgweather/debian/rules [utf-8] (original)
+++ desktop/unstable/libgweather/debian/rules [utf-8] Sun Apr 25 12:43:33 2010
@@ -1,42 +1,17 @@
 #!/usr/bin/make -f
 
+DEB_BUILDDIR = debian/build
+DEB_PYTHON_SYSTEM = pysupport
+
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/python-autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-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.30.0)'
-DEB_BUILDDIR := $(CURDIR)/build-base
-PYTHON_LDFLAGS := $(LDFLAGS) -Wl,-O1 -Wl,--as-needed
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-locations-compression
-
-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
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-locations-compression --enable-python

Added: desktop/unstable/libgweather/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgweather/debian/source/format?rev=24016&op=file
==============================================================================
--- desktop/unstable/libgweather/debian/source/format (added)
+++ desktop/unstable/libgweather/debian/source/format [utf-8] Sun Apr 25 12:43:33 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list