rev 13491 - in branches/kde4.2/packages/pkg-kde-tools/trunk: . debian makefiles/1/cdbs pkg-kde-build
Modestas Vainius
modax-guest at alioth.debian.org
Sat Jan 24 04:25:16 UTC 2009
Author: modax-guest
Date: 2009-01-24 04:25:15 +0000 (Sat, 24 Jan 2009)
New Revision: 13491
Added:
branches/kde4.2/packages/pkg-kde-tools/trunk/makefiles/1/cdbs/symbolshelper.mk
Modified:
branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep
branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README
Log:
* Add makefiles/1/cdbs/symbolshelper.mk which hooks pkgkde-symbolshelper
calls to cdbs.
* Some fixes for dh_sameversiondep.
Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog 2009-01-24 01:49:39 UTC (rev 13490)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/debian/changelog 2009-01-24 04:25:15 UTC (rev 13491)
@@ -1,4 +1,4 @@
-pkg-kde-tools (0.4.0~pre1) UNRELEASED; urgency=low
+pkg-kde-tools (0.4.0~pre3) UNRELEASED; urgency=low
* pkgkde-symbolshelper: add support for resorting symbol files (useful after
manual editing).
@@ -17,8 +17,10 @@
- add versions.mk and control.mk too. The latter needs porting if it is
useful;
- add README to discourage other developers from using pkg-kde-build.
+ * Add makefiles/1/cdbs/symbolshelper.mk which hooks pkgkde-symbolshelper
+ calls to cdbs.
- -- Modestas Vainius <modestas at vainius.eu> Sat, 24 Jan 2009 02:47:13 +0200
+ -- Modestas Vainius <modestas at vainius.eu> Sat, 24 Jan 2009 04:16:47 +0200
pkg-kde-tools (0.3.1) experimental; urgency=low
Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep 2009-01-24 01:49:39 UTC (rev 13490)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/dh_sameversiondep 2009-01-24 04:25:15 UTC (rev 13491)
@@ -248,12 +248,10 @@
} elsif (defined($curpkg)) {
if (m/^($regexp_fields):\s*(.*)$/) {
my $field = $1;
- error("Dublicate field $field for the $curpkg package in the dpkg status file")
+ error("dublicate field $field for the $curpkg package in the dpkg status file")
if (exists $status{$curpkg}{$field});
$status{$curpkg}{$field} = $2;
}
- } else {
- error("Missing Package entry at $.");
}
}
close(DPKG);
@@ -322,8 +320,8 @@
my $deptype = $3;
$deptype = $fieldname unless defined $deptype;
- # Initialize some dep2add and scanpkg data.
- # scanpkg might also come from external source. Use dpkg-query
+ # Initialize some dep2add and refpkg data.
+ # refpkg might also come from external source. Use dpkg-query
# to get its dpkg status then.
my $refpkg_status;
my $dep2add_status;
@@ -338,9 +336,9 @@
$dep2add_status = get_package_dpkg_status( [ $dep2add ], [ "Source", "Version", $deptype ] );
} else {
my $status = get_package_dpkg_status( [ $refpkg, $dep2add ], [ "Source", "Version", $deptype ] );
- error("Cannot continue because the scan package $refpkg could not be found in debian/control or dpkg status")
+ error("cannot continue because the reference package $refpkg could not be found in debian/control or dpkg status")
unless (exists $status->{$refpkg});
- error("Cannot continue because package $refpkg has no $deptype field to scan")
+ error("cannot continue because package $refpkg has no $deptype field to scan")
unless (exists $status->{$refpkg}{$deptype});
$refpkg_status = $status->{$refpkg};
@@ -348,7 +346,7 @@
}
##### Process and verify dep2add status #####
- error("Cannot continue because package $dep2add could not be found in dpkg status")
+ error("cannot continue because package $dep2add could not be found in dpkg status")
unless (exists $dep2add_status->{$dep2add});
$dep2add_status = $dep2add_status->{$dep2add};
@@ -358,27 +356,27 @@
unless ($dep2add_status->{Source});
# Check validility of dep2add status
- error("Could not retreive source package name for $dep2add package. Is it installed?")
+ error("could not retreive source package name for $dep2add package. Is it installed?")
unless exists $dep2add_status->{Source} && exists $dep2add_status->{Version};
- error("Package $dep2add has no $deptype field. This configuration is unsupported. ")
+ error("package $dep2add has no $deptype field. This configuration is unsupported. ")
unless exists $dep2add_status->{$deptype};
my @dep2add_deps = extract_package_names($dep2add_status->{$deptype});
- # Get deptype packages of scanpkg
- my @scanpkg_deps;
+ # Get deptype packages of refpkg
+ my @refpkg_deps;
if ($vars) {
- @scanpkg_deps = $vars->get_dep_package_names($deptype);
+ @refpkg_deps = $vars->get_dep_package_names($deptype);
} else {
- @scanpkg_deps = extract_package_names($refpkg_status->{$deptype});
+ @refpkg_deps = extract_package_names($refpkg_status->{$deptype});
}
- error("Cannot continue because package $refpkg has no $deptype field to scan")
- unless (@scanpkg_deps);
+ error("cannot continue because package $refpkg has no $deptype field to scan")
+ unless (@refpkg_deps);
# Intersect both _deps arrays to find common dependencies
my @commondeps;
{
my %_map;
- map { $_map{$_} = 1; } @scanpkg_deps;
+ map { $_map{$_} = 1; } @refpkg_deps;
map { push @commondeps, $_ if exists $_map{$_} } @dep2add_deps;
}
@@ -388,8 +386,8 @@
# Check if all packages were found
for my $dep (@commondeps) {
- error("Package $dep was not found in the dpkg status. Internal error")
- unless exists $depstatus->{$pkg};
+ error("package $dep was not found in the dpkg status. Internal error")
+ unless exists $depstatus->{$dep};
}
# Filter commondeps
@@ -433,7 +431,7 @@
write_substvar($pkgname, $varname, join(", ", @uniqdeps), $pkg_substvars);
}
} else {
- error("Invalid '$namespace' substvar syntax: $varparams");
+ error("invalid '$namespace' substvar syntax: $varparams");
}
}
}
Added: branches/kde4.2/packages/pkg-kde-tools/trunk/makefiles/1/cdbs/symbolshelper.mk
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/makefiles/1/cdbs/symbolshelper.mk (rev 0)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/makefiles/1/cdbs/symbolshelper.mk 2009-01-24 04:25:15 UTC (rev 13491)
@@ -0,0 +1,12 @@
+include /usr/share/cdbs/1/rules/buildvars.mk
+
+SYMBOLSHELPER_PACKAGES := $(filter $(DEB_PACKAGES),$(patsubst debian/%.symbols.in,%,$(wildcard debian/*.symbols.in)))
+
+$(patsubst %,binary-strip/%,$(SYMBOLSHELPER_PACKAGES)):: binary-strip/%:
+ pkgkde-symbolshelper symbolfile -p $(cdbs_curpkg) -o debian/$(cdbs_curpkg).symbols.$(DEB_HOST_ARCH)
+
+$(patsubst %,binary-fixup/%,$(SYMBOLSHELPER_PACKAGES)):: binary-fixup/%:
+ pkgkde-symbolshelper postgensymbols -p $(cdbs_curpkg) -v
+
+clean::
+ rm -f $(patsubst %,debian/%.symbols.$(DEB_HOST_ARCH),$(SYMBOLSHELPER_PACKAGES))
Modified: branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README
===================================================================
--- branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README 2009-01-24 01:49:39 UTC (rev 13490)
+++ branches/kde4.2/packages/pkg-kde-tools/trunk/pkg-kde-build/README 2009-01-24 04:25:15 UTC (rev 13491)
@@ -4,5 +4,5 @@
may be broken at any time without any notice.
Maintainers of other software based on KDE 4 should consider using makefile
-snippets under /usr/share/pkg-kde-tools/makefiles/. Please read
+snippets available under /usr/share/pkg-kde-tools/makefiles/. Please read
/usr/share/doc/pkg-kde-tools/README.Debian for more information.
More information about the pkg-kde-commits
mailing list