r9443 - in /desktop/experimental/gnome-python-desktop/debian:
changelog control control.in pycompat python-gnome2-desktop-dev.dirs
python-gnome2-desktop-doc.dirs rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Mar 28 22:20:05 CET 2007
Author: joss
Date: Wed Mar 28 21:20:05 2007
New Revision: 9443
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9443
Log:
* Massive cleanup in the build rules.
* Switch to python-support.
* Move python-gtk2 depencency to the Python-Depends field.
* Build-depend on python-support 0.6.
* Remove dh_python and debian/pycompat.
Added:
desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-dev.dirs
desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-doc.dirs
Removed:
desktop/experimental/gnome-python-desktop/debian/pycompat
Modified:
desktop/experimental/gnome-python-desktop/debian/changelog
desktop/experimental/gnome-python-desktop/debian/control
desktop/experimental/gnome-python-desktop/debian/control.in
desktop/experimental/gnome-python-desktop/debian/rules
Modified: desktop/experimental/gnome-python-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python-desktop/debian/changelog?rev=9443&op=diff
==============================================================================
--- desktop/experimental/gnome-python-desktop/debian/changelog (original)
+++ desktop/experimental/gnome-python-desktop/debian/changelog Wed Mar 28 21:20:05 2007
@@ -17,7 +17,14 @@
[ Loic Minier ]
* Drop postinst snippet which seems to be useless nowadays.
- -- Loic Minier <lool at dooz.org> Wed, 28 Mar 2007 21:42:19 +0200
+ [ Josselin Mouette ]
+ * Massive cleanup in the build rules.
+ * Switch to python-support.
+ * Move python-gtk2 depencency to the Python-Depends field.
+ * Build-depend on python-support 0.6.
+ * Remove dh_python and debian/pycompat.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 28 Mar 2007 22:13:20 +0200
gnome-python-desktop (2.16.0-1) experimental; urgency=low
Modified: desktop/experimental/gnome-python-desktop/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python-desktop/debian/control?rev=9443&op=diff
==============================================================================
--- desktop/experimental/gnome-python-desktop/debian/control (original)
+++ desktop/experimental/gnome-python-desktop/debian/control Wed Mar 28 21:20:05 2007
@@ -2,8 +2,8 @@
Section: python
Priority: optional
Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Marc HE Brockschmidt <he at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), gnome-pkg-tools (>= 0.10), python-central (>= 0.5), autotools-dev, dpkg-dev (>= 1.13.19),
+Uploaders: Josselin Mouette <joss at debian.org>
+Build-Depends: debhelper (>= 5.0.37.2), gnome-pkg-tools (>= 0.10), python-support (>= 0.6), autotools-dev, dpkg-dev (>= 1.13.19),
python, python-all-dev (>= 2.3.5-11), python-gtk2-dev (>= 2.10), python-gnome2-dev (>= 2.10.0), python-cairo-dev,
libglib2.0-dev (>= 2.6.0), libgtk2.0-dev (>= 2.4), librsvg2-dev (>= 2.13.93), libgtop2-dev (>= 2.13.0), libwnck-dev (>= 2.15.5),
libpanel-applet2-dev (>= 2.13.4),
@@ -23,7 +23,8 @@
Package: python-gnome2-desktop
Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, python-gtk2, python-pyorbit, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, python-pyorbit, ${shlibs:Depends}
+Python-Depends: python-gtk2
Provides: ${python:Provides}
Replaces: python2.2-gnome2 (<< 1.99.16-5), python2.3-gnome2 (<< 2.9.1), python2.3-gnome2-extras (<< 2.13.3), python2.4-gnome2-extras (<< 2.13.3), python2.4-gnome2-desktop, python-gnome2-extras (<< 2.13.3)
Suggests: python-gnome2-desktop-doc
Modified: desktop/experimental/gnome-python-desktop/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python-desktop/debian/control.in?rev=9443&op=diff
==============================================================================
--- desktop/experimental/gnome-python-desktop/debian/control.in (original)
+++ desktop/experimental/gnome-python-desktop/debian/control.in Wed Mar 28 21:20:05 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Loic Minier <lool at dooz.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5.0.37.2), gnome-pkg-tools (>= 0.10), python-central (>= 0.5), autotools-dev, dpkg-dev (>= 1.13.19),
+Build-Depends: debhelper (>= 5.0.37.2), gnome-pkg-tools (>= 0.10), python-support (>= 0.6), autotools-dev, dpkg-dev (>= 1.13.19),
python, python-all-dev (>= 2.3.5-11), python-gtk2-dev (>= 2.10), python-gnome2-dev (>= 2.10.0), python-cairo-dev,
libglib2.0-dev (>= 2.6.0), libgtk2.0-dev (>= 2.4), librsvg2-dev (>= 2.13.93), libgtop2-dev (>= 2.13.0), libwnck-dev (>= 2.15.5),
libpanel-applet2-dev (>= 2.13.4),
@@ -23,7 +23,8 @@
Package: python-gnome2-desktop
Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, python-gtk2, python-pyorbit, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, python-pyorbit, ${shlibs:Depends}
+Python-Depends: python-gtk2
Provides: ${python:Provides}
Replaces: python2.2-gnome2 (<< 1.99.16-5), python2.3-gnome2 (<< 2.9.1), python2.3-gnome2-extras (<< 2.13.3), python2.4-gnome2-extras (<< 2.13.3), python2.4-gnome2-desktop, python-gnome2-extras (<< 2.13.3)
Suggests: python-gnome2-desktop-doc
Added: desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-dev.dirs?rev=9443&op=file
==============================================================================
--- desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-dev.dirs (added)
+++ desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-dev.dirs Wed Mar 28 21:20:05 2007
@@ -1,0 +1,2 @@
+/usr/share
+/usr/lib
Added: desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-doc.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-doc.dirs?rev=9443&op=file
==============================================================================
--- desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-doc.dirs (added)
+++ desktop/experimental/gnome-python-desktop/debian/python-gnome2-desktop-doc.dirs Wed Mar 28 21:20:05 2007
@@ -1,0 +1,1 @@
+/usr/share
Modified: desktop/experimental/gnome-python-desktop/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-python-desktop/debian/rules?rev=9443&op=diff
==============================================================================
--- desktop/experimental/gnome-python-desktop/debian/rules (original)
+++ desktop/experimental/gnome-python-desktop/debian/rules Wed Mar 28 21:20:05 2007
@@ -9,71 +9,66 @@
# prevent accidental uploads to unstable
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-PY_VERSIONS = $(shell pyversions -r debian/control)
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
-# configure flags
-configure_flags := --prefix=/usr --enable-metacity
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
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-metacity \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --host=$(DEB_HOST_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
- configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
-else
- configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
+PYVERS=$(shell pyversions -vr debian/control 2>/dev/null)
-# FIXME "make install" should be split, perhaps with an out of tree ./configure
-# if upstream supports it
-build-stamp-%:
+build-%/configure-stamp: configure
dh_testdir
- -$(MAKE) distclean
- PYTHON=`which $*` \
- ./configure $(configure_flags)
- $(MAKE)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/python-gnome2-desktop
+ mkdir -p build-$*
+ cd build-$* && PYTHON=/usr/bin/python$* ../configure $(configure_flags)
+ touch $@
-build: $(addprefix build-stamp-, $(PY_VERSIONS))
+build-%/build-stamp: build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C build-$*
+ touch $@
+
+build: $(PYVERS:%=build-%/build-stamp)
+
+install-clean:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+install-%: build-%/build-stamp
+ dh_testdir
+ dh_testroot
+ $(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/python-gnome2-desktop
+
+install: build install-clean $(PYVERS:%=install-%)
+ dh_installdirs
+ mv debian/python-gnome2-desktop/usr/lib/pkgconfig debian/python-gnome2-desktop-dev/usr/lib/
+ mv debian/python-gnome2-desktop/usr/share/pygtk debian/python-gnome2-desktop-dev/usr/share/
+ mv debian/python-gnome2-desktop/usr/share/gtk-doc debian/python-gnome2-desktop-doc/usr/share/
clean::
dh_testdir
dh_testroot
-test -r config.sub && test -r /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub
-test -r config.guess && test -r /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess
- -$(MAKE) distclean
- rm -f build-stamp-* */*.pyc *.pyc
+ rm -Rf build-*
+ rm -f */*.pyc *.pyc
dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- find debian/python-gnome2-desktop -name '*.la' -exec rm -f '{}' \;
- mkdir -p debian/python-gnome2-desktop-dev/usr/lib
- mv debian/python-gnome2-desktop/usr/lib/pkgconfig debian/python-gnome2-desktop-dev/usr/lib/pkgconfig
- mkdir -p debian/python-gnome2-desktop-dev/usr/share/pygtk/2.0
- mv debian/python-gnome2-desktop/usr/share/pygtk/2.0/defs debian/python-gnome2-desktop-dev/usr/share/pygtk/2.0/
- mkdir -p debian/python-gnome2-desktop-doc/usr/share
- mv debian/python-gnome2-desktop/usr/share/gtk-doc debian/python-gnome2-desktop-doc/usr/share/
- rmdir debian/python-gnome2-desktop/usr/share/pygtk/2.0
- rmdir debian/python-gnome2-desktop/usr/share/pygtk
- rmdir debian/python-gnome2-desktop/usr/share
binary-indep: build install
dh_testdir
dh_testroot
dh_installdocs -i
+ dh_installexamples -i
dh_installchangelogs -i ChangeLog
- dh_compress -i
+ dh_compress -i -Xexamples
dh_fixperms -i
- dh_python -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
@@ -88,8 +83,7 @@
dh_strip -a
dh_compress -a
dh_fixperms -a
- dh_pycentral -a
- dh_python -a
+ dh_pysupport -a
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
More information about the pkg-gnome-commits
mailing list