[SCM] Packaging of padre perl editor branch, master, updated. debian/0.36-3-20-ge73ce8e

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit a7d8f52a88a7153c566244bc466f02a65d7ad1d6
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Aug 12 09:39:02 2009 +0300

    drop lower-wx-requirement-to-2.8.7.patch and replace it with SKIP_WXWIDGETS_VERSION_CHECK=1 when configuring

diff --git a/debian/changelog b/debian/changelog
index 261ea61..4f1836d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ padre (0.42-1) UNRELEASED; urgency=low
     + rules: use dh --with quilt (and bump quilt build-dependency to 0.46-7)
     + rules: no need to re-generate .mo files from .po. Upstream does it now
     + copyright: describe share/icons/padre/16x16/logo.png
+    + drop lower-wx-requirement-to-2.8.7.patch and replace it with
+      SKIP_WXWIDGETS_VERSION_CHECK=1 when configuring
 
  -- Damyan Ivanov <dmn at debian.org>  Tue, 11 Aug 2009 17:48:58 +0300
 
diff --git a/debian/patches/lower-wx-requirement-to-2.8.7.patch b/debian/patches/lower-wx-requirement-to-2.8.7.patch
deleted file mode 100644
index 1bf8be1..0000000
--- a/debian/patches/lower-wx-requirement-to-2.8.7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# Author: Damyan Ivanov <dmn at debian.org>
-# Debian-Specific: maybe
-# Description: Lower wxWidgets requirement from 2.8.8 to 2.8.7.
-#  Buggy or not, that is what is available in Debian.
---- a/privinc/Module/Install/PRIVATE/Padre.pm
-+++ b/privinc/Module/Install/PRIVATE/Padre.pm
-@@ -113,7 +113,7 @@ sub check_wx_version {
- sub nono {
- 	my $msg = shift;
- 	print STDERR "$msg\n";
--	exit(1);
-+	exit(0);
- }
- 
- sub make_exe {
---- a/inc/Module/Install/PRIVATE/Padre.pm
-+++ b/inc/Module/Install/PRIVATE/Padre.pm
-@@ -68,8 +68,8 @@ sub check_wx_version {
- 	$widgets_human =~ s/^(\d\.\d\d\d)(\d\d\d)$/$1.$2/;
- 	$widgets_human =~ s/\.0*/./g;
- 	print "Found wxWidgets $widgets_human\n";
--	unless ( $widgets >= 2.008008 ) {
--		nono("Padre needs at least version 2.8.8 of wxWidgets. You have wxWidgets $widgets_human");
-+	unless ( $widgets >= 2.008007 ) {
-+		nono("Padre needs at least version 2.8.7 of wxWidgets. You have wxWidgets $widgets_human");
- 	}
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 77c6bac..36cfdd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 #fix-config-error-exit-code.patch
-lower-wx-requirement-to-2.8.7.patch
 disable-tcp-server.patch
 fix-pod2man-errors.patch
 dont-require-new-file-path.patch
diff --git a/debian/rules b/debian/rules
index 9c85533..47a1e80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 	dh --with quilt $@
 
 override_dh_auto_configure:
-	xvfb-run dh_auto_configure
+	SKIP_WXWIDGETS_VERSION_CHECK=1 xvfb-run dh_auto_configure
 
 override_dh_auto_test:
 	# test suite disabled as the missing RANDR extension under Xvfb causes

-- 
Packaging of padre perl editor