diff -u kdenetwork-4.1.2/debian/changelog kdenetwork-4.1.2/debian/changelog --- kdenetwork-4.1.2/debian/changelog +++ kdenetwork-4.1.2/debian/changelog @@ -1,3 +1,21 @@ +kdenetwork (4:4.1.2-1ubuntu1) jaunty; urgency=low + + * Merge with Debian, remaining changes: + - Use our custom kde4.mk rather than buit-in cdbs + - Keep our slightly-higher build-depend versions + - Keep our conflict/replaces for -kde4 packages + - Don't advertise Kopete IRC support in package desc, it doesn't support it yet + - Keep the following patches: + - kubuntu_01_suid_kppp.diff + - kubuntu_02_kppp_add_boud_rates.diff + - kubuntu_04_fix_kopete_nowlistening_wording.diff + - Do not use 97_fix_target_link_libraries.diff, we don't really need it + - .orig md5sum different + * Removed antiquated debain/cdbs folder that was still there after we switched to + kde4.mk + + -- Jonathan Thomas Fri, 07 Nov 2008 13:41:19 -0500 + kdenetwork (4:4.1.2-0ubuntu4) intrepid; urgency=low * Add kubuntu_04_fix_kopete_nowlistening_wording.diff to reflect that only @@ -24,6 +42,12 @@ -- Harald Sitter Sat, 11 Oct 2008 23:12:31 +0200 +kdenetwork (4:4.1.2-1) experimental; urgency=low + + * New upstream release. + + -- Ana Beatriz Guerrero Lopez Tue, 30 Sep 2008 21:26:13 +0200 + kdenetwork (4:4.1.2-0ubuntu1) intrepid; urgency=low * New upstream release @@ -51,12 +75,26 @@ -- Harald Sitter Mon, 01 Sep 2008 20:09:48 +0200 +kdenetwork (4:4.1.1-1) experimental; urgency=low + + * New upstream release. + * Add target link libraries patch to deal with changes in pimlibs. + + -- Sune Vuorela Mon, 01 Sep 2008 09:21:53 +0200 + kdenetwork (4:4.1.0-0ubuntu2) intrepid; urgency=low * switch to kde4.mk from cdbs -- Jonathan Riddell Fri, 01 Aug 2008 15:29:41 +0000 +kdenetwork (4:4.1.0-1) experimental; urgency=low + + * New upstream release. + * Remove 97_fix_target_link_libraries.diff. + + -- Ana Beatriz Guerrero Lopez Mon, 28 Jul 2008 15:13:08 +0200 + kdenetwork (4:4.1.0-0ubuntu1) intrepid; urgency=low * New upstream release @@ -67,6 +105,13 @@ -- Guillaume Martres Thu, 24 Jul 2008 19:23:48 +0200 +kdenetwork (4:4.0.98-1) experimental; urgency=low + + * New upstream release, Release Candidate 1. + * Update 97_fix_target_link_libraries.diff + + -- Ana Beatriz Guerrero Lopez Tue, 15 Jul 2008 01:24:07 +0200 + kdenetwork (4:4.0.98-0ubuntu1) intrepid; urgency=low * New upstream release candidate @@ -75,12 +120,29 @@ -- Harald Sitter Sat, 12 Jul 2008 16:34:45 +0200 +kdenetwork (4:4.0.84-1) experimental; urgency=low + + * New upstream snapshot. + + -- Sune Vuorela Sun, 29 Jun 2008 06:49:09 +0200 + kdenetwork (4:4.0.83-0ubuntu1) intrepid; urgency=low * New upstream beta release -- Jonathan Riddell Thu, 19 Jun 2008 11:45:16 +0000 +kdenetwork (4:4.0.82+svn819867-1) experimental; urgency=low + + * New upstream development snapshot. + + +++ Changes by Modestas Vainius: + + * Bump build depends of kdepimlibs-dev and libplasma-dev to 4.0.82. + * Build depend on phonon 4.2~. + + -- Debian Qt/KDE Maintainers Sun, 15 Jun 2008 16:47:48 +0200 + kdenetwork (4:4.0.80-1ubuntu3) intrepid; urgency=low * Create transitional package for kopete-plugin-otr-kde4 (LP: #239153) diff -u kdenetwork-4.1.2/debian/control kdenetwork-4.1.2/debian/control --- kdenetwork-4.1.2/debian/control +++ kdenetwork-4.1.2/debian/control @@ -4,7 +4,7 @@ Maintainer: Kubuntu Developers XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Sune Vuorela , Fathi Boudra , Armin Berres , Modestas Vainius , Matthew Rosewarne -Build-Depends: cdbs (>= 0.4.52ubuntu7), debhelper (>= 6), cmake (>= 2.4.5), quilt, +Build-Depends: cdbs (>= 0.4.52ubuntu7), debhelper (>= 6), cmake (>= 2.6.0), quilt, kdepimlibs5-dev (>= 4:4.1.2), libphonon-dev (>= 4:4.2.0), libplasma-dev (>= 4:4.1.2), zlib1g-dev, libjpeg62-dev, libxml2-dev, libxslt1-dev, libssl-dev, libxdamage-dev, libxss-dev, libslp-dev, libiw-dev, libidn11-dev, @@ -51,7 +51,7 @@ Package: kdenetwork-dev Section: devel Architecture: any -Depends: kopete (= ${binary:Version}), kdebase-dev (>= 4:4.0.74) +Depends: kopete (= ${binary:Version}), kdebase-dev (>= 4:4.1.0) Conflicts: kdenetwork-dev-kde4 Replaces: kdenetwork-dev-kde4 Description: development files for the KDE 4 networking module diff -u kdenetwork-4.1.2/debian/kget.install kdenetwork-4.1.2/debian/kget.install --- kdenetwork-4.1.2/debian/kget.install +++ kdenetwork-4.1.2/debian/kget.install @@ -37,8 +37,8 @@ usr/share/kde4/apps/kget/www/hi64-apps-kget.png usr/share/kde4/apps/kget/www/iepngfix.htc usr/share/kde4/apps/kget/www/index.htm -usr/share/kde4/apps/kget/www/mootools-more.js usr/share/kde4/apps/kget/www/mootools-core-yc.js +usr/share/kde4/apps/kget/www/mootools-more.js usr/share/kde4/apps/kget/www/new-download-background.png usr/share/kde4/apps/kget/www/preferences-system.png usr/share/kde4/apps/kget/www/title-border-bottom-downloads.png reverted: --- kdenetwork-4.1.2/debian/cdbs/versions.mk +++ kdenetwork-4.1.2.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: --- kdenetwork-4.1.2/debian/cdbs/kde.mk +++ kdenetwork-4.1.2.orig/debian/cdbs/kde.mk @@ -1,108 +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 - -DEB_CONFIG_INSTALL_DIR ?= /usr/share/kde4/config - -DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el -DEB_CMAKE_EXTRA_FLAGS += \ - -DCMAKE_BUILD_TYPE=Debian \ - $(KDE4-ENABLE-FINAL) \ - -DKDE4_BUILD_TESTS=false \ - -DKDE_DISTRIBUTION_TEXT="Kubuntu packages" \ - -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 - -# 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_EXTRA_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 - -#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 - -ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb - ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches))) - KDE4-ENABLE-FINAL = $(if $(DEB_KDE_ENABLE_FINAL),-DKDE4_ENABLE_FINAL=true,) - else - KDE4-ENABLE-FINAL = - endif -endif - -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 - -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) reverted: --- kdenetwork-4.1.2/debian/cdbs/control.mk +++ kdenetwork-4.1.2.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: --- kdenetwork-4.1.2/debian/cdbs/dh_sameversiondeps +++ kdenetwork-4.1.2.orig/debian/cdbs/dh_sameversiondeps @@ -1,140 +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:($re_pkgname):($re_pkgname)-($re_fields)-($re_pkgname))\}/; - -# Global substvars file -my $g_substvars = new Dpkg::Substvars; -$g_substvars->parse("debian/substvars") if (-r "debian/substvars"); - -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 join(",", @matched_deps); -} - -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 $dep2add = $2; - my $basepkg = $3; - my $deptype = $4; - my $deppkg = $5; - - if (!exists $shlibsvars{$basepkg}) { - my $base_substvars = sprintf("debian/%ssubstvars", pkgext($basepkg)); - $shlibsvars{$basepkg} = new Shlibsvars($basepkg, $control, $base_substvars); - } - my $vars = $shlibsvars{$basepkg}; - my $deps = $vars->extract_deps($deptype, $deppkg); - $deps = "" unless($deps); - $deps =~ s/\b\Q$deppkg\E\b/$dep2add/g; - - # Write substvar for the package - write_substvar($pkgname, $varname, $deps, $pkg_substvars); - } - } - } -} - -exit 0 diff -u kdenetwork-4.1.2/debian/patches/series kdenetwork-4.1.2/debian/patches/series --- kdenetwork-4.1.2/debian/patches/series +++ kdenetwork-4.1.2/debian/patches/series @@ -2,3 +2,2 @@ kubuntu_02_kppp_add_boud_rates.diff -kubuntu_03_fix_kopete_logout_crash.diff kubuntu_04_fix_kopete_nowlistening_wording.diff reverted: --- kdenetwork-4.1.2/debian/patches/kubuntu_03_fix_kopete_logout_crash.diff +++ kdenetwork-4.1.2.orig/debian/patches/kubuntu_03_fix_kopete_logout_crash.diff @@ -1,16 +0,0 @@ -Index: kdenetwork-4.1.2/kopete/libkopete/kopetepluginmanager.cpp -=================================================================== ---- kdenetwork-4.1.2.orig/kopete/libkopete/kopetepluginmanager.cpp 2008-10-14 17:52:52.000000000 -0400 -+++ kdenetwork-4.1.2/kopete/libkopete/kopetepluginmanager.cpp 2008-10-14 17:54:47.000000000 -0400 -@@ -245,6 +245,11 @@ - { - kDebug( 14010 ) ; - -+ // Disconnect any remaining plugins (bug 172011). -+ for ( PluginManagerPrivate::InfoToPluginMap::ConstIterator it = _kpmp->loadedPlugins.begin(); it != _kpmp->loadedPlugins.end(); ++it ) -+ disconnect( it.value(), SIGNAL(destroyed(QObject*)), this, 0 ); -+ -+ - _kpmp->shutdownMode = PluginManagerPrivate::DoneShutdown; - - KGlobal::deref();