[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.3

Modestas Vainius modax at alioth.debian.org
Sun Feb 14 19:51:01 UTC 2010


The following commit has been merged in the master branch:
commit 02b36803c524040665a1f205b3484f4400218d86
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 14 17:59:03 2010 +0200

    `pkgkde-symbolshelper patch`: rename --base|b option to --file-to-patch|f.
---
 debian/changelog                   |    1 +
 symbolshelper/pkgkde-symbolshelper |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9613b7e..08396a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pkg-kde-tools (0.6.3~pre1) UNRELEASED; urgency=low
     patching multiple packages at once (provided current working directory is
     the top of the debian source package tree with symbol files in standard
     locations).
+  * `pkgkde-symbolshelper patch`: rename --base|b option to --file-to-patch|f.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 14 Feb 2010 14:56:28 +0200
 
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index 9bd1ec8..56f32f9 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -538,11 +538,11 @@ sub subcommand_create {
 }
 
 sub subcommand_patch {
-    my $opt_base;
+    my $opt_file2patch;
     my @input_patches;
     my %opts = (
 	get_common_options("oipavV"),
-	"base|b=s" => \$opt_base,
+	"file-to-patch|f=s" => \$opt_file2patch,
     );
     if (GetOptions(%opts)) {
 	check_mandatory_options("p", "");
@@ -557,7 +557,8 @@ sub subcommand_patch {
 	my @patches = load_patches(@input_patches);
 	error("no valid patches found.") unless @patches;
 	return out_symfile(
-	    patch_symfile($opt_package, $opt_version, $opt_in, $opt_base, @patches)
+	    patch_symfile($opt_package, $opt_version, $opt_in, $opt_file2patch,
+		@patches)
 	);
     }
     return 1;

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list