r23997 - in /desktop/unstable/gnome-menus/debian: changelog control control.in rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sat Apr 24 20:31:35 UTC 2010


Author: pochu
Date: Sat Apr 24 20:31:35 2010
New Revision: 23997

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

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

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=23997&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Sat Apr 24 20:31:35 2010
@@ -1,3 +1,15 @@
+gnome-menus (2.30.0-2) UNRELEASED; urgency=low
+
+  * debian/control.in,
+    debian/rules:
+    - Switch to CDBS' 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>  Sat, 24 Apr 2010 20:45:09 +0200
+
 gnome-menus (2.30.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control?rev=23997&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/control [utf-8] Sat Apr 24 20:31:35 2010
@@ -9,13 +9,12 @@
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Deng Xiyue <manphiz-guest at users.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Marc 'HE' Brockschmidt <he at debian.org>
 Build-Depends: debhelper (>= 5.0.37.2),
-               cdbs (>= 0.4.43),
+               cdbs (>= 0.4.73),
                libglib2.0-dev (>= 2.15.2),
                python-all-dev,
                gnome-pkg-tools,
                dpkg-dev (>= 1.13.19),
                python-support (>= 0.6),
-               quilt,
                intltool (>= 0.40.0),
                libgirepository1.0-dev (>= 0.6.7),
                gobject-introspection (>= 0.6.7),

Modified: desktop/unstable/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control.in?rev=23997&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/control.in [utf-8] Sat Apr 24 20:31:35 2010
@@ -4,13 +4,12 @@
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.37.2),
-               cdbs (>= 0.4.43),
+               cdbs (>= 0.4.73),
                libglib2.0-dev (>= 2.15.2),
                python-all-dev,
                gnome-pkg-tools,
                dpkg-dev (>= 1.13.19),
                python-support (>= 0.6),
-               quilt,
                intltool (>= 0.40.0),
                libgirepository1.0-dev (>= 0.6.7),
                gobject-introspection (>= 0.6.7),

Modified: desktop/unstable/gnome-menus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/rules?rev=23997&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/rules [utf-8] Sat Apr 24 20:31:35 2010
@@ -1,15 +1,14 @@
 #!/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/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/python-autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-PY_VERSIONS = $(shell pyversions --requested debian/control)
-
-DEB_BUILDDIR := build
 
 INFILES := $(wildcard debian/desktop-files/*.directory.in)
 OUTFILES := $(INFILES:.directory.in=.directory)
@@ -19,31 +18,6 @@
 
 build/gnome-menus:: $(OUTFILES)
 
-configure-stamp-%:
-	mkdir build-$*
-	cd build-$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \
-	    $(DEB_CONFIGURE_SCRIPT) \
-		$(DEB_CONFIGURE_NORMAL_ARGS) \
-		--disable-maintainer-mode \
-		$(cdbs_configure_flags) \
-		$(DEB_CONFIGURE_EXTRA_FLAGS) \
-		$(DEB_CONFIGURE_USER_FLAGS)
-	touch $@
-
-configure/python-gmenu:: $(addprefix configure-stamp-, $(PY_VERSIONS))
-
-build-stamp-%:
-	make -C build-$*
-	touch $@
-
-build/python-gmenu:: $(addprefix build-stamp-, $(PY_VERSIONS))
-
-install-stamp-%:
-	make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
-	touch $@
-
-install/python-gmenu:: $(addprefix install-stamp-, $(PY_VERSIONS))
-
 binary-install/gnome-menus::
 	mv debian/gnome-menus/etc/xdg/menus/applications.menu debian/gnome-menus/etc/xdg/menus/gnome-applications.menu
 	mv debian/gnome-menus/etc/xdg/menus/settings.menu debian/gnome-menus/etc/xdg/menus/gnome-settings.menu
@@ -51,17 +25,11 @@
 binary-install/python-gmenu::
 	# force executable bit on files looking like python scripts
 	egrep -rlZ '^#!(.*)python' debian/python-gmenu/usr/lib/ | xargs -0 chmod a+x --
-	dh_pysupport
 
 binary-predeb/gir1.0-gmenu-2.0::
 	dh_girepository -p$(cdbs_curpkg)
 
 clean::
-	-rm -rf $(DEB_BUILDDIR)
-	-rm -rf $(addprefix build-, $(PY_VERSIONS))
-	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
-	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
-	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
 	-rm -f $(OUTFILES)
 
 update-po::

Added: desktop/unstable/gnome-menus/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/source/format?rev=23997&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/source/format (added)
+++ desktop/unstable/gnome-menus/debian/source/format [utf-8] Sat Apr 24 20:31:35 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)




More information about the pkg-gnome-commits mailing list