[SCM] Debian packaging of libcdk-perl branch, master, updated. debian/4.9.10-5-22-g098ed6b
gregor herrmann
gregoa at debian.org
Sun Aug 26 17:08:34 UTC 2012
The following commit has been merged in the master branch:
commit 6c8b56faa0af7ebfdf064658c9d8a5413823775f
Author: gregor herrmann <gregoa at debian.org>
Date: Sun Aug 26 18:00:27 2012 +0200
Drop patch cdkdemo_help.patch, merged upstream.
diff --git a/debian/patches/cdkdemo_help.patch b/debian/patches/cdkdemo_help.patch
deleted file mode 100644
index 2637264..0000000
--- a/debian/patches/cdkdemo_help.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: gregor herrmann <gregoa at debian.org>
-Bug-Debian: #519820
-Description: make default path for help system "dynamic"
-
---- a/fulldemo/cdkdemo
-+++ b/fulldemo/cdkdemo
-@@ -5,6 +5,9 @@
- # This script demonstrates the Cdk widget set and how you can use them.
- #
-
-+# for dirname()
-+use File::Basename;
-+
- #
- # Use the Cdk module.
- #
-@@ -946,7 +949,7 @@
- sub generalHelp
- {
- my $choice = 0;
-- my $helpdir = $ENV{'CDKHELPDIR'} || "./help";
-+ my $helpdir = $ENV{'CDKHELPDIR'} || dirname($0) . "/help";
-
- # Define the names of the help files.
- my @helpFiles = ("general.help",
diff --git a/debian/patches/series b/debian/patches/series
index ff7fa7d..82374e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
makefile.patch
-cdkdemo_help.patch
--
Debian packaging of libcdk-perl
More information about the Pkg-perl-cvs-commits
mailing list