[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.5.3-39-g218442b

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 74ccfa388191e3b392c607524dfae2ba6f06eb6c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jan 18 02:41:49 2010 +0200

    Get rid of now obsolete dh_pkgkde-symbolshelper.
    
    Please note: dh addon remains. It adjusts $PATH as needed.
---
 Makefile                                           |    3 -
 debian/changelog                                   |    5 +-
 .../Debhelper/Sequence/pkgkde_symbolshelper.pm     |    3 -
 symbolshelper/dh_pkgkde-symbolshelper              |   43 --------------------
 4 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/Makefile b/Makefile
index 4a614bc..ea2c3c6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,6 @@ install:
 	cd $(SYMBOLSHELPER_DIR) && find Debian -type f -name "*.pm" -exec \
 	    install -D -m 0644 {} $(DESTDIR)/$(PERLLIBDIR)/{} \;
 	install -m 0755 $(SYMBOLSHELPER_DIR)/pkgkde-symbolshelper $(BINDIR)/pkgkde-symbolshelper
-	install -m 0755 $(SYMBOLSHELPER_DIR)/dh_pkgkde-symbolshelper $(DATADIR)
-	ln -sf /usr/share/pkg-kde-tools/dh_pkgkde-symbolshelper $(BINDIR)/dh_pkgkde-symbolshelper_symbolfile
-	ln -sf /usr/share/pkg-kde-tools/dh_pkgkde-symbolshelper $(BINDIR)/dh_pkgkde-symbolshelper_clean
 	
 	# Improved Dpkg::Shlibs and dpkg-gensymbols
 	cd $(SYMBOLSHELPER_DIR) && find Dpkg -type f -name "*.pm" -exec \
diff --git a/debian/changelog b/debian/changelog
index 9126a83..ea02b6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ pkg-kde-tools (0.6.0~pre6) UNRELEASED; urgency=low
   * Make it possible to replace dpkg-gensymbols with pkgkde-gensymbols
     (by adding /usr/share/pkg-kde-tools/bin to $PATH).
   * Use my @debian.org address in the Uploaders field.
-  * Make cdbs/symbolshelper.mk add /usr/share/pkg-kde-tools/bin to $PATH.
-  * Add pkgkde_symbolshelper dh addon.
+  * Helpers for adding /usr/share/pkg-kde-tools/bin to $PATH:
+    - implement this in cdbs/symbolshelper.mk;
+    - new pkgkde_symbolshelper dh addon takes care of this for dh(1).
   * Port pkgkde-symbolshelper to the latest dpkg-dev symbols API.
     Most subcomands as of 0.4.0 are supported, some are no longer needed.
   * Add support for substitutions directly to pkgkde-gensymbols
diff --git a/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm b/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
index 047092b..3577bc9 100644
--- a/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
+++ b/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
@@ -5,7 +5,4 @@ if (! grep { PKGKDE_BINDIR eq $_ } split(":", $ENV{PATH})) {
     $ENV{PATH} = PKGKDE_BINDIR . ":" . $ENV{PATH};
 }
 
-insert_before("dh_makeshlibs", "dh_pkgkde-symbolshelper_symbolfile");
-insert_after("dh_clean", "dh_pkgkde-symbolshelper_clean");
-
 1;
diff --git a/symbolshelper/dh_pkgkde-symbolshelper b/symbolshelper/dh_pkgkde-symbolshelper
deleted file mode 100755
index 03515da..0000000
--- a/symbolshelper/dh_pkgkde-symbolshelper
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2010 Modestas Vainius <modax at debian.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>
-
-use strict;
-use warnings;
-use Debian::Debhelper::Dh_Lib;
-
-init();
-
-foreach my $pkg (@{$dh{DOPACKAGES}}) {
-    my $arch = package_arch($pkg);
-    next if $arch eq "all";
-
-    my $infile = "debian/$pkg.symbols.in";
-    my $outfile = "debian/$pkg.symbols.$arch";
-
-    next unless -f $infile;
-
-    if ($0 =~ /_symbolfile$/) {
-        doit('pkgkde-symbolshelper', 'symbolfile', '-p', $pkg, '-o', $outfile);
-    } elsif ($0 =~ /_clean$/) {
-        inhibit_log();
-        if (-f $outfile) {
-            doit("rm", "-f", $outfile);
-        }
-    } else {
-        error("invalid program execution");
-    }
-}

-- 
Debian Qt/KDE packaging tools