[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.8-24-g17b9b86
Modestas Vainius
modax at alioth.debian.org
Mon Mar 15 22:53:02 UTC 2010
The following commit has been merged in the master branch:
commit edd5387961a5b01efba9b63ec3d9187462c246ef
Author: Modestas Vainius <modestas at vainius.eu>
Date: Tue Mar 16 00:32:16 2010 +0200
Reorganize source package directory structure.
- get rid of symbolshelper, debhelper, vcs subdirectires. Move perl modules
to perllib subdirectory and the rest to the top of the source tree;
- unify how datalibdir is found and exported in the Debian::PkgKde module
({find,setup}_datalibdir()). Make pkgkde-gensymbols and
pkgkde-symbolshelper use these new subroutines;
- change datalib path in pkgkde-deb2symbols;
- rewrite Makefile for reorganized source tree.
---
Makefile | 77 ++++++++-------
{symbolshelper => datalib}/Dpkg/Compression.pm | 0
.../Dpkg/Compression/FileHandle.pm | 0
.../Dpkg/Compression/Process.pm | 0
.../Dpkg/Interface/Storable.pm | 0
{symbolshelper => datalib}/Dpkg/Shlibs/Cppfilt.pm | 0
{symbolshelper => datalib}/Dpkg/Shlibs/Objdump.pm | 0
{symbolshelper => datalib}/Dpkg/Shlibs/Symbol.pm | 0
.../Dpkg/Shlibs/SymbolFile.pm | 0
{symbolshelper => datalib}/dpkg-gensymbols.pl | 0
debian/changelog | 8 ++
debhelper/dh_movelibkdeinit => dh_movelibkdeinit | 0
debhelper/dh_sameversiondep => dh_sameversiondep | 0
debhelper/dh_sodeps => dh_sodeps | 0
.../dpkg-gensymbols.1 => dpkg-gensymbols.1 | 0
{vcs => man1}/pkgkde-vcs.1 | 0
.../Debian/Debhelper/Buildsystem/kde.pm | 0
.../Debian/Debhelper/Sequence/kde.pm | 0
.../Debhelper/Sequence/pkgkde_symbolshelper.pm | 0
.../Debian/Debhelper/Sequence/sodeps.pm | 0
perllib/Debian/PkgKde.pm | 101 ++++++++++++++++++++
.../Debian/PkgKde/SymbolsHelper/CompileTest.pm | 0
.../Debian/PkgKde/SymbolsHelper/Patching.pm | 0
.../Debian/PkgKde/SymbolsHelper/String.pm | 0
.../Debian/PkgKde/SymbolsHelper/Subst.pm | 0
.../Debian/PkgKde/SymbolsHelper/Substs.pm | 0
.../PkgKde/SymbolsHelper/Substs/TypeSubst.pm | 0
.../PkgKde/SymbolsHelper/Substs/VirtTable.pm | 0
.../Debian/PkgKde/SymbolsHelper/Symbol.pm | 0
.../Debian/PkgKde/SymbolsHelper/SymbolFile.pm | 0
.../PkgKde/SymbolsHelper/SymbolFileCollection.pm | 0
.../pkgkde-debs2symbols => pkgkde-debs2symbols | 4 +-
.../pkgkde-gensymbols => pkgkde-gensymbols | 31 +-----
.../pkgkde-getbuildlogs => pkgkde-getbuildlogs | 0
.../pkgkde-symbolshelper => pkgkde-symbolshelper | 11 +--
vcs/pkgkde-vcs => pkgkde-vcs | 0
symbolshelper/Debian/PkgKde.pm | 55 -----------
{vcs/vcslib => vcslib}/git.sh | 0
38 files changed, 159 insertions(+), 128 deletions(-)
diff --git a/Makefile b/Makefile
index d6b536e..60f4cc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,57 +1,60 @@
-PERLLIBDIR := $(shell perl -MConfig -e 'print $$Config{vendorlib}')
-SYMBOLSHELPER_DIR := symbolshelper
-DEBHELPER_DIR := debhelper
-VCS_DIR := vcs
-
BINDIR := $(DESTDIR)/usr/bin
MANDIR := $(DESTDIR)/usr/share/man
DATADIR := $(DESTDIR)/usr/share/pkg-kde-tools
DATALIBDIR := $(DATADIR)/lib
+PERLLIBDIR := $(DESTDIR)/$(shell perl -MConfig -e 'print $$Config{vendorlib}')
+
+BINARIES = \
+ dh_movelibkdeinit \
+ dh_sameversiondep \
+ dh_sodeps \
+ pkgkde-debs2symbols \
+ pkgkde-gensymbols \
+ pkgkde-getbuildlogs \
+ pkgkde-override-sc-dev-latest \
+ pkgkde-symbolshelper \
+ pkgkde-vcs
+
+MANPAGES_1 = \
+ man1/pkgkde-vcs.1
+
+PERLPODS_1 = \
+ pkgkde-override-sc-dev-latest \
+ dh_sameversiondep \
+ dh_movelibkdeinit \
+ dh_sodeps
build:
# Nothing do build
install:
- install -d $(DATADIR) $(DATALIBDIR) $(BINDIR) $(MANDIR) $(MANDIR)/man1
+ install -d $(DATADIR) $(DATALIBDIR) $(BINDIR) $(MANDIR) $(MANDIR)/man1 $(PERLLIBDIR)
pod2man pkgkde-override-sc-dev-latest > $(MANDIR)/man1/pkgkde-override-sc-dev-latest.1
install -m 0755 pkgkde-override-sc-dev-latest $(BINDIR)
- # Install datalib
+ # Install *lib directories
+ install -d $(DATALIBDIR)
cd datalib && find . -type f -exec install -D -m 0644 {} $(DATALIBDIR)/{} \;
+ install -d $(PERLLIBDIR)
+ cd perllib && find . -type f -name "*.pm" -exec install -D -m 0644 {} $(PERLLIBDIR)/{} \;
+ install -d $(DATADIR)/vcs
+ cd vcslib && find . -type f -exec install -D -m 0644 {} $(DATADIR)/vcs/{} \;
+
+ # Install binaries
+ install -d $(BINDIR)
+ install -m 0755 $(BINARIES) $(BINDIR)
- # symbolshelper
- 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)/pkgkde-debs2symbols $(BINDIR)/pkgkde-debs2symbols
- install -m 0755 $(SYMBOLSHELPER_DIR)/pkgkde-getbuildlogs $(BINDIR)/pkgkde-getbuildlogs
+ # Install manual pages
+ install -d $(MANDIR)/man1
+ install -m 0644 $(MANPAGES_1) $(MANDIR)/man1
- # Improved Dpkg::Shlibs and dpkg-gensymbols
- cd $(SYMBOLSHELPER_DIR) && find Dpkg -type f -name "*.pm" -exec \
- install -D -m 0644 {} $(DATADIR)/{} \;
- install -m 0755 $(SYMBOLSHELPER_DIR)/pkgkde-gensymbols $(BINDIR)
- install -m 0755 $(SYMBOLSHELPER_DIR)/dpkg-gensymbols.1 $(MANDIR)/man1/pkgkde-gensymbols.1
- install -m 0755 $(SYMBOLSHELPER_DIR)/dpkg-gensymbols.pl $(DATADIR)
+ # Install POD based manual packages
+ for f in $(PERLPODS_1); do pod2man "$$f" > "$(MANDIR)/man1/$${f%.*}.1"; done
+
+ # Special overload of system dpkg-gensymbols
+ install -m 0755 dpkg-gensymbols.1 $(MANDIR)/man1/pkgkde-gensymbols.1
install -d $(DATADIR)/bin
# Make it possible to transparently replace dpkg-gensymbols with
# pkgkde-gensymbols
ln -sf /usr/bin/pkgkde-gensymbols $(DATADIR)/bin/dpkg-gensymbols
-
- # Custom debhelper commands
- pod2man $(DEBHELPER_DIR)/dh_sameversiondep > $(MANDIR)/man1/dh_sameversiondep.1
- install -m 0755 $(DEBHELPER_DIR)/dh_sameversiondep $(BINDIR)
- pod2man $(DEBHELPER_DIR)/dh_movelibkdeinit > $(MANDIR)/man1/dh_movelibkdeinit.1
- install -m 0755 $(DEBHELPER_DIR)/dh_movelibkdeinit $(BINDIR)
- pod2man $(DEBHELPER_DIR)/dh_sodeps > $(MANDIR)/man1/dh_sodeps.1
- install -m 0755 $(DEBHELPER_DIR)/dh_sodeps $(BINDIR)
-
- # Debhelper addons
- cd $(DEBHELPER_DIR) && find Debian -type f -name "*.pm" -exec \
- install -D -m 0644 {} $(DESTDIR)/$(PERLLIBDIR)/{} \;
-
- # pkgkde-vcs
- install -d $(DATADIR)/vcs
- install -m 0755 $(VCS_DIR)/pkgkde-vcs $(BINDIR)
- install -m 0644 $(VCS_DIR)/pkgkde-vcs.1 $(MANDIR)/man1
- cd $(VCS_DIR)/vcslib && find . -type f -exec install -D -m 0644 {} $(DATADIR)/vcs/{} \;
diff --git a/symbolshelper/Dpkg/Compression.pm b/datalib/Dpkg/Compression.pm
similarity index 100%
rename from symbolshelper/Dpkg/Compression.pm
rename to datalib/Dpkg/Compression.pm
diff --git a/symbolshelper/Dpkg/Compression/FileHandle.pm b/datalib/Dpkg/Compression/FileHandle.pm
similarity index 100%
rename from symbolshelper/Dpkg/Compression/FileHandle.pm
rename to datalib/Dpkg/Compression/FileHandle.pm
diff --git a/symbolshelper/Dpkg/Compression/Process.pm b/datalib/Dpkg/Compression/Process.pm
similarity index 100%
rename from symbolshelper/Dpkg/Compression/Process.pm
rename to datalib/Dpkg/Compression/Process.pm
diff --git a/symbolshelper/Dpkg/Interface/Storable.pm b/datalib/Dpkg/Interface/Storable.pm
similarity index 100%
rename from symbolshelper/Dpkg/Interface/Storable.pm
rename to datalib/Dpkg/Interface/Storable.pm
diff --git a/symbolshelper/Dpkg/Shlibs/Cppfilt.pm b/datalib/Dpkg/Shlibs/Cppfilt.pm
similarity index 100%
rename from symbolshelper/Dpkg/Shlibs/Cppfilt.pm
rename to datalib/Dpkg/Shlibs/Cppfilt.pm
diff --git a/symbolshelper/Dpkg/Shlibs/Objdump.pm b/datalib/Dpkg/Shlibs/Objdump.pm
similarity index 100%
rename from symbolshelper/Dpkg/Shlibs/Objdump.pm
rename to datalib/Dpkg/Shlibs/Objdump.pm
diff --git a/symbolshelper/Dpkg/Shlibs/Symbol.pm b/datalib/Dpkg/Shlibs/Symbol.pm
similarity index 100%
rename from symbolshelper/Dpkg/Shlibs/Symbol.pm
rename to datalib/Dpkg/Shlibs/Symbol.pm
diff --git a/symbolshelper/Dpkg/Shlibs/SymbolFile.pm b/datalib/Dpkg/Shlibs/SymbolFile.pm
similarity index 100%
rename from symbolshelper/Dpkg/Shlibs/SymbolFile.pm
rename to datalib/Dpkg/Shlibs/SymbolFile.pm
diff --git a/symbolshelper/dpkg-gensymbols.pl b/datalib/dpkg-gensymbols.pl
similarity index 100%
rename from symbolshelper/dpkg-gensymbols.pl
rename to datalib/dpkg-gensymbols.pl
diff --git a/debian/changelog b/debian/changelog
index 164d224..233c3d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,14 @@ pkg-kde-tools (0.7.0~pre3) UNRELEASED; urgency=low
descriptions of all tools the package provides.
* Reword dh_sameversiondep manual page a bit.
* Recommend libwww-perl.
+ * Reorganize source package directory structure:
+ - get rid of symbolshelper, debhelper, vcs subdirectires. Move perl modules
+ to perllib subdirectory and the rest to the top of the source tree;
+ - unify how datalibdir is found and exported in the Debian::PkgKde module
+ ({find,setup}_datalibdir()). Make pkgkde-gensymbols and
+ pkgkde-symbolshelper use these new subroutines;
+ - change datalib path in pkgkde-deb2symbols;
+ - rewrite Makefile for reorganized source tree.
-- Modestas Vainius <modax at debian.org> Wed, 03 Mar 2010 23:43:10 +0200
diff --git a/debhelper/dh_movelibkdeinit b/dh_movelibkdeinit
similarity index 100%
rename from debhelper/dh_movelibkdeinit
rename to dh_movelibkdeinit
diff --git a/debhelper/dh_sameversiondep b/dh_sameversiondep
similarity index 100%
rename from debhelper/dh_sameversiondep
rename to dh_sameversiondep
diff --git a/debhelper/dh_sodeps b/dh_sodeps
similarity index 100%
rename from debhelper/dh_sodeps
rename to dh_sodeps
diff --git a/symbolshelper/dpkg-gensymbols.1 b/dpkg-gensymbols.1
similarity index 100%
rename from symbolshelper/dpkg-gensymbols.1
rename to dpkg-gensymbols.1
diff --git a/vcs/pkgkde-vcs.1 b/man1/pkgkde-vcs.1
similarity index 100%
rename from vcs/pkgkde-vcs.1
rename to man1/pkgkde-vcs.1
diff --git a/debhelper/Debian/Debhelper/Buildsystem/kde.pm b/perllib/Debian/Debhelper/Buildsystem/kde.pm
similarity index 100%
rename from debhelper/Debian/Debhelper/Buildsystem/kde.pm
rename to perllib/Debian/Debhelper/Buildsystem/kde.pm
diff --git a/debhelper/Debian/Debhelper/Sequence/kde.pm b/perllib/Debian/Debhelper/Sequence/kde.pm
similarity index 100%
rename from debhelper/Debian/Debhelper/Sequence/kde.pm
rename to perllib/Debian/Debhelper/Sequence/kde.pm
diff --git a/symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm b/perllib/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
similarity index 100%
rename from symbolshelper/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
rename to perllib/Debian/Debhelper/Sequence/pkgkde_symbolshelper.pm
diff --git a/debhelper/Debian/Debhelper/Sequence/sodeps.pm b/perllib/Debian/Debhelper/Sequence/sodeps.pm
similarity index 100%
rename from debhelper/Debian/Debhelper/Sequence/sodeps.pm
rename to perllib/Debian/Debhelper/Sequence/sodeps.pm
diff --git a/perllib/Debian/PkgKde.pm b/perllib/Debian/PkgKde.pm
new file mode 100644
index 0000000..b9e8b2f
--- /dev/null
+++ b/perllib/Debian/PkgKde.pm
@@ -0,0 +1,101 @@
+package Debian::PkgKde;
+
+use base qw(Exporter);
+our @EXPORT = qw(get_program_name
+ printmsg info warning errormsg error syserr usageerr);
+our @EXPORT_OK = qw(find_datalibdir setup_datalibdir DATALIBDIR);
+
+# Determine datalib for current script. It depends on the context the script
+# was executed from.
+use constant DATALIBDIR => '/usr/share/pkg-kde-tools/lib';
+
+sub find_datalibdir {
+ my @hintfiles = @_;
+ my @dirs;
+ if ($0 =~ m@^(.+)/[^/]+$@) {
+ push @dirs, "$1/datalib";
+ }
+ push @dirs, DATALIBDIR;
+
+ # Verify if the dir and hint files exist
+ my $founddir;
+ foreach my $dir (@dirs) {
+ my $ok;
+ if ($dir && -d $dir) {
+ $ok = 1;
+ foreach my $hint (@hintfiles) {
+ unless (-e "$dir/$hint") {
+ $ok = 0;
+ last;
+ }
+ }
+ }
+ if ($ok) {
+ $founddir = $dir;
+ last;
+ }
+ }
+
+ return $founddir;
+}
+
+# Add DATALIBDIR to @INC if the script is NOT being run from the source tree.
+sub setup_datalibdir {
+ my $dir = find_datalibdir(@_);
+ if ($dir) {
+ unshift @INC, DATALIBDIR if $dir eq DATALIBDIR;
+ } else {
+ error("unable to locate pkg-kde-tools library directory");
+ }
+ return $dir;
+}
+
+{
+ my $progname;
+ sub get_program_name {
+ unless (defined $progname) {
+ $progname = ($0 =~ m,/([^/]+)$,) ? $1 : $0;
+ }
+ return $progname;
+ }
+}
+
+sub format_message {
+ my $type = shift;
+ my $format = shift;
+
+ my $msg = sprintf($format, @_);
+ return ((defined $type) ?
+ get_program_name() . ": $type: " : "") . "$msg\n";
+}
+
+sub printmsg {
+ print STDERR format_message(undef, @_);
+}
+
+sub info {
+ print STDERR format_message("info", @_);
+}
+
+sub warning {
+ warn format_message("warning", @_);
+}
+
+sub syserr {
+ my $msg = shift;
+ die format_message("error", "$msg: $!", @_);
+}
+
+sub errormsg {
+ print STDERR format_message("error", @_);
+}
+
+sub error {
+ die format_message("error", @_);
+}
+
+sub usageerr {
+ die format_message("usage", @_);
+}
+
+1;
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/CompileTest.pm b/perllib/Debian/PkgKde/SymbolsHelper/CompileTest.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/CompileTest.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/CompileTest.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Patching.pm b/perllib/Debian/PkgKde/SymbolsHelper/Patching.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/Patching.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/Patching.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/String.pm b/perllib/Debian/PkgKde/SymbolsHelper/String.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/String.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/String.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Subst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Subst.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/Subst.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/Subst.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/Substs.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/Substs.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/Substs/TypeSubst.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/VirtTable.pm b/perllib/Debian/PkgKde/SymbolsHelper/Substs/VirtTable.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/Substs/VirtTable.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/Substs/VirtTable.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm b/perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/Symbol.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFile.pm b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFile.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/SymbolFile.pm
diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
similarity index 100%
rename from symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
rename to perllib/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
diff --git a/symbolshelper/pkgkde-debs2symbols b/pkgkde-debs2symbols
similarity index 96%
rename from symbolshelper/pkgkde-debs2symbols
rename to pkgkde-debs2symbols
index d7c98e4..37150c3 100755
--- a/symbolshelper/pkgkde-debs2symbols
+++ b/pkgkde-debs2symbols
@@ -5,8 +5,8 @@ set -e
include_common() {
local _dirname
_dirname="`dirname "$0"`"
- if [ -n "$_dirname" ] && [ -f "$_dirname/../datalib/shell_common" ]; then
- . "$_dirname/../datalib/shell_common"
+ if [ -n "$_dirname" ] && [ -f "$_dirname/datalib/shell_common" ]; then
+ . "$_dirname/datalib/shell_common"
else
. /usr/share/pkg-kde-tools/lib/shell_common
fi
diff --git a/symbolshelper/pkgkde-gensymbols b/pkgkde-gensymbols
similarity index 80%
rename from symbolshelper/pkgkde-gensymbols
rename to pkgkde-gensymbols
index f0da03a..35b21fe 100755
--- a/symbolshelper/pkgkde-gensymbols
+++ b/pkgkde-gensymbols
@@ -19,24 +19,7 @@ use strict;
use warnings;
use Dpkg;
-
-use constant DATADIR => '/usr/share/pkg-kde-tools';
-
-sub find_dpkg_gensymbols {
- my $dir;
- if ($0 =~ m@^(.+)/[^/]+$@) {
- $dir = $1;
- }
- unless ($dir && -f "$dir/dpkg-gensymbols.pl" &&
- -f "$dir/Dpkg/Shlibs/SymbolFile.pm") {
- $dir = DATADIR;
- }
-
- if (-f "$dir/dpkg-gensymbols.pl") {
- return ("$dir/dpkg-gensymbols.pl", $dir);
- }
- return (undef, undef);
-}
+use Debian::PkgKde qw(setup_datalibdir);
my $old_symbolfile_parse;
@@ -70,13 +53,11 @@ sub check_dpkg_version {
}
if (check_dpkg_version(1, 15, 5)) {
- # Finally, run stock dpkg-gensymbols
- my ($exe, $dir) = find_dpkg_gensymbols();
-
- if (defined $exe) {
- if (defined $dir && $dir eq DATADIR) {
- unshift @INC, DATADIR;
- }
+ # Export global datalibdir if needed
+ my $dir = setup_datalibdir(qw(Dpkg/Shlibs/SymbolFile.pm dpkg-gensymbols.pl));
+ if (defined $dir) {
+ # Finally, run stock dpkg-gensymbols
+ my $exe = "$dir/dpkg-gensymbols.pl";
# Compatibility with dpkg 1.15.5
require Dpkg::IPC;
diff --git a/symbolshelper/pkgkde-getbuildlogs b/pkgkde-getbuildlogs
similarity index 100%
rename from symbolshelper/pkgkde-getbuildlogs
rename to pkgkde-getbuildlogs
diff --git a/symbolshelper/pkgkde-symbolshelper b/pkgkde-symbolshelper
similarity index 98%
rename from symbolshelper/pkgkde-symbolshelper
rename to pkgkde-symbolshelper
index 2497c1d..21cc53a 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/pkgkde-symbolshelper
@@ -18,16 +18,9 @@
use strict;
use warnings;
-# Setup environment
-use constant DATADIR => '/usr/share/pkg-kde-tools';
+use Debian::PkgKde qw(setup_datalibdir);
BEGIN {
- my $datadir;
- if ($0 =~ m@^(.+)/[^/]+$@) {
- $datadir = $1;
- }
- if (!defined $datadir || ! -f "$datadir/Dpkg/Shlibs/SymbolFile.pm") {
- unshift @INC, DATADIR;
- }
+ setup_datalibdir("Dpkg/Shlibs/SymbolFile.pm");
}
# Compatibility with dpkg 1.15.5
diff --git a/vcs/pkgkde-vcs b/pkgkde-vcs
similarity index 100%
rename from vcs/pkgkde-vcs
rename to pkgkde-vcs
diff --git a/symbolshelper/Debian/PkgKde.pm b/symbolshelper/Debian/PkgKde.pm
deleted file mode 100644
index 3a25e11..0000000
--- a/symbolshelper/Debian/PkgKde.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-package Debian::PkgKde;
-
-use base qw(Exporter);
-our @EXPORT = qw(get_program_name
- printmsg info warning errormsg error syserr usageerr);
-
-{
- my $progname;
- sub get_program_name {
- unless (defined $progname) {
- $progname = ($0 =~ m,/([^/]+)$,) ? $1 : $0;
- }
- return $progname;
- }
-}
-
-sub format_message {
- my $type = shift;
- my $format = shift;
-
- my $msg = sprintf($format, @_);
- return ((defined $type) ?
- get_program_name() . ": $type: " : "") . "$msg\n";
-}
-
-sub printmsg {
- print STDERR format_message(undef, @_);
-}
-
-sub info {
- print STDERR format_message("info", @_);
-}
-
-sub warning {
- warn format_message("warning", @_);
-}
-
-sub syserr {
- my $msg = shift;
- die format_message("error", "$msg: $!", @_);
-}
-
-sub errormsg {
- print STDERR format_message("error", @_);
-}
-
-sub error {
- die format_message("error", @_);
-}
-
-sub usageerr {
- die format_message("usage", @_);
-}
-
-1;
diff --git a/vcs/vcslib/git.sh b/vcslib/git.sh
similarity index 100%
rename from vcs/vcslib/git.sh
rename to vcslib/git.sh
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list