[SCM] Debian Qt/KDE packaging tools branch, improved-gensymbols, updated. debian/0.5.3-17-g9e83174
Modestas Vainius
modax at alioth.debian.org
Sat Jan 9 18:17:49 UTC 2010
The following commit has been merged in the improved-gensymbols branch:
commit 9e831740ccb5a21a95723adf6967cf60875af4c0
Author: Modestas Vainius <modestas at vainius.eu>
Date: Sat Jan 9 20:14:32 2010 +0200
Rename dh_pkgkde-symbolshelper_generate to dh_pkgkde-symbolshelper_symbolfile.
---
Makefile | 2 +-
.../Debhelper/Sequence/pkgkde_symbolshelper.pm | 2 +-
symbolshelper/dh_pkgkde-symbolshelper | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 06ba9ca..d875895 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ install:
install -D -m 0644 {} $(DESTDIR)/$(PERLLIBDIR)/{} \;
install -m 0755 $(SYMBOLSHELPER_DIR)/pkgkde-symbolshelper-basic $(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_generate
+ 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
diff --git a/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm b/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
index 206f638..047092b 100644
--- a/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
+++ b/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
@@ -5,7 +5,7 @@ if (! grep { PKGKDE_BINDIR eq $_ } split(":", $ENV{PATH})) {
$ENV{PATH} = PKGKDE_BINDIR . ":" . $ENV{PATH};
}
-insert_before("dh_makeshlibs", "dh_pkgkde-symbolshelper_generate");
+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
index 1ae95ce..6c251dd 100755
--- a/symbolshelper/dh_pkgkde-symbolshelper
+++ b/symbolshelper/dh_pkgkde-symbolshelper
@@ -28,7 +28,7 @@ foreach my $pkg (@{$dh{DOPACKAGES}}) {
my $infile = "debian/$pkg.symbols.in";
my $outfile = "debian/$pkg.symbols.$arch";
- if ($0 =~ /_generate$/) {
+ if ($0 =~ /_symbolfile$/) {
if (-f $infile) {
doit('pkgkde-symbolshelper', 'symbolfile', '-p', $pkg, '-o', $outfile);
}
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list