Sun Jul 18 10:51:22 UTC 2010

Author: pochu
Date: Sun Jul 18 10:51:21 2010
New Revision: 24803

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24803
Log:
revert previous commit

Added:
    packages/unstable/clutter-1.0/
      - copied from r24801, packages/unstable/clutter-1.0/
    packages/unstable/pyclutter-gtk/debian/docs
      - copied unchanged from r24801, packages/unstable/pyclutter-gtk/debian/docs
    packages/unstable/pyclutter/debian/docs
      - copied unchanged from r24801, packages/unstable/pyclutter/debian/docs
Removed:
    packages/unstable/clutter-gtk-0.10/debian/control.in
    packages/unstable/pyclutter-gtk/debian/source/
    packages/unstable/pyclutter/debian/source/
Modified:
    packages/experimental/gobject-introspection/debian/libgirepository1.0-0.install   (props changed)
    packages/experimental/gobject-introspection/debian/libgirepository1.0-dev.install   (props changed)
    packages/experimental/mutter/debian/libmutter-private0.install   (props changed)
    packages/lenny/nautilus-python/debian/patches/20_dlopen-nasty.patch   (props changed)
    packages/lenny/system-config-printer/   (props changed)
    packages/unstable/clutter-1.0/debian/   (props changed)
    packages/unstable/clutter-gtk-0.10/debian/rules
    packages/unstable/epiphany-extensions-more/ui/throbber-remover.ephy-extension   (props changed)
    packages/unstable/epiphany-extensions-more/ui/throbber-remover.py   (props changed)
    packages/unstable/epiphany-extensions-more/ui/urgentcontentnotify.ephy-extension   (props changed)
    packages/unstable/epiphany-extensions-more/ui/urgentcontentnotify.py   (props changed)
    packages/unstable/gdesklets/   (props changed)
    packages/unstable/gedit-plugins/debian/copyright
    packages/unstable/gmime2.2/debian/control.in   (props changed)
    packages/unstable/gnome-mud/   (props changed)
    packages/unstable/gnome-python-extras/debian/docs   (props changed)
    packages/unstable/gnome-themes-extras/debian/gtk-engines-2.pc   (props changed)
    packages/unstable/gobject-introspection/debian/libgirepository1.0-0.install   (props changed)
    packages/unstable/gobject-introspection/debian/libgirepository1.0-dev.install   (props changed)
    packages/unstable/gtranslator/   (props changed)
    packages/unstable/human-icon-theme/debian/Debian/22x22/places/start-here.png.uue   (props changed)
    packages/unstable/human-icon-theme/debian/Debian/24x24/places/start-here.png.uue   (props changed)
    packages/unstable/human-icon-theme/debian/Debian/48x48/places/start-here.png.uue   (props changed)
    packages/unstable/human-icon-theme/debian/Debian/scalable/places/start-here.svg   (props changed)
    packages/unstable/human-icon-theme/debian/Parsix/22x22/places/start-here.png.uue   (props changed)
    packages/unstable/human-icon-theme/debian/Parsix/24x24/places/start-here.png.uue   (props changed)
    packages/unstable/human-icon-theme/debian/Parsix/48x48/places/start-here.png.uue   (props changed)
    packages/unstable/libchamplain/debian/libchamplain-0.4-0.install   (props changed)
    packages/unstable/libchamplain/debian/libchamplain-0.4-0.symbols   (props changed)
    packages/unstable/libchamplain/debian/libchamplain-gtk-0.4-0.install   (props changed)
    packages/unstable/libchamplain/debian/libchamplain-gtk-0.4-0.symbols   (props changed)
    packages/unstable/libepc/   (props changed)
    packages/unstable/libgda4/   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-4.install   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-bin.install   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-common.install   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-dev.install   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-doc.doc-base.libgda4-reference   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-doc.install   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-doc.links   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-mysql.install   (props changed)
    packages/unstable/libgda4/debian/libgda-4.0-postgres.install   (props changed)
    packages/unstable/libxklavier/   (props changed)
    packages/unstable/libxml++2.6/   (props changed)
    packages/unstable/mutter/debian/libmutter-private0.install   (props changed)
    packages/unstable/pyclutter-gtk/debian/changelog
    packages/unstable/pyclutter-gtk/debian/control.in
    packages/unstable/pyclutter-gtk/debian/python-clutter-gtk-dev.install
    packages/unstable/pyclutter-gtk/debian/python-clutter-gtk.install
    packages/unstable/pyclutter-gtk/debian/rules
    packages/unstable/pyclutter/debian/changelog
    packages/unstable/pyclutter/debian/control.in
    packages/unstable/pyclutter/debian/python-clutter-dev.install
    packages/unstable/pyclutter/debian/python-clutter-doc.install
    packages/unstable/pyclutter/debian/python-clutter.install
    packages/unstable/pyclutter/debian/rules
    packages/unstable/pywebkitgtk/debian/control.in   (props changed)
    packages/unstable/pywebkitgtk/debian/python-webkit-dev.install   (props changed)
    packages/unstable/pywebkitgtk/debian/python-webkit.examples   (props changed)
    packages/unstable/pywebkitgtk/debian/python-webkit.install   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Debian/16x16/places/start-here.png.uue   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Debian/22x22/places/start-here.png.uue   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Debian/24x24/places/start-here.png.uue   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Debian/48x48/places/start-here.png.uue   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Debian/scalable/places/start-here.svg   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Parsix/16x16/places/start-here.png.uue   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Parsix/22x22/places/start-here.png.uue   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Parsix/24x24/places/start-here.png.uue   (props changed)
    packages/unstable/tangerine-icon-theme/debian/Parsix/48x48/places/start-here.png.uue   (props changed)
    packages/unstable/xchat-gnome/   (props changed)

Propchange: packages/experimental/gobject-introspection/debian/libgirepository1.0-0.install
            ('svn:mergeinfo' removed)

Propchange: packages/experimental/gobject-introspection/debian/libgirepository1.0-dev.install
            ('svn:mergeinfo' removed)

Propchange: packages/experimental/mutter/debian/libmutter-private0.install
            ('svn:mergeinfo' removed)

Propchange: packages/lenny/nautilus-python/debian/patches/20_dlopen-nasty.patch
            ('svn:mergeinfo' removed)

Propchange: packages/lenny/system-config-printer/
            ('svn:mergeinfo' removed)

Modified: packages/unstable/clutter-gtk-0.10/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-gtk-0.10/debian/rules?rev=24803&op=diff
==============================================================================

--- packages/unstable/clutter-gtk-0.10/debian/rules [utf-8] (original)
+++ packages/unstable/clutter-gtk-0.10/debian/rules [utf-8] Sun Jul 18 10:51:21 2010
@@ -4,7 +4,6 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
 DEB_COMPRESS_EXCLUDE = .c

Propchange: packages/unstable/epiphany-extensions-more/ui/throbber-remover.ephy-extension
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/epiphany-extensions-more/ui/throbber-remover.py
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/epiphany-extensions-more/ui/urgentcontentnotify.ephy-extension
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/epiphany-extensions-more/ui/urgentcontentnotify.py
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/gdesklets/
            ('svn:mergeinfo' removed)

Modified: packages/unstable/gedit-plugins/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gedit-plugins/debian/copyright?rev=24803&op=diff
==============================================================================
--- packages/unstable/gedit-plugins/debian/copyright [utf-8] (original)
+++ packages/unstable/gedit-plugins/debian/copyright [utf-8] Sun Jul 18 10:51:21 2010
@@ -10,14 +10,13 @@
 
 Copyright:
  * Copyright (C) 2006 Steve Frécinaux
- * Copyright (C) 2006, 2009 Jesse van den Kieboom
+ * Copyright (C) 2006 Jesse van den Kieboom
  * Copyright (C) 2005, 2006  Paolo Borelli
- * Copyright (C) 2006 Matthew Dugan
+ * Copyright (C) 2006 Matthew Dugan 
  * Copyright (C) 2005, 2006 Igalia
- * Copyright (C) 2008, 2009 Ignacio Casal Quinteiro <nacho.resa at gmail.com>
+ * Copyright (C) 2008 Ignacio Casal Quinteiro <nacho.resa at gmail.com>
  * Copyright (C) 1996, 2008 Free Software Foundation, Inc
  * Copyright (C) 2006, 2007 Andrè Homeyer
-
 
 License:
 

Propchange: packages/unstable/gmime2.2/debian/control.in
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/gnome-mud/
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/gnome-python-extras/debian/docs
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/gnome-themes-extras/debian/gtk-engines-2.pc
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/gobject-introspection/debian/libgirepository1.0-0.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/gobject-introspection/debian/libgirepository1.0-dev.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/gtranslator/
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/human-icon-theme/debian/Debian/22x22/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/human-icon-theme/debian/Debian/24x24/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/human-icon-theme/debian/Debian/48x48/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/human-icon-theme/debian/Debian/scalable/places/start-here.svg
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/human-icon-theme/debian/Parsix/22x22/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/human-icon-theme/debian/Parsix/24x24/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/human-icon-theme/debian/Parsix/48x48/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libchamplain/debian/libchamplain-0.4-0.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libchamplain/debian/libchamplain-0.4-0.symbols
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libchamplain/debian/libchamplain-gtk-0.4-0.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libchamplain/debian/libchamplain-gtk-0.4-0.symbols
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libepc/
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-4.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-bin.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-common.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-dev.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-doc.doc-base.libgda4-reference
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-doc.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-doc.links
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-mysql.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libgda4/debian/libgda-4.0-postgres.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libxklavier/
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/libxml++2.6/
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/mutter/debian/libmutter-private0.install
            ('svn:mergeinfo' removed)

Modified: packages/unstable/pyclutter-gtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter-gtk/debian/changelog?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter-gtk/debian/changelog [utf-8] (original)
+++ packages/unstable/pyclutter-gtk/debian/changelog [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,9 +1,3 @@
-pyclutter-gtk (0.10.0-3) UNRELEASED; urgency=low
-
-  * foo
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 22 Apr 2010 21:47:55 +0200
-
 pyclutter-gtk (0.10.0-2) unstable; urgency=low
 
   * Copypasta build system from pyclutter, to build for all Python 

Modified: packages/unstable/pyclutter-gtk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter-gtk/debian/control.in?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter-gtk/debian/control.in [utf-8] (original)
+++ packages/unstable/pyclutter-gtk/debian/control.in [utf-8] Sun Jul 18 10:51:21 2010
@@ -4,7 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
-               cdbs (>= 0.4.73),
+               quilt,
                gnome-pkg-tools,
                python-support,
                python-all-dev (>= 2.5),

Modified: packages/unstable/pyclutter-gtk/debian/python-clutter-gtk-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter-gtk/debian/python-clutter-gtk-dev.install?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter-gtk/debian/python-clutter-gtk-dev.install [utf-8] (original)
+++ packages/unstable/pyclutter-gtk/debian/python-clutter-gtk-dev.install [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/pyclutter
-debian/tmp/usr/lib/pkgconfig
+usr/share/pyclutter
+usr/lib/pkgconfig

Modified: packages/unstable/pyclutter-gtk/debian/python-clutter-gtk.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter-gtk/debian/python-clutter-gtk.install?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter-gtk/debian/python-clutter-gtk.install [utf-8] (original)
+++ packages/unstable/pyclutter-gtk/debian/python-clutter-gtk.install [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/python*/*-packages/
+usr/lib/pymodules

Modified: packages/unstable/pyclutter-gtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter-gtk/debian/rules?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter-gtk/debian/rules [utf-8] (original)
+++ packages/unstable/pyclutter-gtk/debian/rules [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,18 +1,108 @@
 #!/usr/bin/make -f
 
-DEB_BUILDDIR = debian/build
-DEB_PYTHON_SYSTEM = pysupport
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-autotools.mk
-include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/quilt/quilt.make
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_DOWNLOAD_URL = http://www.clutter-project.org/sources/$(GNOME_MODULE)/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
 
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
+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 \
+        --build=$(DEB_BUILD_GNU_TYPE) \
 	--enable-docs \
 	--disable-shave
+
+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)
+
+build-%/configure-stamp: patch
+	dh_testdir
+	mkdir -p build-$*
+	cd build-$* && \
+		PYTHON=/usr/bin/python$* \
+			CFLAGS="$(CFLAGS)" \
+			LDFLAGS="$(LDFLAGS)" \
+			$(CURDIR)/configure $(configure_flags)
+	touch $@
+
+build-%/build-stamp: build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C build-$* \
+		pyexecdir=/usr/lib/pymodules/python$*
+	touch $@
+
+build: $(PYVERS:%=build-%/build-stamp)
+
+install-clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-%: install-clean build-%/build-stamp
+	dh_testdir
+	dh_testroot
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp \
+		pyexecdir=/usr/lib/pymodules/python$*
+
+install: $(PYVERS:%=install-%)
+	dh_installdirs
+	dh_install --sourcedir=debian/tmp
+
+clean:: unpatch
+	dh_testdir
+	dh_testroot
+	rm -rf build-*
+	dh_clean
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+#	dh_installdocs -i
+#	dh_installexamples -i
+#	dh_installmenu -i
+#	dh_installcron -i
+#	dh_installinfo -i
+#	dh_installchangelogs ChangeLog -i
+#	dh_link -i
+#	dh_compress -i
+#	dh_fixperms -i
+#	dh_pysupport -i
+#	dh_installdeb -i
+#	dh_gencontrol -i
+#	dh_md5sums -i
+#	dh_builddeb -i
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_installmenu -s
+	dh_installman -s
+	dh_installinfo -s
+	dh_installchangelogs ChangeLog -s
+	dh_link -s
+	dh_strip -s --dbg-package=python-clutter-gtk-dbg
+	dh_compress -s
+	dh_fixperms -s
+	dh_pysupport -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
+
+binary: binary-arch binary-indep
+# NB: install-% should be .PHONY to avoid checking for real files, but
+# implicit/pattern rules may only build real files; if you declare these
+# .PHONY, no command will be run
+.PHONY: build install-clean install clean binary-indep binary-arch binary

Modified: packages/unstable/pyclutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter/debian/changelog?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter/debian/changelog [utf-8] (original)
+++ packages/unstable/pyclutter/debian/changelog [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,9 +1,3 @@
-pyclutter (1.0.0-4) UNRELEASED; urgency=low
-
-  * foo
-
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 22 Apr 2010 21:40:31 +0200
-
 pyclutter (1.0.0-3) unstable; urgency=low
 
   * Add docbook-xsl to build depends to avoid downloading some stylesheets

Modified: packages/unstable/pyclutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter/debian/control.in?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter/debian/control.in [utf-8] (original)
+++ packages/unstable/pyclutter/debian/control.in [utf-8] Sun Jul 18 10:51:21 2010
@@ -5,8 +5,8 @@
 Uploaders: @GNOME_TEAM@
 XS-Python-Version: >= 2.5
 Build-Depends: debhelper (>= 5.0.38),
-               cdbs (>= 0.4.73),
                gnome-pkg-tools,
+               quilt,
                python-support (>= 0.5.3),
                python-all-dev (>= 2.5),
                python-gtk2-dev (>= 2.8),

Modified: packages/unstable/pyclutter/debian/python-clutter-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter/debian/python-clutter-dev.install?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter/debian/python-clutter-dev.install [utf-8] (original)
+++ packages/unstable/pyclutter/debian/python-clutter-dev.install [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,3 +1,3 @@
-debian/tmp/usr/share/pyclutter
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/include
+usr/share/pyclutter
+usr/lib/pkgconfig
+usr/include

Modified: packages/unstable/pyclutter/debian/python-clutter-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter/debian/python-clutter-doc.install?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter/debian/python-clutter-doc.install [utf-8] (original)
+++ packages/unstable/pyclutter/debian/python-clutter-doc.install [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/share/gtk-doc
+usr/share/gtk-doc

Modified: packages/unstable/pyclutter/debian/python-clutter.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter/debian/python-clutter.install?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter/debian/python-clutter.install [utf-8] (original)
+++ packages/unstable/pyclutter/debian/python-clutter.install [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/python*
+usr/lib/pymodules

Modified: packages/unstable/pyclutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/pyclutter/debian/rules?rev=24803&op=diff
==============================================================================
--- packages/unstable/pyclutter/debian/rules [utf-8] (original)
+++ packages/unstable/pyclutter/debian/rules [utf-8] Sun Jul 18 10:51:21 2010
@@ -1,18 +1,108 @@
 #! /usr/bin/make -f
 
-DEB_BUILDDIR = debian/build
-DEB_PYTHON_SYSTEM = pysupport
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-autotools.mk
-include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/quilt/quilt.make
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_DOWNLOAD_URL = http://www.clutter-project.org/sources/$(GNOME_MODULE)/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
 
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
+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 \
+        --build=$(DEB_BUILD_GNU_TYPE) \
 	--enable-docs \
 	--disable-shave
+
+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)
+
+build-%/configure-stamp: patch
+	dh_testdir
+	mkdir -p build-$*
+	cd build-$* && \
+		PYTHON=/usr/bin/python$* \
+			CFLAGS="$(CFLAGS)" \
+			LDFLAGS="$(LDFLAGS)" \
+			$(CURDIR)/configure $(configure_flags)
+	touch $@
+
+build-%/build-stamp: build-%/configure-stamp
+	dh_testdir
+	$(MAKE) -C build-$* \
+		pyexecdir=/usr/lib/pymodules/python$*
+	touch $@
+
+build: $(PYVERS:%=build-%/build-stamp)
+
+install-clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-%: install-clean build-%/build-stamp
+	dh_testdir
+	dh_testroot
+	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp \
+		pyexecdir=/usr/lib/pymodules/python$*
+
+install: $(PYVERS:%=install-%)
+	dh_installdirs
+	dh_install --sourcedir=debian/tmp
+
+clean:: unpatch
+	dh_testdir
+	dh_testroot
+	rm -rf build-*
+	dh_clean
+
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installmenu -i
+	dh_installcron -i
+	dh_installinfo -i
+	dh_installchangelogs ChangeLog -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_pysupport -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_installmenu -s
+	dh_installman -s
+	dh_installinfo -s
+	dh_installchangelogs ChangeLog -s
+	dh_link -s
+	dh_strip -s --dbg-package=python-clutter-dbg
+	dh_compress -s
+	dh_fixperms -s
+	dh_pysupport -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
+
+binary: binary-arch binary-indep
+# NB: install-% should be .PHONY to avoid checking for real files, but
+# implicit/pattern rules may only build real files; if you declare these
+# .PHONY, no command will be run
+.PHONY: build install-clean install clean binary-indep binary-arch binary

Propchange: packages/unstable/pywebkitgtk/debian/control.in
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/pywebkitgtk/debian/python-webkit-dev.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/pywebkitgtk/debian/python-webkit.examples
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/pywebkitgtk/debian/python-webkit.install
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Debian/16x16/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Debian/22x22/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Debian/24x24/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Debian/48x48/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Debian/scalable/places/start-here.svg
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Parsix/16x16/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Parsix/22x22/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Parsix/24x24/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/tangerine-icon-theme/debian/Parsix/48x48/places/start-here.png.uue
            ('svn:mergeinfo' removed)

Propchange: packages/unstable/xchat-gnome/
            ('svn:mergeinfo' removed)


