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

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 923e5450941427b5de406df55034f2d6e383d552
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed Aug 12 11:41:31 2009 +0300

    sync patches
    
    drop don't-require-new-file-path.patch (applied upstream)
    drop fix-pod2man-errors.patch (upstream reworked that POD and it is OK now)

diff --git a/debian/changelog b/debian/changelog
index 61738ec..708a6d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,6 @@ padre (0.42-1) UNRELEASED; urgency=low
       - Padre license is the same as Perl (i.e. not Perl 5)
       - update list of copright holders
       - also list translators
-    + drop lower-wx-requirement-to-2.8.7.patch and replace it with
-      SKIP_WXWIDGETS_VERSION_CHECK=1 when configuring
     + drop libtest-most-perl from build-dependencies
     + add liblocale-msgfmt-perl to build-dependencies
     + add libcapture-tiny-perl to (build-)dependencies
@@ -18,6 +16,13 @@ padre (0.42-1) UNRELEASED; urgency=low
     + drop libmodule-inspector-perl from (build-)dependencies
     + add libppix-editortools-perl to (build-)dependencies
     + add libparse-exuberantctags-perl to (build-)dependencies
+    + patches:
+      - drop lower-wx-requirement-to-2.8.7.patch and replace it with
+        SKIP_WXWIDGETS_VERSION_CHECK=1 when configuring
+      - refresh disable-tcp-server.patch
+      - drop don't-require-new-file-path.patch (applied upstream)
+      - drop fix-pod2man-errors.patch (upstream reworked that POD and it is OK
+        now)
 
  -- Damyan Ivanov <dmn at debian.org>  Tue, 11 Aug 2009 17:48:58 +0300
 
diff --git a/debian/patches/disable-tcp-server.patch b/debian/patches/disable-tcp-server.patch
index e144365..115f009 100644
--- a/debian/patches/disable-tcp-server.patch
+++ b/debian/patches/disable-tcp-server.patch
@@ -9,7 +9,7 @@
 # Upstream-Bug: http://padre.perlide.org/ticket/313
 --- a/lib/Padre/Wx/Main.pm
 +++ b/lib/Padre/Wx/Main.pm
-@@ -567,6 +567,10 @@ sub single_instance_start {
+@@ -571,6 +571,10 @@ sub single_instance_start {
  	# check if server is already started
  	return 1 if $self->single_instance_running;
  
diff --git a/debian/patches/dont-require-new-file-path.patch b/debian/patches/dont-require-new-file-path.patch
deleted file mode 100644
index 3872ca2..0000000
--- a/debian/patches/dont-require-new-file-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://padre.perlide.org/trac/changeset/5258
-
---- a/lib/Padre/Constant.pm
-+++ b/lib/Padre/Constant.pm
-@@ -58,10 +58,10 @@
- use constant PLUGIN_LIB => File::Spec->catdir( PLUGIN_DIR, 'Padre', 'Plugin' );
- 
- # Check and create the directories that need to exist
--unless ( -e CONFIG_DIR or File::Path::make_path(CONFIG_DIR) ) {
-+unless ( -e CONFIG_DIR or File::Path::mkpath(CONFIG_DIR) ) {
- 	Carp::croak( "Cannot create config dir '" . CONFIG_DIR . "': $!" );
- }
--unless ( -e PLUGIN_LIB or File::Path::make_path(PLUGIN_LIB) ) {
-+unless ( -e PLUGIN_LIB or File::Path::mkpath(PLUGIN_LIB) ) {
- 	Carp::croak( "Cannot create plugins dir '" . PLUGIN_LIB . "': $!" );
- }
- 
---- a/lib/Padre/PluginManager.pm
-+++ b/lib/Padre/PluginManager.pm
-@@ -415,7 +415,7 @@
- 	my $plugin_dir = $self->plugin_dir;
- 	my $cache_dir = File::Spec->catdir( $plugin_dir, 'cache' );
- 	$ENV{PAR_GLOBAL_TEMP} = $cache_dir;
--	File::Path::make_path($cache_dir) unless -e $cache_dir;
-+	File::Path::mkpath($cache_dir) unless -e $cache_dir;
- 	$ENV{PAR_TEMP} = $cache_dir;
- 
- 	$self->{par_loaded} = 1;
diff --git a/debian/patches/fix-pod2man-errors.patch b/debian/patches/fix-pod2man-errors.patch
deleted file mode 100644
index 8cc35ee..0000000
--- a/debian/patches/fix-pod2man-errors.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Author: Damyan Ivanov <dmn at debian.org>
-# Description: fix a trivial pod2man error (=item must come right after =over)
-#              Not sure if pod2man is eight here or just buggy
-# Upstream-Bug: http://padre.perlide.org/trac/ticket/389
---- a/lib/Padre/Wx/Main.pm
-+++ b/lib/Padre/Wx/Main.pm
-@@ -546,14 +546,14 @@ sub freezer {
- Padre embeds a small network server to handle single instance. Here are
- the methods that allow to control this embedded server.
- 
--=over 4
--
- =cut
- 
- my $single_instance_port = 4444;
- 
- =pod
- 
-+=over 4
-+
- =item * $main->single_instance_start;
- 
- Start the embedded server. Create it if it doesn't exist. Return true on
diff --git a/debian/patches/series b/debian/patches/series
index 36cfdd1..42d24a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 #fix-config-error-exit-code.patch
 disable-tcp-server.patch
-fix-pod2man-errors.patch
-dont-require-new-file-path.patch

-- 
Packaging of padre perl editor