r23961 - in /desktop/unstable/gnome-python-desktop/debian: changelog control control.in rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Thu Apr 22 22:59:52 UTC 2010


Author: pochu
Date: Thu Apr 22 22:59:52 2010
New Revision: 23961

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23961
Log:
* debian/control.in,
  debian/rules:
  - Switch to CDBS and python-autotools.mk.
* debian/control.in,
  debian/rules,
  debian/source/format:
  - Switch to source format 3.0 (quilt).

Added:
    desktop/unstable/gnome-python-desktop/debian/source/
    desktop/unstable/gnome-python-desktop/debian/source/format
Modified:
    desktop/unstable/gnome-python-desktop/debian/changelog
    desktop/unstable/gnome-python-desktop/debian/control
    desktop/unstable/gnome-python-desktop/debian/control.in
    desktop/unstable/gnome-python-desktop/debian/rules

Modified: desktop/unstable/gnome-python-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/changelog?rev=23961&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/changelog [utf-8] Thu Apr 22 22:59:52 2010
@@ -1,3 +1,15 @@
+gnome-python-desktop (2.28.0-8) UNRELEASED; urgency=low
+
+  * debian/control.in,
+    debian/rules:
+    - Switch to CDBS and python-autotools.mk.
+  * debian/control.in,
+    debian/rules,
+    debian/source/format:
+    - Switch to source format 3.0 (quilt).
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Fri, 23 Apr 2010 00:44:00 +0200
+
 gnome-python-desktop (2.28.0-7) unstable; urgency=low
 
   * 01_bugbuddy_230.patch: stolen from 2.30, that we can’t upload yet. 

Modified: desktop/unstable/gnome-python-desktop/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/control?rev=23961&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/control [utf-8] Thu Apr 22 22:59:52 2010
@@ -9,10 +9,10 @@
 Maintainer: Loic Minier <lool at dooz.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: debhelper (>= 5.0.37.2),
+               cdbs (>= 0.4.73),
                gnome-pkg-tools (>= 0.10),
                python-support (>= 0.6),
                autotools-dev,
-               quilt,
                dpkg-dev (>= 1.13.19),
                python-all-dev (>= 2.5),
                python-gtk2-dev (>= 2.10.3),

Modified: desktop/unstable/gnome-python-desktop/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/control.in?rev=23961&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/control.in [utf-8] Thu Apr 22 22:59:52 2010
@@ -4,10 +4,10 @@
 Maintainer: Loic Minier <lool at dooz.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.37.2),
+               cdbs (>= 0.4.73),
                gnome-pkg-tools (>= 0.10),
                python-support (>= 0.6),
                autotools-dev,
-               quilt,
                dpkg-dev (>= 1.13.19),
                python-all-dev (>= 2.5),
                python-gtk2-dev (>= 2.10.3),

Modified: desktop/unstable/gnome-python-desktop/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/rules?rev=23961&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-python-desktop/debian/rules [utf-8] Thu Apr 22 22:59:52 2010
@@ -1,89 +1,13 @@
 #!/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/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/quilt/quilt.make
 
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-metacity
 
-configure_flags += --prefix=/usr --enable-metacity
-
-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)
-
-build-%/configure-stamp: patch configure
-	dh_testdir
-	mkdir -p build-$*
-	cd build-$* && \
-		PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \
-			../configure $(configure_flags)
-	touch $@
-
-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/tmp
-
-install: build install-clean $(PYVERS:%=install-%)
-	dh_installdirs
-
-clean:: unpatch
-	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
-	rm -Rf build-*
-	rm -f */*.pyc *.pyc
-	dh_clean
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_install -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs -i ChangeLog
-	dh_compress -i -Xexamples
-	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_install -s
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installchangelogs -s ChangeLog
-	dh_strip -s
-	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
-.PHONY: build clean install binary-indep binary-arch binary
+#dh_compress -i -Xexamples

Added: desktop/unstable/gnome-python-desktop/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/source/format?rev=23961&op=file
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/source/format (added)
+++ desktop/unstable/gnome-python-desktop/debian/source/format [utf-8] Thu Apr 22 22:59:52 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)




More information about the pkg-gnome-commits mailing list