diff -u plasmoid-wifi-0.5/debian/changelog plasmoid-wifi-0.5/debian/changelog --- plasmoid-wifi-0.5/debian/changelog +++ plasmoid-wifi-0.5/debian/changelog @@ -1,3 +1,10 @@ +plasmoid-wifi (0.5-0ubuntu2) intrepid; urgency=low + + * Just a rebuild upload, nothing changed. (LP: #267639) + * Remove obsolete debian/cdbs folder. + + -- Alessandro Ghersi Mon, 08 Sep 2008 06:56:05 +0200 + plasmoid-wifi (0.5-0ubuntu1) intrepid; urgency=low [ Jonathan Thomas (The man) ] diff -u plasmoid-wifi-0.5/debian/rules plasmoid-wifi-0.5/debian/rules --- plasmoid-wifi-0.5/debian/rules +++ plasmoid-wifi-0.5/debian/rules @@ -5 +5,2 @@ -include debian/cdbs/kde.mk +include /usr/share/cdbs/1/class/kde4.mk + reverted: --- plasmoid-wifi-0.5/debian/cdbs/kde.mk +++ plasmoid-wifi-0.5.orig/debian/cdbs/kde.mk @@ -1,109 +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" \ - -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 - -# 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: --- plasmoid-wifi-0.5/debian/cdbs/dh_sameversiondeps +++ plasmoid-wifi-0.5.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