Changeset 3079

Timestamp:

02/29/08 06:22:27 (5 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 2.14.1-2

Location:

pkg/main/pygobject/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (5 diffs)
• control.in (modified) (4 diffs)
• patches (added)
• patches/60_use-python-config-for-includes.patch (added)
• rules (modified) (4 diffs)

pkg/main/pygobject/trunk/debian/changelog

@@ -1 @@
-pygobject (2.14.1-parsix1) unstable; urgency=low
+pygobject (2.14.1-parsix2) unstable; urgency=low
 
-  * New upstream stable release  
+  * Sync'd with Debian 2.14.1-2
 
- -- Alan Baghumian <alan@technotux.org>  Sun, 06 Jan 2008 11:18:40 +0330
+ -- Alan Baghumian <alan@technotux.org>  Fri, 29 Feb 2008 08:51:44 +0330
 
-pygobject (2.14.0-parsix2) unstable; urgency=low
+pygobject (2.14.1-2) unstable; urgency=low
 
-  * Sync'd with Debian
+  * New patch, 60_use-python-config-for-includes, use python-config to set
+    PYTHON_INCLUDES; fixes support for -dbg package; GNOME #448173;
+    closes: #468130.  NB: the patch also ships m4/ from upstream SVN as this
+    wasn't disted properly and also updated autoconf.
 
- -- Alan Baghumian <alan@technotux.org>  Mon, 29 Oct 2007 14:41:11 +0330
+ -- Loic Minier <lool@dooz.org>  Wed, 27 Feb 2008 16:09:00 +0100
+
+pygobject (2.14.1-1) unstable; urgency=low
+
+  * New upstream release; new features / bug fixes.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 07 Jan 2008 10:59:32 +0100
+
+pygobject (2.14.0-4) unstable; urgency=low
+
+  * debian/rules:
+     - don't stop the build when make check has an error to avoid having
+       to add a depends on pygtk
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 01 Dec 2007 23:20:19 +0100
+
+pygobject (2.14.0-3) unstable; urgency=low
+
+  * debian/control.in:
+    - Build-Depends on python-all-dbg
+    - Conflicts,Provides,Replaces python-gobject-doc
+    - list python-gobject-dbg package
+  * debian/rules:
+    - build dbg variant
+    - run make check
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 30 Nov 2007 12:46:58 +0100
 
 pygobject (2.14.0-2) unstable; urgency=low

pkg/main/pygobject/trunk/debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastien Bacher <seb128@debian.org>
 Build-Depends: debhelper (>= 5),
                python-support (>= 0.4),
@@ -13 +13 @@
                xsltproc,
                docbook-xsl,
-               autotools-dev
+               autotools-dev,
+               python-all-dbg
 Build-Conflicts: python2.3-dev (<< 2.3.5)
 XS-Python-Version: >= 2.3
@@ -25 +26 @@
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
+Suggests: python-gobject-dbg
 Conflicts: python-gtk2 (<< 2.10)
 Description: Python bindings for the GObject library
@@ -42 +44 @@
          libglib2.0-dev (>= 2.8.0),
          libffi-dev
-Conflicts: python-gtk2-dev (<< 2.10)
+Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc
+Replaces: python-gobject-doc
+Provides: python-gobject-doc
 Recommends: docbook-xsl
 Description: Development headers for the GObject python bindings
@@ -51 +55 @@
  This package contains the development headers needed to build
  other python bindings relying on pygobject.
+
+Package: python-gobject-dbg
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${Source-Version})
+Conflicts: python-gtk2 (<< 2.10)
+Description: Python bindings for the GObject library (debug extension)
+ GObject is an abstraction layer that allows to program with an object
+ paradigm that is compatible with many languages. It is a part of
+ Glib,
+ the core library used to build GTK+ and GNOME.
+ .
+ This package contains the python bindings for GObject. It is
+ mostly
+ used by other bindings to map their GObjects to python objects.

pkg/main/pygobject/trunk/debian/control.in

@@ -13 +13 @@
                xsltproc,
                docbook-xsl,
-               autotools-dev
+               autotools-dev,
+               python-all-dbg
 Build-Conflicts: python2.3-dev (<< 2.3.5)
 XS-Python-Version: >= 2.3
@@ -25 +26 @@
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
+Suggests: python-gobject-dbg
 Conflicts: python-gtk2 (<< 2.10)
 Description: Python bindings for the GObject library
@@ -42 +44 @@
          libglib2.0-dev (>= 2.8.0),
          libffi-dev
-Conflicts: python-gtk2-dev (<< 2.10)
+Conflicts: python-gtk2-dev (<< 2.10), python-gobject-doc
+Replaces: python-gobject-doc
+Provides: python-gobject-doc
 Recommends: docbook-xsl
 Description: Development headers for the GObject python bindings
@@ -51 +55 @@
  This package contains the development headers needed to build
  other python bindings relying on pygobject.
+
+Package: python-gobject-dbg
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-dbg, python-gobject (= ${Source-Version})
+Conflicts: python-gtk2 (<< 2.10)
+Description: Python bindings for the GObject library (debug extension)
+ GObject is an abstraction layer that allows to program with an object
+ paradigm that is compatible with many languages. It is a part of
+ Glib,
+ the core library used to build GTK+ and GNOME.
+ .
+ This package contains the python bindings for GObject. It is
+ mostly
+ used by other bindings to map their GObjects to python objects.

pkg/main/pygobject/trunk/debian/rules

@@ -29 +29 @@
         touch $@
 
+dbg-build-%/configure-stamp:
+        dh_testdir
+        mkdir -p dbg-build-$*
+        cd dbg-build-$* && \
+                PYTHON=/usr/bin/python$*-dbg CFLAGS="$(CFLAGS) -O0" \
+                        $(CURDIR)/configure $(configure_flags)
+        touch $@
+
 build-%/build-stamp: build-%/configure-stamp
         dh_testdir
         $(MAKE) -C build-$*
+        -$(MAKE) -C build-$* check
         touch $@
 
-build: apply-patches $(PYVERS:%=build-%/build-stamp)
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+        dh_testdir
+        $(MAKE) -C dbg-build-$*
+        touch $@
+
+build: apply-patches $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
 
 install-clean:
@@ -46 +60 @@
         $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dev
 
-install: build install-clean $(PYVERS:%=install-%)
+dbg-install-%: dbg-build-%/build-stamp
+        dh_testdir
+        dh_testroot
+        $(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gobject-dbg
+        find debian/python-gobject-dbg ! -type d ! -name '*.so' | xargs rm -f
+        find debian/python-gobject-dbg -depth -empty -exec rmdir {} \;
+
+install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%)
         dh_testdir
         dh_testroot
@@ -52 +73 @@
         mkdir -p debian/python-gobject/usr/lib
         mv debian/python-gobject-dev/usr/lib/python* debian/python-gobject/usr/lib/
+        for i in $$(find debian/python-gobject-dbg -name '*.so'); do \
+                b=$$(basename $$i .so); \
+                mv $$i $$(dirname $$i)/$${b}_d.so; \
+        done
 
 clean:: reverse-patches
         dh_testdir
         dh_testroot
-        rm -Rf build-*
+        rm -Rf build-* dbg-build-*
         -test -f config.sub && \
           test -r /usr/share/misc/config.sub && \
@@ -88 +113 @@
         dh_installexamples -a
         dh_installchangelogs ChangeLog -a
-        dh_strip -a
+        dh_strip -ppython-gobject --dbg-package=python-gobject-dbg
+        rm -rf debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg
+        ln -sf python-gobject debian/python-gobject-dbg/usr/share/doc/python-gobject-dbg
         dh_link -a
         dh_compress -a -X.py