diff -u kdeplasma-addons-4.1.1/debian/changelog kdeplasma-addons-4.1.1/debian/changelog --- kdeplasma-addons-4.1.1/debian/changelog +++ kdeplasma-addons-4.1.1/debian/changelog @@ -1,3 +1,25 @@ +kdeplasma-addons (4:4.1.1-1ubuntu1) intrepid; urgency=low + + * Merge with Debian. Remaining changes: + - Use our kde4.mk + - Bump Standards-Version to 3.8.0 + - Keep our transitional packages for kdeplasmoids-* + - Remove useless fix_target_link_libraries patch + + -- Jonathan Thomas (The man) Sun, 14 Sep 2008 16:16:27 -0400 + +kdeplasma-addons (4:4.1.1-0ubuntu2) intrepid; urgency=low + + * Rebuild against kdelibs 4:4.1.1+really4.1.1 + + -- Jonathan Thomas (The man) Mon, 01 Sep 2008 21:33:35 -0400 + +kdeplasma-addons (4:4.1.1-0ubuntu1) intrepid; urgency=low + + * New upstream release. + + -- Jonathan Thomas (The man) Fri, 29 Aug 2008 08:11:18 -0400 + kdeplasma-addons (4:4.1.1-1) experimental; urgency=low * New upstreams release. @@ -9,6 +31,18 @@ -- Debian Qt/KDE Maintainers Fri, 29 Aug 2008 08:46:37 +0200 +kdeplasma-addons (4:4.1.0-0ubuntu3) intrepid; urgency=low + + * Fix typo in kdeplasma-addons-libs4' Conflicts: list. + + -- Martin Pitt Fri, 08 Aug 2008 16:24:09 +0200 + +kdeplasma-addons (4:4.1.0-0ubuntu2) intrepid; urgency=low + + * switch to kde4.mk from cdbs + + -- Jonathan Riddell Fri, 01 Aug 2008 15:29:42 +0000 + kdeplasma-addons (4:4.1.0-1) experimental; urgency=low * New upstream release. @@ -23,6 +57,11 @@ -- Debian Qt/KDE Maintainers Mon, 28 Jul 2008 03:12:14 +0200 +kdeplasma-addons (4:4.1.0-0ubuntu1) intrepid; urgency=low + + * New upstream release + + -- Jonathan Thomas Thu, 24 Jul 2008 08:09:52 -0400 kdeplasma-addons (4:4.0.98-1) experimental; urgency=low +++ Changes by Ana Beatriz Guerrero Lopez: @@ -38,12 +77,27 @@ -- Debian Qt/KDE Maintainers Mon, 21 Jul 2008 00:01:13 +0200 +kdeplasma-addons (4:4.0.98-0ubuntu1) intrepid; urgency=low + + * New upstream release candidate + * Bump Standards-Version to 3.8.0 + * Renamed source and binary packages to kdeplasma-addons + + Add replaces/conflicts for old packages + + -- Harald Sitter Sat, 12 Jul 2008 15:09:05 +0200 + kdeplasmoids (4:4.0.84-1) experimental; urgency=low * New upstream snapshot. -- Sune Vuorela Sun, 29 Jun 2008 12:04:46 +0200 +kdeplasmoids (4:4.0.83-0ubuntu1) intrepid; urgency=low + + * New upstream beta release + + -- Jonathan Riddell Mon, 23 Jun 2008 15:07:27 +0000 + kdeplasmoids (4:4.0.82+svn820966-2) UNRELEASED; urgency=low +++ Changes by Modestas Vainius: diff -u kdeplasma-addons-4.1.1/debian/control kdeplasma-addons-4.1.1/debian/control --- kdeplasma-addons-4.1.1/debian/control +++ kdeplasma-addons-4.1.1/debian/control @@ -7,7 +7,7 @@ Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), cmake (>= 2.6), quilt, kdebase-workspace-dev (>= 4:4.1.0), libglu1-mesa-dev, libqt4-opengl-dev, libboost-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Homepage: http://plasma.kde.org/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdeplasma-addons Vcs-Svn: svn://svn.debian.org/pkg-kde/branches/kde4/packages/kdeplasma-addons @@ -25,6 +25,15 @@ This package contains Plasma data engines and widgets (applets). Install this package if you want to use plasmoids from the KDE Plasmoids module. +Package: kdeplasmoids +Architecture: all +Priority: extra +Depends: kdeplasma-addons +Description: Transitional package + This dummy package is provided for a smooth transition from kdeplasmoids to + the new version, named kdeplasma-addons. + It may safely be removed after installation. + Package: kdeplasma-addons-data Architecture: all Section: kde @@ -37,6 +46,15 @@ This package contains the architecture-independent data files needed by kdeplasma-addons. +Package: kdeplasmoids-data +Architecture: all +Priority: extra +Depends: kdeplasma-addons-data +Description: Transitional package + This dummy package is provided for a smooth transition from kdeplasmoids to + the new version, named kdeplasma-addons. + It may safely be removed after installation. + Package: kdeplasma-addons-libs4 Architecture: any Section: libs @@ -49,6 +67,15 @@ . This package contains public libraries included in the KDE Plasmoids module. +Package: kdeplasmoids-libs4 +Architecture: all +Priority: extra +Depends: kdeplasma-addons-libs4 +Description: Transitional package + This dummy package is provided for a smooth transition from kdeplasmoids to + the new version, named kdeplasma-addons. + It may safely be removed after installation. + Package: kdeplasma-addons-dev Architecture: any Section: libdevel @@ -62,6 +89,15 @@ This package contains development files for the libraries provided in the `kdeplasma-addons-libs4' package. +Package: kdeplasmoids-dev +Architecture: all +Priority: extra +Depends: kdeplasma-addons-dev +Description: Transitional package + This dummy package is provided for a smooth transition from kdeplasmoids to + the new version, named kdeplasma-addons. + It may safely be removed after installation. + Package: kdeplasma-addons-dbg Section: libdevel Architecture: any @@ -75,0 +112,9 @@ + +Package: kdeplasmoids-dbg +Architecture: all +Priority: extra +Depends: kdeplasma-addons-dbg +Description: Transitional package + This dummy package is provided for a smooth transition from kdeplasmoids to + the new version, named kdeplasma-addons. + It may safely be removed after installation. diff -u kdeplasma-addons-4.1.1/debian/rules kdeplasma-addons-4.1.1/debian/rules --- kdeplasma-addons-4.1.1/debian/rules +++ kdeplasma-addons-4.1.1/debian/rules @@ -3,2 +3 @@ -include debian/cdbs/kde.mk - +include /usr/share/cdbs/1/class/kde4.mk reverted: --- kdeplasma-addons-4.1.1/debian/patches/series +++ kdeplasma-addons-4.1.1.orig/debian/patches/series @@ -1 +0,0 @@ -97_fix_target_link_libraries.diff reverted: --- kdeplasma-addons-4.1.1/debian/patches/97_fix_target_link_libraries.diff +++ kdeplasma-addons-4.1.1.orig/debian/patches/97_fix_target_link_libraries.diff @@ -1,38 +0,0 @@ ---- a/dataengines/comic/CMakeLists.txt -+++ b/dataengines/comic/CMakeLists.txt -@@ -68,7 +68,7 @@ - osnewsprovider.cpp - ) - kde4_add_plugin( plasma_comic_osnewsprovider ${comic_osnews_provider_SRCS} ) -- target_link_libraries( plasma_comic_osnewsprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ) -+ target_link_libraries( plasma_comic_osnewsprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ${QT_QTNETWORK_LIBRARY} ) - install( TARGETS plasma_comic_osnewsprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) - install( FILES osnewsprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - install( FILES pics/plasma_comic_osnews.png DESTINATION ${DATA_INSTALL_DIR}/plasma-comic ) -@@ -81,7 +81,7 @@ - ) - - kde4_add_plugin( plasma_comic_snoopyprovider ${comic_snoopy_provider_SRCS} ) --target_link_libraries( plasma_comic_snoopyprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ) -+target_link_libraries( plasma_comic_snoopyprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ${QT_QTNETWORK_LIBRARY} ) - install( TARGETS plasma_comic_snoopyprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) - install( FILES snoopyprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - install( FILES pics/plasma_comic_snoopy.png DESTINATION ${DATA_INSTALL_DIR}/plasma-comic ) -@@ -93,7 +93,7 @@ - ) - - kde4_add_plugin( plasma_comic_xkcdprovider ${comic_xkcd_provider_SRCS} ) --target_link_libraries( plasma_comic_xkcdprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ) -+target_link_libraries( plasma_comic_xkcdprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ${QT_QTNETWORK_LIBRARY}) - install( TARGETS plasma_comic_xkcdprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) - install( FILES xkcdprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - install( FILES pics/plasma_comic_xkcd.png DESTINATION ${DATA_INSTALL_DIR}/plasma-comic ) -@@ -105,7 +105,7 @@ - ) - - kde4_add_plugin( plasma_comic_phdprovider ${comic_phd_provider_SRCS} ) --target_link_libraries( plasma_comic_phdprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ) -+target_link_libraries( plasma_comic_phdprovider plasmacomicprovidercore ${KDE4_SYNDICATION_LIBS} ${QT_QTNETWORK_LIBRARY} ) - install( TARGETS plasma_comic_phdprovider DESTINATION ${PLUGIN_INSTALL_DIR} ) - install( FILES phdprovider.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - install( FILES pics/plasma_comic_phd.png DESTINATION ${DATA_INSTALL_DIR}/plasma-comic ) reverted: --- kdeplasma-addons-4.1.1/debian/cdbs/variables.mk +++ kdeplasma-addons-4.1.1.orig/debian/cdbs/variables.mk @@ -1,49 +0,0 @@ -# KDE 4 global configuration file installation directory -DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config - -# Standard Debian KDE 4 cmake flags -DEB_CMAKE_KDE4_FLAGS += \ - -DCMAKE_BUILD_TYPE=Debian \ - -DKDE4_ENABLE_FINAL=$(KDE4-ENABLE-FINAL) \ - -DKDE4_BUILD_TESTS=false \ - -DKDE_DISTRIBUTION_TEXT="Debian packages" \ - -DKDE_DEFAULT_HOME=.kde4 \ - -DCMAKE_SKIP_RPATH=true \ - -DKDE4_USE_ALWAYS_FULL_RPATH=false \ - -DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \ - -DDATA_INSTALL_DIR=/usr/share/kde4/apps \ - -DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \ - -DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \ - -DLIB_INSTALL_DIR=/usr/lib \ - -DSYSCONF_INSTALL_DIR=/etc - -# Support building with enable final (disabled by default) -DEB_KDE_ENABLE_FINAL ?= -KDE4-ENABLE-FINAL := false -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(treat_me_gently_arches))) - KDE4-ENABLE-FINAL := $(if $(DEB_KDE_ENABLE_FINAL),true,false) - endif -endif - -#### Default additional (custom) cmake flags #### -DEB_CMAKE_CUSTOM_FLAGS ?= - -# Set the one below to something else than 'yes' to disable linking -# with --as-needed (on by default) -DEB_KDE_LINK_WITH_AS_NEEDED ?= yes -ifneq (,$(findstring yes, $(DEB_KDE_LINK_WITH_AS_NEEDED))) - ifeq (,$(findstring no-as-needed, $(DEB_BUILD_OPTIONS))) - DEB_KDE_LINK_WITH_AS_NEEDED := yes - DEB_CMAKE_CUSTOM_FLAGS += \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" - else - DEB_KDE_LINK_WITH_AS_NEEDED := no - endif -else - DEB_KDE_LINK_WITH_AS_NEEDED := no -endif reverted: --- kdeplasma-addons-4.1.1/debian/cdbs/versions.mk +++ kdeplasma-addons-4.1.1.orig/debian/cdbs/versions.mk @@ -1,14 +0,0 @@ - -CDBS_MIN_VER:=0.4.52 -QUILT_MIN_VER:=0.40 -CMAKE_MIN_VER:=2.4.8 - - -KDELIBS_VERSION:=$(shell dpkg -l kdelibs5 | grep kdelibs5 | awk '{print $$3}') -KDELIBS_SOURCE_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/+b.*//') -KDELIBS_UPSTREAM_VERSION:=$(shell echo $(KDELIBS_VERSION) | sed 's/-.*//') - -KDEPIMLIBS_VERSION:=$(shell dpkg -l kdepimlibs5 | grep kdepimlibs5 | awk '{print $$3}') -KDEPIMLIBS_SOURCE_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/+b.*//') -KDEPIMLIBS_UPSTREAM_VERSION:=$(shell echo $(KDEPIMLIBS_VERSION) | sed 's/-.*//') - reverted: --- kdeplasma-addons-4.1.1/debian/cdbs/control.mk +++ kdeplasma-addons-4.1.1.orig/debian/cdbs/control.mk @@ -1,19 +0,0 @@ -include debian/cdbs/versions.mk -debian/control: debian/control.tmp - mv debian/control.tmp debian/control - -debian/control.tmp: update-versions - -update-versions: debian/control.in - sed "s/CDBS_MIN_VER/$(CDBS_MIN_VER)/;\ - s/QUILT_MIN_VER/$(QUILT_MIN_VER)/;\ - s/CMAKE_MIN_VER/$(CMAKE_MIN_VER)/;\ - s/KDELIBS_VERSION/$(KDELIBS_VERSION)/;\ - s/KDELIBS_UPSTREAM_VERSION/$(KDELIBS_UPSTREAM_VERSION)/;\ - s/KDELIBS_SOURCE_VERSION/$(KDELIBS_SOURCE_VERSION)/;\ - s/KDEPIMLIBS_VERSION/$(KDEPIMLIBS_VERSION)/;\ - s/KDEPIMLIBS_SOURCE_VERSION/$(KDEPIMLIBS_SOURCE_VERSION)/;\ - s/KDEPIMLIBS_UPSTREAM_VERSION/$(KDEPIMLIBS_UPSTREAM_VERSION)/;\ - " debian/control.in > debian/control.tmp - -.PHONY: update-versions reverted: --- kdeplasma-addons-4.1.1/debian/cdbs/kde.mk +++ kdeplasma-addons-4.1.1.orig/debian/cdbs/kde.mk @@ -1,81 +0,0 @@ -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/utils.mk - -# Include default KDE 4 cmake configuration variables -include debian/cdbs/variables.mk -# Pass standard KDE 4 flags to cmake via appropriate CDBS variable -# (DEB_CMAKE_EXTRA_FLAGS) -DEB_CMAKE_EXTRA_FLAGS += $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS) - -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el - -#DEB_CMAKE_PREFIX = /usr/lib/kde4 -DEB_DH_INSTALL_SOURCEDIR = debian/tmp -#DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/ -DEB_KDE_ENABLE_FINAL ?= -#DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share -#DEB_STRIP_EXCLUDE = so - -common-build-arch:: debian/stamp-man-pages -debian/stamp-man-pages: - if ! test -d debian/man/out; then mkdir -p debian/man/out; fi - for f in $$(find debian/man -name '*.sgml'); do \ - docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \ - done - for f in $$(find debian/man -name '*.man'); do \ - soelim -I debian/man $$f \ - > debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \ - done - touch debian/stamp-man-pages - -clean:: -ifndef THIS_SHOULD_GO_TO_UNSTABLE - #guard against experimental uploads to unstable - dpkg-parsechangelog | grep ^Distribution | grep -q 'experimental\|UNRELEASED' -endif - rm -rf debian/man/out - -rmdir debian/man - rm -f debian/stamp-man-pages - rm -f CMakeCache.txt - - -$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: - if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi - if test -e debian/$(cdbs_curpkg).lintian; then \ - install -p -D -m644 debian/$(cdbs_curpkg).lintian \ - debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ - fi - if test -e debian/$(cdbs_curpkg).presubj; then \ - install -p -D -m644 debian/$(cdbs_curpkg).presubj \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \ - fi - if test -e debian/$(cdbs_curpkg).bugscript; then \ - install -p -D -m755 debian/$(cdbs_curpkg).bugscript \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/script; \ - fi - if test -e debian/$(cdbs_curpkg).bugcontrol; then \ - install -p -D -m644 debian/$(cdbs_curpkg).bugcontrol \ - debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/control; \ - fi - -binary-install/$(DEB_SOURCE_PACKAGE)-doc-html:: - set -e; \ - for doc in `cd $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en; find . -name index.docbook`; do \ - pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \ - echo Building $$pkg HTML docs...; \ - mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ - cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ - meinproc4 $(DEB_DESTDIR)/usr/share/doc/kde/HTML/en/$$pkg/index.docbook; \ - done - for pkg in $(DOC_HTML_PRUNE) ; do \ - rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/kde/HTML/en/$$pkg; \ - done - - -# Process "sameVersionDep:" substvars -DH_SAMEVERSIONDEPS=debian/cdbs/dh_sameversiondeps -common-binary-predeb-arch common-binary-predeb-indep:: - @if [ ! -x "$(DH_SAMEVERSIONDEPS)" ]; then chmod a+x "$(DH_SAMEVERSIONDEPS)"; fi - $(DH_SAMEVERSIONDEPS) $(if $(filter common-binary-predeb-arch,$@),-a,-i) reverted: --- kdeplasma-addons-4.1.1/debian/cdbs/dh_sameversiondeps +++ kdeplasma-addons-4.1.1.orig/debian/cdbs/dh_sameversiondeps @@ -1,257 +0,0 @@ -#!/usr/bin/perl -w - -use strict; -use Dpkg::Control; -use Dpkg::Substvars; -use Dpkg::ErrorHandling; -use File::Copy; - -use Debian::Debhelper::Dh_Lib; - -my $namespace = "sameVersionDep"; -my @fields = qw(Depends Recommends Suggests Enhances Pre-Depends); -my $re_fields = join("|", @fields); -my $re_pkgname = qr/[a-z0-9][a-z0-9+.-]*/; -my $re_oursubstvar = qr/\$\{($namespace:(.*?))\}/; -my $re_splitsubstvar = qr/^($re_pkgname)(?::($re_pkgname))?(?:-($re_fields))?$/; - -# Global substvars file -my $g_substvars = new Dpkg::Substvars; -$g_substvars->parse("debian/substvars") if (-r "debian/substvars"); - -sub extract_package_names { - my $val = shift; - $val =~ s/\([^)]+\)//g; - $val =~ s/^\s+//; - $val =~ s/\s+$//; - return split(/\s*,\s*/, $val); -} - -sub Shlibsvars::new { - my ($cls, $package, $control, $substvars_file) = @_; - my $self = bless ( { - "package" => $package, - "control" => $control, - "file" => $substvars_file, - }, $cls); - $self->{substvars} = new Dpkg::Substvars; - if (-r $self->{file}) { - $self->{substvars}->parse($self->{file}); - } - return $self; -} - -sub Shlibsvars::get_fieldval { - my ($self, $field) = @_; - - my $pkg = $self->{control}->get_pkg_by_name($self->{package}); - return undef if (!defined $pkg || !exists $pkg->{$field}); - - # Turn of warnings for substvars runs - my $save_quiet = $Dpkg::ErrorHandling::quiet_warnings; - $Dpkg::ErrorHandling::quiet_warnings = 1; - - my $val = $pkg->{$field}; - $val = $self->{substvars}->substvars($val); - $val = $g_substvars->substvars($val); - - $Dpkg::ErrorHandling::quiet_warnings = $save_quiet; - return $val; -} - -sub Shlibsvars::extract_deps { - my ($self, $field, $deppkg) = @_; - - my $val = $self->get_fieldval($field); - return undef() unless defined $val; - - # Extract dependency fields we need - my @matched_deps; - for my $dep (split(/\s*,\s*/, $val)) { - if ($dep =~ /^\Q$deppkg\E(?:$|[\W])/) { - push @matched_deps, $dep; - } - } - return @matched_deps; -} - -sub Shlibsvars::get_dep_package_names { - my ($self, $field) = @_; - - my $val = $self->get_fieldval($field); - return undef() unless defined $val; - return extract_package_names($val); -} - -sub get_package_dpkg_status { - my $binpkgs = shift; - my $fields = shift; - $fields = [ "Source", "Version" ] unless defined $fields; - my $regexp_fields = join("|", @$fields); - my %status; - - my $pid = open(DPKG, "-|"); - error("cannot fork for dpkg-query --status") unless defined($pid); - if (!$pid) { - # Child process running dpkg --search and discarding errors - close STDERR; - open STDERR, ">", "/dev/null"; - $ENV{LC_ALL} = "C"; - exec("dpkg-query", "--status", "--", @$binpkgs) or error("cannot exec dpkg-query"); - } - my $curpkg; - while (defined($_ = )) { - if (m/^Package:\s*(.*)$/) { - $curpkg = $1; - $status{$curpkg} = {}; - } elsif (defined($curpkg)) { - if (m/^($regexp_fields):\s*(.*)$/) { - my $field = $1; - 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); - - # Check if all packages were processed - for my $pkg (@$binpkgs) { - error("Package $pkg was not found in the dpkg status") unless exists $status{$pkg}; - } - return \%status; -} - -sub write_substvar($$$$) { - my ($pkgname, $varname, $value, $substvars) = @_; - my @contents; - my $varset = 0; - - my $file = (-r $substvars) ? $substvars : "debian/substvars"; - if (-r $file) { - open(FILE, "<$file") or die "Unable to open substvars file '$file' for reading\n"; - while () { - if (!$varset && /^\s*\Q$varname=\E/) { - push @contents, "$varname=$value\n"; - $varset = 1; - } else { - push @contents, $_; - } - } - close(FILE); - } else { - # Fallback to default - $file = $substvars; - } - - open(FILE, ">$file.tmp") or die "Unable to open substvars file '$file.tmp' for writing\n"; - for (@contents) { - print FILE $_; - } - if (!$varset) { - print FILE "$varname=$value", "\n"; - } - close(FILE); - - File::Copy::move("$file.tmp", "$file"); -} - -init(); - -my $control = new Dpkg::Control; -my %shlibsvars; - -foreach my $package (@{$dh{DOPACKAGES}}) { - my $pkg_substvars = sprintf("debian/%ssubstvars", pkgext($package)); - my $pkg = $control->get_pkg_by_name($package); - - for my $fieldname (@fields) { - if (exists $pkg->{$fieldname}) { - my $fieldval = $pkg->{$fieldname}; - my $pkgname = $pkg->{Package}; - - while ($fieldval =~ m/\G.*?$re_oursubstvar/gs) { - my $varname = $1; - my $varparams = $2; - if ($varparams =~ m/$re_splitsubstvar/) { - my $dep2add = $1; - my $scanpkg = $2; - $scanpkg = $dh{MAINPACKAGE} unless defined $scanpkg; - my $deptype = $3; - $deptype = $fieldname unless defined $deptype; - - if (!exists $shlibsvars{$scanpkg}) { - my $scan_substvars = sprintf("debian/%ssubstvars", pkgext($scanpkg)); - $shlibsvars{$scanpkg} = new Shlibsvars($scanpkg, $control, $scan_substvars); - } - - # Get dpkg status information about dep2add package - my $dep2add_status = get_package_dpkg_status( [ $dep2add ], [ "Source", "Version", $deptype ] ); - $dep2add_status = $dep2add_status->{$dep2add}; - - # Check validility of dep2add status - 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. ") - unless exists $dep2add_status->{$deptype}; - my @dep2add_deps = extract_package_names($dep2add_status->{$deptype}); - - # Get deptype packages of scanpkg - my $vars = $shlibsvars{$scanpkg}; - my @scan_deps = $vars->get_dep_package_names($deptype); - - # Intersect both _deps arrays to find common dependencies - my @commondeps; - { - my %_map; - map { $_map{$_} = 1; } @scan_deps; - map { push @commondeps, $_ if exists $_map{$_} } @dep2add_deps; - } - - # Get status information about common packages. They need to come from the - # same source package as dep2add package and their versions should match - my $depstatus = get_package_dpkg_status(\@commondeps, [ "Source", "Version" ]); - @commondeps = (); - while (my ($pkg, $status) = each(%$depstatus)) { - push @commondeps, $pkg - if (exists $status->{Source} && exists $status->{Version} && - ($status->{Source} eq $dep2add_status->{Source}) && - ($status->{Version} eq $dep2add_status->{Version})); - } - - # Ideally we should have got the list down to one. if not, combine - # version relationships - my @fulldeps; - if (!@commondeps) { - error("$0: no same version dependencies for '$varname' found (at $fieldname of the $package package)"); - } else { - for my $deppkg (@commondeps) { - my @deps = $vars->extract_deps($deptype, $deppkg); - map s/\b\Q$deppkg\E\b/$dep2add/g, @deps; - push @fulldeps, @deps; - } - - # Drop dupes - @fulldeps = sort @fulldeps; - my @uniqdeps; - my $_prevdep; - for my $dep (@fulldeps) { - my $tmp = "$dep"; - $tmp =~ s/\s//g; - push @uniqdeps, $dep if (!defined $_prevdep || $_prevdep ne $tmp); - $_prevdep = $tmp; - } - # Write substvar for the package - write_substvar($pkgname, $varname, join(", ", @uniqdeps), $pkg_substvars); - } - } else { - error("Invalid '$namespace' substvar syntax: $varparams"); - } - } - } - } -} - -exit 0 only in patch2: unchanged: --- kdeplasma-addons-4.1.1.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ kdeplasma-addons-4.1.1/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,4 @@ + - Use our kde4.mk + - Bump Standards-Version to 3.8.0 + - Keep our transitional packages for kdeplasmoids-* + - Remove useless fix_target_link_libraries patches \ No newline at end of file