r10225 - in /desktop/unstable/gnome-python/debian: changelog python-gnome2.postinst python-gnome2.rtupdate rules

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Apr 22 12:47:20 2007
New Revision: 10225

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10225
Log:
* Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
  differ.
* Cleanups.

Modified:
    desktop/unstable/gnome-python/debian/changelog
    desktop/unstable/gnome-python/debian/python-gnome2.postinst
    desktop/unstable/gnome-python/debian/python-gnome2.rtupdate
    desktop/unstable/gnome-python/debian/rules

Modified: desktop/unstable/gnome-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/changelog?rev=10225&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/changelog (original)
+++ desktop/unstable/gnome-python/debian/changelog Sun Apr 22 12:47:20 2007
@@ -11,8 +11,11 @@
   * Add a ${misc:Depends}.
   * Fix URL in copyright.
   * Fix copyright to really document copyrights and license.
-
- -- Loic Minier <lool at dooz.org>  Sun, 22 Apr 2007 14:41:38 +0200
+  * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
+    differ.
+  * Cleanups.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 22 Apr 2007 14:46:52 +0200
 
 gnome-python (2.16.2-1) experimental; urgency=low
 

Modified: desktop/unstable/gnome-python/debian/python-gnome2.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/python-gnome2.postinst?rev=10225&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/python-gnome2.postinst (original)
+++ desktop/unstable/gnome-python/debian/python-gnome2.postinst Sun Apr 22 12:47:20 2007
@@ -1,4 +1,5 @@
-#! /bin/sh
+#!/bin/sh
+
 set -e
 
 /usr/share/python/runtime.d/python-gnome2.rtupdate rtupdate pouet $(pyversions -d)

Modified: desktop/unstable/gnome-python/debian/python-gnome2.rtupdate
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/python-gnome2.rtupdate?rev=10225&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/python-gnome2.rtupdate (original)
+++ desktop/unstable/gnome-python/debian/python-gnome2.rtupdate Sun Apr 22 12:47:20 2007
@@ -1,4 +1,5 @@
-#! /bin/sh
+#!/bin/sh
+
 set -e
 
 if [ "$1" = rtupdate ]; then

Modified: desktop/unstable/gnome-python/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python/debian/rules?rev=10225&op=diff
==============================================================================
--- desktop/unstable/gnome-python/debian/rules (original)
+++ desktop/unstable/gnome-python/debian/rules Sun Apr 22 12:47:20 2007
@@ -1,42 +1,28 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
+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)
 
+configure_flags += --prefix=/usr --enable-thread --build=$(DEB_BUILD_GNU_TYPE)
 
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-# Include pkg-gnome stuff.
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-# get-orig-source target
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-CFLAGS += -Wall -g
-
-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 -vr debian/control 2>/dev/null)
+PYVERS := $(shell pyversions -vr debian/control 2>/dev/null)
 
 build-%/configure-stamp: configure
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && \
 		PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \
-			$(CURDIR)/configure \
-				--host=$(DEB_HOST_GNU_TYPE) \
-				--build=$(DEB_BUILD_GNU_TYPE) \
-				--prefix=/usr
+			$(CURDIR)/configure $(configure_flags)
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp
@@ -69,7 +55,6 @@
 	rm -rf build-* debian/tmp-*
 	dh_clean
 
-# Build architecture-independent files here.
 binary-indep:
 	dh_testdir
 	dh_testroot
@@ -88,7 +73,6 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot