Changeset 600 for pkg/main/gnome-python-desktop

Timestamp:

04/04/07 16:58:06 (6 years ago)

Author:

alanbach-guest

Message:

gnome-python-desktop 2.18.0 updates

Location:

pkg/main/gnome-python-desktop/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (2 diffs)
• control.in (modified) (2 diffs)
• rules (modified) (5 diffs)

pkg/main/gnome-python-desktop/trunk/debian/changelog

@@ -1 @@
-gnome-python-desktop (2.16.0-parsix1) unstable; urgency=low
+gnome-python-desktop (2.18.0-parsix1) barry; urgency=low
 
-  * Parsix build.
+  * Parsix build 
 
- -- Alan Baghumian <alan@technotux.org>  Thu,  8 Feb 2007 09:38:21 +0330
+ -- Alan Baghumian <alan@technotux.org>  Wed,  4 Apr 2007 18:26:49 +0330
+
+gnome-python-desktop (2.18.0-1) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Add a postinst snippet on suggest of Sebastian Dröge, similar to the one
+    in python-dbus, because we're switching from pycentral to pysupport and
+    this might leave file behind.
+  * Add a get-orig-source target to retrieve the upstream tarball.
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * Cleanup rules.
+
+  [ Marc 'HE' Brockschmidt ]
+  * New upstream release:
+    + debian/control.in: Update, reorder and clean build-deps
+    + debian/rules: Enable build of metacity bindings
+
+  [ Loic Minier ]
+  * Drop postinst snippet which seems to be useless nowadays.
+
+  [ 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@debian.org>  Wed, 28 Mar 2007 22:13:20 +0200
 
 gnome-python-desktop (2.16.0-1) experimental; urgency=low

pkg/main/gnome-python-desktop/trunk/debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Loic Minier <lool@dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Andrew Lau <netsnipe@users.sourceforge.net>, Clément Stenac <zorglub@debian.org>, Dafydd Harries <daf@debian.org>, Guilherme de S. Pastore <gpastore@debian.org>, Gustavo Franco <stratus@debian.org>, Gustavo Noronha Silva <kov@debian.org>, J.H.M. Dassen (Ray) <jdassen@debian.org>, Jordi Mallach <jordi@debian.org>, Jose Carlos Garcia Sogo <jsogo@debian.org>, Josselin Mouette <joss@debian.org>, Kilian Krause <kilian@debian.org>, Marc 'HE' Brockschmidt <he@debian.org>, Marco Cabizza <marco87@gmail.com>, Oystein Gisnas <oystein@gisnas.net>, Ondřej SurÃœ <ondrej@debian.org>, Ross Burton <ross@debian.org>, Sebastien Bacher <seb128@debian.org>, Sjoerd Simons <sjoerd@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), gnome-pkg-tools, libpanel-applet2-dev (>= 2.13.4), python, python-gtk2-dev (>= 2.4), libglib2.0-dev (>= 2.6.0), python-gnome2-dev (>= 2.10.0), libgtk2.0-dev (>= 2.4), libtotem-plparser-dev (>= 1.3.1), libpanel-applet2-dev (>= 2.13.4), libgnomeprint2.2-dev (>= 2.2.0), libgnomeprintui2.2-dev (>= 2.2), libgtksourceview-dev (>= 1.1.90), libwnck-dev (>= 2.15.5), libgtop2-dev (>= 2.13.0), libnautilus-burn-dev (>= 2.15.3), libgnome-media-dev (>= 2.10.0), libgconf2-dev (>= 2.10.0), libmetacity-dev (>= 2.15.5), python-all-dev (>= 2.3.5-11), python-central (>= 0.5), autotools-dev, dpkg-dev (>= 1.13.19), librsvg2-dev (>= 2.13.93), libgnome-keyring-dev (>= 0.5.0), libgnome-desktop-dev (>= 2.10.0), python-cairo-dev
+Uploaders: Josselin Mouette <joss@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), 
+ libtotem-plparser-dev (>= 1.3.1),
+ libgnomeprint2.2-dev (>= 2.2.0),
+ libgnomeprintui2.2-dev (>= 2.2),
+ libgtksourceview-dev (>= 1.1.90),
+ libnautilus-burn-dev (>= 2.15.3),
+ libgnome-media-dev (>= 2.10.0),
+ libgconf2-dev (>= 2.10.0),
+ libmetacity-dev (>= 1:2.17.8),
+ libgnome-keyring-dev (>= 0.5.0),
+ libgnome-desktop-dev (>= 2.10.0),
+ bug-buddy (>= 2.16)
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.3
@@ -10 +24 @@
 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)

pkg/main/gnome-python-desktop/trunk/debian/control.in

@@ -4 +4 @@
 Maintainer: Loic Minier <lool@dooz.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5.0.37.2), gnome-pkg-tools, libpanel-applet2-dev (>= 2.13.4), python, python-gtk2-dev (>= 2.4), libglib2.0-dev (>= 2.6.0), python-gnome2-dev (>= 2.10.0), libgtk2.0-dev (>= 2.4), libtotem-plparser-dev (>= 1.3.1), libpanel-applet2-dev (>= 2.13.4), libgnomeprint2.2-dev (>= 2.2.0), libgnomeprintui2.2-dev (>= 2.2), libgtksourceview-dev (>= 1.1.90), libwnck-dev (>= 2.15.5), libgtop2-dev (>= 2.13.0), libnautilus-burn-dev (>= 2.15.3), libgnome-media-dev (>= 2.10.0), libgconf2-dev (>= 2.10.0), libmetacity-dev (>= 2.15.5), python-all-dev (>= 2.3.5-11), python-central (>= 0.5), autotools-dev, dpkg-dev (>= 1.13.19), librsvg2-dev (>= 2.13.93), libgnome-keyring-dev (>= 0.5.0), libgnome-desktop-dev (>= 2.10.0), python-cairo-dev
+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), 
+ libtotem-plparser-dev (>= 1.3.1),
+ libgnomeprint2.2-dev (>= 2.2.0),
+ libgnomeprintui2.2-dev (>= 2.2),
+ libgtksourceview-dev (>= 1.1.90),
+ libnautilus-burn-dev (>= 2.15.3),
+ libgnome-media-dev (>= 2.10.0),
+ libgconf2-dev (>= 2.10.0),
+ libmetacity-dev (>= 1:2.17.8),
+ libgnome-keyring-dev (>= 0.5.0),
+ libgnome-desktop-dev (>= 2.10.0),
+ bug-buddy (>= 2.16)
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.3
@@ -10 +24 @@
 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)

pkg/main/gnome-python-desktop/trunk/debian/rules

@@ -5 +5 @@
 # generate control from control.in in clean::, for Uploaders: @GNOME_TEAM@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-
-PY_VERSIONS = $(shell pyversions -r debian/control)
+# get-orig-source target
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+# prevent accidental uploads to unstable
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -14 +16 @@
 endif
 
-# configure flags
-configure_flags := --prefix=/usr
-
-# 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::
@@ -45 +58 @@
         -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
+binary-indep: build install
         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 -i
-        dh_testroot -i
         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
@@ -77 +76 @@
 
 binary-arch: build install
-        dh_testdir -a
-        dh_testroot -a
+        dh_testdir
+        dh_testroot
         dh_installdocs -a
         dh_installexamples -a
@@ -85 +84 @@
         dh_compress -a
         dh_fixperms -a
-        dh_pycentral -a
-        dh_python -a
+        dh_pysupport -a
         dh_installdeb -a
         dh_shlibdeps -a