[Python-apps-commits] r9499 - in packages/mypaint/branches/master/debian (changelog rules)

[achadwick-guest at users.alioth.debian.org]

    Date: Wednesday, March 20, 2013 @ 16:54:03
  Author: achadwick-guest
Revision: 9499

Merge build fixes from 1.1.0-1, and make stub 1.1.0+git20130320-1 for ppa.

Modified:
  packages/mypaint/branches/master/debian/changelog
  packages/mypaint/branches/master/debian/rules

Modified: packages/mypaint/branches/master/debian/changelog
===================================================================
--- packages/mypaint/branches/master/debian/changelog	2013-03-20 16:45:30 UTC (rev 9498)
+++ packages/mypaint/branches/master/debian/changelog	2013-03-20 16:54:03 UTC (rev 9499)
@@ -1,22 +1,21 @@
-mypaint (1.1.0+git20130129-1) UNRELEASED; urgency=low
+mypaint (1.1.0+git20130320-1) UNRELEASED; urgency=low
 
   * Update packaging to track MyPaint's upstream git master branch.
   * Patches are in upstream now, drop patches/.
   * Add Nautilus thumbnailer to install.
 
- -- Andrew Chadwick <a.t.chadwick at gmail.com>  Tue, 29 Jan 2013 01:10:33 +0000
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Wed, 20 Mar 2013 13:40:00 +0000
 
-mypaint (1.1.0-1) UNRELEASED; urgency=low
+mypaint (1.1.0-1) unstable; urgency=low
 
-  * NOT RELEASED YET
   * New upstream version.
-  * New upstream contains updated ru_RU.UTF-8 translation (Closes: 685254).
+  * New upstream has an updated ru_RU.UTF-8 translation (closes: Bug#685254).
   * Standards bump and check 3.9.2 -> 3.9.4.
   * debian/rules: fix lintian script-not-executable for label-brush-mypaint.sh
-  * debian/{rules,control}: split out hi-res data (Closes: 660881).
+  * debian/{rules,control}: split out hi-res data (closes: Bug#660881).
   * debian/copyright: update to cover new upstream licenses; machine-readable.
-  * Mark myself as Uploader and PAPT as Maintainer (Closes: 691827).
-  * Recommend shared-mime-info (Closes: 545396).
+  * Mark myself as Uploader and PAPT as Maintainer (closes: Bug#691827).
+  * Recommend shared-mime-info (closes: Bug#545396).
   * Migrated from deprecated dh_pysupport to dh_python2.
   * debian/control: update homepage link
   * debian/control: provide Vcs-* info
@@ -26,12 +25,13 @@
   * Backport removal of deprecated Encoding key from upstream (lintian).
   * Build with hardening flags.
   * Patch in upstream test suite fixes, and run tests during build.
+  * (Only the one which will run with <= 512M RAM, e.g. some ARM buildbots.)
   * (19 Jan) Move development to Debian VCS (requirement of python apps team).
   * Add python-matplotlib and python-tk in build-depends (test suite reqs);
   * Lowercase first letter of each short package description (best practice).
   * Newlines for Build-Depends and Depends (sponsor preference).
 
- -- Andrew Chadwick <a.t.chadwick at gmail.com>  Sat, 26 Jan 2013 22:40:52 +0000
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Wed, 20 Mar 2013 13:08:23 +0000
 
 mypaint (1.0.0-1) unstable; urgency=low
 

Modified: packages/mypaint/branches/master/debian/rules
===================================================================
--- packages/mypaint/branches/master/debian/rules	2013-03-20 16:45:30 UTC (rev 9498)
+++ packages/mypaint/branches/master/debian/rules	2013-03-20 16:54:03 UTC (rev 9499)
@@ -22,8 +22,11 @@
 	dh_testdir
 	scons $(MYPAINT_SCONSOPTS)
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	# Max-RSS: ~74000 kbytes
 	MPLCONFIGDIR=`mktemp -d` python tests/test_mypaintlib.py
-	MPLCONFIGDIR=`mktemp -d` python tests/test_brushlib.py
+	# Max-RSS: ~2800000 kbytes - ouch!
+	# MPLCONFIGDIR=`mktemp -d` python tests/test_brushlib.py
+	# Commented out because it'll FTBFS on 512M Debian ARM buildbots.
 endif
 	touch $@