r9926 - in /desktop/unstable/pygobject/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sat Apr 14 11:30:08 2007
New Revision: 9926

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9926
Log:
* Don't pass --host to configure when DEB_BUILD_GNU_TYPE equals
  DEB_HOST_GNU_TYPE.
* build target is PHONY.
* Cleanups.

Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/control
    desktop/unstable/pygobject/debian/control.in
    desktop/unstable/pygobject/debian/rules

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=9926&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog (original)
+++ desktop/unstable/pygobject/debian/changelog Sat Apr 14 11:30:08 2007
@@ -14,8 +14,12 @@
   * Set XS-Python-Version to >= 2.3 and build-conflict on python2.3-dev <<
     2.3.5; add XB-Python-Version; bump python-all-dev build-dep to >= 2.3.5.
   * Add a ${misc:Depends}.
+  * Don't pass --host to configure when DEB_BUILD_GNU_TYPE equals
+    DEB_HOST_GNU_TYPE.
+  * build target is PHONY.
+  * Cleanups.
 
- -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 13:23:29 +0200
+ -- Loic Minier <lool at dooz.org>  Sat, 14 Apr 2007 13:29:37 +0200
 
 pygobject (2.12.3-1) experimental; urgency=low
 

Modified: desktop/unstable/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control?rev=9926&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control (original)
+++ desktop/unstable/pygobject/debian/control Sat Apr 14 11:30:08 2007
@@ -25,11 +25,11 @@
 XB-Python-Version: ${python:Versions}
 Conflicts: python-gtk2 (<< 2.10)
 Description: Python bindings for the GObject library
- 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, 
+ 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 
+ This package contains the python bindings for GObject. It is mostly
  used by other bindings to map their GObjects to python objects.
 
 Package: python-gobject-dev
@@ -45,5 +45,5 @@
  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 development headers needed to build 
+ This package contains the development headers needed to build
  other python bindings relying on pygobject.

Modified: desktop/unstable/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control.in?rev=9926&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control.in (original)
+++ desktop/unstable/pygobject/debian/control.in Sat Apr 14 11:30:08 2007
@@ -25,11 +25,11 @@
 XB-Python-Version: ${python:Versions}
 Conflicts: python-gtk2 (<< 2.10)
 Description: Python bindings for the GObject library
- 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, 
+ 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 
+ This package contains the python bindings for GObject. It is mostly
  used by other bindings to map their GObjects to python objects.
 
 Package: python-gobject-dev
@@ -45,5 +45,5 @@
  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 development headers needed to build 
+ This package contains the development headers needed to build
  other python bindings relying on pygobject.

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=9926&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules (original)
+++ desktop/unstable/pygobject/debian/rules Sat Apr 14 11:30:08 2007
@@ -1,17 +1,21 @@
 #!/usr/bin/make -f
+
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS += -Wall -g
+configure_flags += \
+		--prefix=/usr \
+		--enable-thread \
+		--build=$(DEB_BUILD_GNU_TYPE)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
 endif
 
 PYVERS := $(shell pyversions -vs)
@@ -21,10 +25,7 @@
 	mkdir -p build-$*
 	cd build-$* && \
 		PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \
-			../configure --host=$(DEB_HOST_GNU_TYPE) \
-				--build=$(DEB_BUILD_GNU_TYPE) \
-				--prefix=/usr \
-				--enable-thread
+			$(CURDIR)/configure $(configure_flags)
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp
@@ -98,4 +99,4 @@
 	dh_builddeb -a
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary build install