rev 11334 - in kde-extras/konq-plugins/trunk/debian: . cdbs patches
Xavier Vello
wdgt-guest at alioth.debian.org
Sat Jul 5 20:12:00 UTC 2008
Author: wdgt-guest
Date: 2008-07-05 20:12:00 +0000 (Sat, 05 Jul 2008)
New Revision: 11334
Added:
kde-extras/konq-plugins/trunk/debian/README.debian
kde-extras/konq-plugins/trunk/debian/cdbs/
kde-extras/konq-plugins/trunk/debian/cdbs/control.mk
kde-extras/konq-plugins/trunk/debian/cdbs/dh_sameversiondeps
kde-extras/konq-plugins/trunk/debian/cdbs/kde.mk
kde-extras/konq-plugins/trunk/debian/cdbs/versions.mk
kde-extras/konq-plugins/trunk/debian/conffiles
Modified:
kde-extras/konq-plugins/trunk/debian/changelog
kde-extras/konq-plugins/trunk/debian/patches/01-disable-plugins
kde-extras/konq-plugins/trunk/debian/rules
Log:
Not building akregator plugin (doesn't work)
Ported build system to cdbs
/usr/share/kde4/conf/translaterc is a configuration file
Described disabled plugins in README.debian
Not packaging documentation for disabled plugins
Added: kde-extras/konq-plugins/trunk/debian/README.debian
===================================================================
--- kde-extras/konq-plugins/trunk/debian/README.debian (rev 0)
+++ kde-extras/konq-plugins/trunk/debian/README.debian 2008-07-05 20:12:00 UTC (rev 11334)
@@ -0,0 +1,12 @@
+As a svn snapshot, this software isn't finished. Some plugins
+have been disabled because they are buggy or incomplete :
+
+ * crashes : built in konqueror 4
+ * dirfilter : doesn't work anymore
+ * akregator : doesn't work anymore
+
+Some have been disabled by upstream :
+
+ * sidebar/mediaplayer
+ * sidebar/metabar
+ * mediarealfolder
Added: kde-extras/konq-plugins/trunk/debian/cdbs/control.mk
===================================================================
--- kde-extras/konq-plugins/trunk/debian/cdbs/control.mk (rev 0)
+++ kde-extras/konq-plugins/trunk/debian/cdbs/control.mk 2008-07-05 20:12:00 UTC (rev 11334)
@@ -0,0 +1,19 @@
+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
Added: kde-extras/konq-plugins/trunk/debian/cdbs/dh_sameversiondeps
===================================================================
--- kde-extras/konq-plugins/trunk/debian/cdbs/dh_sameversiondeps (rev 0)
+++ kde-extras/konq-plugins/trunk/debian/cdbs/dh_sameversiondeps 2008-07-05 20:12:00 UTC (rev 11334)
@@ -0,0 +1,140 @@
+#!/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 (<FILE>) {
+ 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
Property changes on: kde-extras/konq-plugins/trunk/debian/cdbs/dh_sameversiondeps
___________________________________________________________________
Name: svn:executable
+ *
Added: kde-extras/konq-plugins/trunk/debian/cdbs/kde.mk
===================================================================
--- kde-extras/konq-plugins/trunk/debian/cdbs/kde.mk (rev 0)
+++ kde-extras/konq-plugins/trunk/debian/cdbs/kde.mk 2008-07-05 20:12:00 UTC (rev 11334)
@@ -0,0 +1,109 @@
+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="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
+
+# 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)
Added: kde-extras/konq-plugins/trunk/debian/cdbs/versions.mk
===================================================================
--- kde-extras/konq-plugins/trunk/debian/cdbs/versions.mk (rev 0)
+++ kde-extras/konq-plugins/trunk/debian/cdbs/versions.mk 2008-07-05 20:12:00 UTC (rev 11334)
@@ -0,0 +1,14 @@
+
+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/-.*//')
+
Modified: kde-extras/konq-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/konq-plugins/trunk/debian/changelog 2008-07-05 19:07:15 UTC (rev 11333)
+++ kde-extras/konq-plugins/trunk/debian/changelog 2008-07-05 20:12:00 UTC (rev 11334)
@@ -1,3 +1,16 @@
+konq-plugins (4:4.1~svn827788-1) UNRELEASED; urgency=low
+
+ * New snapshot (2008-07-03 21:28:43 +0200)
+ - fix autorefresh version
+ * Not building akregator plugin (doesn't work)
+
+ * Ported build system to cdbs
+ * /usr/share/kde4/conf/translaterc is a configuration file
+ * Described disabled plugins in README.debian
+ * Not packaging documentation for disabled plugins
+
+ -- Xavier Vello <xavier.vello at gmail.com> Sat, 05 Jul 2008 18:00:28 +0200
+
konq-plugins (4:4.1~svn826310-1) experimental; urgency=low
* Initial packaging (Closes: #488398)
@@ -4,4 +17,3 @@
From SVN revision 826310 (Mon 30 Jun 2008, 13:59:02 +0200
-- Xavier Vello <xavier.vello at gmail.com> Mon, 30 Jun 2008 14:04:05 +0200
-
Added: kde-extras/konq-plugins/trunk/debian/conffiles
===================================================================
--- kde-extras/konq-plugins/trunk/debian/conffiles (rev 0)
+++ kde-extras/konq-plugins/trunk/debian/conffiles 2008-07-05 20:12:00 UTC (rev 11334)
@@ -0,0 +1 @@
+/usr/share/kde4/config/translaterc
Modified: kde-extras/konq-plugins/trunk/debian/patches/01-disable-plugins
===================================================================
--- kde-extras/konq-plugins/trunk/debian/patches/01-disable-plugins 2008-07-05 19:07:15 UTC (rev 11333)
+++ kde-extras/konq-plugins/trunk/debian/patches/01-disable-plugins 2008-07-05 20:12:00 UTC (rev 11334)
@@ -1,7 +1,5 @@
-Index: konq-plugins-4.1~svn826310/konq-plugins/CMakeLists.txt
-===================================================================
---- konq-plugins-4.1~svn826310.orig/konq-plugins/CMakeLists.txt 2008-06-30 16:09:06.000000000 +0200
-+++ konq-plugins-4.1~svn826310/konq-plugins/CMakeLists.txt 2008-06-30 16:11:38.000000000 +0200
+--- a/konq-plugins/CMakeLists.txt
++++ b/konq-plugins/CMakeLists.txt
@@ -1,7 +1,12 @@
-add_subdirectory( crashes )
+# Built in Konqueror 4
@@ -17,3 +15,22 @@
add_subdirectory( uachanger )
add_subdirectory( babelfish )
add_subdirectory( validators )
+@@ -20,5 +25,5 @@
+ # Need to port it to dbus and new mediamanager
+ #add_subdirectory( mediarealfolder )
+
+-add_subdirectory( akregator )
+-
++# Doesn't work in konqueror 4
++#add_subdirectory( akregator )
+--- a/doc/konq-plugins/CMakeLists.txt
++++ b/doc/konq-plugins/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_subdirectory(babel)
+-add_subdirectory(crashes)
+-add_subdirectory(dirfilter)
++#add_subdirectory(crashes)
++#add_subdirectory(dirfilter)
+ add_subdirectory(domtreeviewer)
+ add_subdirectory(fsview)
+ add_subdirectory(imgallery)
Modified: kde-extras/konq-plugins/trunk/debian/rules
===================================================================
--- kde-extras/konq-plugins/trunk/debian/rules 2008-07-05 19:07:15 UTC (rev 11333)
+++ kde-extras/konq-plugins/trunk/debian/rules 2008-07-05 20:12:00 UTC (rev 11334)
@@ -1,69 +1,6 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include debian/cdbs/kde.mk
-include /usr/share/quilt/quilt.make
-
-builddir/CMakeCache.txt: $(QUILT_STAMPFN)
- dh_testdir
- mkdir -p builddir
- cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CFLAGS)" \
- -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"
-
-build: build-stamp
-
-build-stamp: builddir/CMakeCache.txt
- dh_testdir
-
- # Add here commands to compile the package.
- cd builddir && $(MAKE)
- #docbook-to-man debian/automoc.sgml > automoc.1
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
-
- # Add here commands to clean up after the build process.
- rm -rf builddir
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/konq-plugins.
- cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/konq-plugins install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installman --language=C debian/man/*
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-arch
-.PHONY: build build-stamp clean binary-arch binary install
+binary-install/konq-plugins::
+ dh_installman -pkonq-plugins --language=C debian/man/*.1
More information about the pkg-kde-commits
mailing list