From a9c1d6c3dde04600fa5bf9a1461bfe50476bf742 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Fri, 20 Jan 2012 17:27:47 +0200 Subject: Remove copy of libgq. Nothing in the source tree uses this after the removal of the icd bearer plugin in 0e0eb207c4ada7a09c980b816dda1c5c6af1c027, so there is no point keeping it around anymore. Change-Id: I6ea05c84d561965636e2ca5b03c7ee8edc48c093 Reviewed-by: Jonas Gastal Reviewed-by: Richard J. Moore --- src/3rdparty/libgq/debian/README.scratchbox | 28 -------- src/3rdparty/libgq/debian/changelog | 31 --------- src/3rdparty/libgq/debian/compat | 1 - src/3rdparty/libgq/debian/control | 43 ------------ src/3rdparty/libgq/debian/copyright | 8 --- src/3rdparty/libgq/debian/fixup-scratchbox | 79 ----------------------- src/3rdparty/libgq/debian/libgq-gconf-dev.install | 5 -- src/3rdparty/libgq/debian/libgq-gconf-doc.install | 1 - src/3rdparty/libgq/debian/libgq-gconf0.install | 1 - src/3rdparty/libgq/debian/maemo-sanitize | 0 src/3rdparty/libgq/debian/rules | 32 --------- 11 files changed, 229 deletions(-) delete mode 100644 src/3rdparty/libgq/debian/README.scratchbox delete mode 100644 src/3rdparty/libgq/debian/changelog delete mode 100644 src/3rdparty/libgq/debian/compat delete mode 100644 src/3rdparty/libgq/debian/control delete mode 100644 src/3rdparty/libgq/debian/copyright delete mode 100755 src/3rdparty/libgq/debian/fixup-scratchbox delete mode 100644 src/3rdparty/libgq/debian/libgq-gconf-dev.install delete mode 100644 src/3rdparty/libgq/debian/libgq-gconf-doc.install delete mode 100644 src/3rdparty/libgq/debian/libgq-gconf0.install delete mode 100644 src/3rdparty/libgq/debian/maemo-sanitize delete mode 100755 src/3rdparty/libgq/debian/rules (limited to 'src/3rdparty/libgq/debian') diff --git a/src/3rdparty/libgq/debian/README.scratchbox b/src/3rdparty/libgq/debian/README.scratchbox deleted file mode 100644 index 23ba7935ce..0000000000 --- a/src/3rdparty/libgq/debian/README.scratchbox +++ /dev/null @@ -1,28 +0,0 @@ -This packages behaves a bit wierdly inside Scratchbox 1, by design. - -When building it with dpkg-buildpackage or equivalent, it will disable -all devkits and adjust PATH. This means that almost all build -dependencies will come from your installed packages, and not from -Scratchbox or the configured devkits. - -Since some of our packages do not work with Scratchboxes fakeroot -(because the latter is too old), you should use the targets fakeroot -instead. - -You can disable this behavior by setting SBOX_DONT_SANITIZE in the -environment. - -When this package is build in a certain buildbot, it will go further -and permantly change the Scratchbox target. This should not happen to -anyone but the buildbot, but there is a chance it will happen to you -by accident. - -The buildbot is recognized via the $USER environment variable. If it -matches "bifh[0-9]", the permanent changes will be done. - -The permanent changes mostly consist of running apt-get dist-upgrade -and making sure that the targets fakeroot is used. - -This weirdness is brought to you by: - - http://maemo.gitorious.org/maemo-af/maemoify-tools diff --git a/src/3rdparty/libgq/debian/changelog b/src/3rdparty/libgq/debian/changelog deleted file mode 100644 index f6242540bf..0000000000 --- a/src/3rdparty/libgq/debian/changelog +++ /dev/null @@ -1,31 +0,0 @@ -libgq (0.4+0m6) unstable; urgency=low - - * This entry has been added by BIFH queue processor - version has been changed to 0.4+0m6 - - -- Marius Vollmer Fri, 04 Jun 2010 18:28:43 +0300 - -libgq (0.4) unstable; urgency=low - - * Never release the GConf client, to avoid having to recreate it - immediately. Might fix NB#164690. - - -- Marius Vollmer Fri, 04 Jun 2010 18:10:50 +0300 - -libgq (0.3) unstable; urgency=low - - * Added autotools to Build-Depends. - - -- Marius Vollmer Tue, 23 Feb 2010 12:04:45 +0200 - -libgq (0.2) unstable; urgency=low - - * Build fixes. - - -- Marius Vollmer Wed, 16 Dec 2009 15:56:05 +0200 - -libgq (0.1) unstable; urgency=low - - * Initial release. - - -- Marius Vollmer Wed, 16 Dec 2009 15:54:46 +0200 diff --git a/src/3rdparty/libgq/debian/compat b/src/3rdparty/libgq/debian/compat deleted file mode 100644 index 7f8f011eb7..0000000000 --- a/src/3rdparty/libgq/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/src/3rdparty/libgq/debian/control b/src/3rdparty/libgq/debian/control deleted file mode 100644 index 3feaa466ea..0000000000 --- a/src/3rdparty/libgq/debian/control +++ /dev/null @@ -1,43 +0,0 @@ -Source: libgq -Section: libs -Priority: extra -Maintainer: Marius Vollmer -Origin: maemo -Build-Depends: debhelper (>= 7), libqt4-dev, doxygen, libgconf2-dev, libglib2.0-dev, autoconf, automake, libtool -Vcs-Browser: http://gitorious.org/maemo-af/libgq -Vcs-Git: git@gitorious.org:maemo-af/libgq.git - -Package: libgq-gconf0 -Architecture: any -Depends: ${shlibs:Depends} -Description: a Qt wrapper for GConf - This library contains the GConfItem class, for easy - access to GConf from Qt programs. - . - This package contains the shared run-time library. - -Package: libgq-gconf0-dbg -Architecture: any -Depends: libgq-gconf0 (= ${source:Version}) -Description: a Qt wrapper for GConf - This library contains the GConfItem class, for easy - access to GConf from Qt programs. - . - This package contains the debugging symbols. - -Package: libgq-gconf-dev -Architecture: any -Depends: libgq-gconf0 (= ${source:Version}), libqt4-dev, libgconf2-dev -Description: a Qt wrapper for GConf - This library contains the GConfItem class, for easy - access to GConf from Qt programs. - . - This package contains the development files. - -Package: libgq-gconf-doc -Architecture: all -Description: a Qt wrapper for GConf - This library contains the GConfItem class, for easy - access to GConf from Qt programs. - . - This package contains the documentation. diff --git a/src/3rdparty/libgq/debian/copyright b/src/3rdparty/libgq/debian/copyright deleted file mode 100644 index 45b04e6929..0000000000 --- a/src/3rdparty/libgq/debian/copyright +++ /dev/null @@ -1,8 +0,0 @@ -Copyright (c) 2009 Nokia Corporation. - -This program, is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License version -2.1 as published by the Free Software Foundation. - -The full text of the LGPL 2.1 can be found in -/usr/share/common-licenses. diff --git a/src/3rdparty/libgq/debian/fixup-scratchbox b/src/3rdparty/libgq/debian/fixup-scratchbox deleted file mode 100755 index b39ad5fc28..0000000000 --- a/src/3rdparty/libgq/debian/fixup-scratchbox +++ /dev/null @@ -1,79 +0,0 @@ -#! /bin/sh - -# XXX - this needs to run under fakeroot... - -exec 3>&1 1>&2 - -real_dpkg_checkbuilddeps () { - SBOX_REDIRECT_IGNORE=/usr/bin/perl /usr/bin/perl /usr/bin/dpkg-checkbuilddeps "$@" -} - -finish () { - if ! real_dpkg_checkbuilddeps; then - echo "This package does not use any devkits." - echo "Please install all build dependencies as real packages." - echo >&3 FAIL - fi - exit 0 -} - -# The stamp file can not be in the source tree because then it would -# end up in the source package, which is not what we want. We put it -# into /var/tmp so that it gets deleted when a new rootstrap is -# extracted. - -STAMP=/var/tmp/SANITIZED.$(head debian/changelog | md5sum | cut -d' ' -f1) - -if [ -e $STAMP ]; then - exit 0; -fi - -# Only do permanent changes if this is BIFH - -echo "$USER" | grep -q 'bifh[0-9]' || finish - -# prevent bash from killing the system -rm -f /var/lib/bash/provide-sh - -# clean ~/.texmf-var to avoid trouble with stale things hiding there. -rm -rf ~/.texmf-var/ - -pfx="dpkg-checkbuilddeps: Unmet build dependencies:" -deps=`real_dpkg_checkbuilddeps 2>&1 | grep "^$pfx" | \ - sed -e "s/$pfx//" -e s'/([^)]*)//g' -e 's/|//'` -deps="$deps build-essential automake autoconf libtool ed gawk diff dpkg-dev" -for d in $deps; do - echo apt-get "$@" install $d - apt-get -o DPkg::Options::=--force-confold -q --force-yes --yes install $d -done -apt-get -o DPkg::Options::=--force-confold -q --force-yes --yes dist-upgrade - -# Make sure we get a fresh fakeroot installation - -# We can't seem to control the value of LD_PRELOAD well enough, so we -# just copy the good version of libfakeroot over the bad one that -# Scratchbox uses. This will result in a good version of libfakeroot -# talking to a bad version of faked, but that seems to work well -# enough. The protocol between the two is really simple and unlikely -# to change even when new syscalls are wrapped. And this is a -# desperate hack anyway, so it's OK if there is blood all over the -# floor from time to time. -# -# After we have overwritten libfakeroot, it no longer works with any -# host binaries, such as the ones in /scratchbox/compilers/bin or -# /scratchbox/tools/bin. Thus, we must avoid running those when -# fakerooted. -# -# We use "cp -l" here to avoid overwriting a library that is in use. -# -if [ "$(fakeroot -v)" = "fakeroot version 1.4.2" ]; then - apt-get -q --force-yes --yes --reinstall install fakeroot - cp -fl /usr/lib/libfakeroot/libfakeroot-sysv.so /usr/lib/libfakeroot-sysv/libfakeroot.so.0 - cp -fl /usr/lib/libfakeroot/libfakeroot-tcp.so /usr/lib/libfakeroot-tcp/libfakeroot.so.0 -else - echo "We have $(fakeroot -v), hurray!" -fi - -touch $STAMP - -finish diff --git a/src/3rdparty/libgq/debian/libgq-gconf-dev.install b/src/3rdparty/libgq/debian/libgq-gconf-dev.install deleted file mode 100644 index b3d949f416..0000000000 --- a/src/3rdparty/libgq/debian/libgq-gconf-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/include/gq/GConfItem -usr/include/gq/gconfitem.h -usr/lib/libgq-gconf.so -usr/lib/libgq-gconf.a -usr/lib/pkgconfig/gq-gconf.pc diff --git a/src/3rdparty/libgq/debian/libgq-gconf-doc.install b/src/3rdparty/libgq/debian/libgq-gconf-doc.install deleted file mode 100644 index 9007055b25..0000000000 --- a/src/3rdparty/libgq/debian/libgq-gconf-doc.install +++ /dev/null @@ -1 +0,0 @@ -gconf/html usr/share/doc/libgq-gconf-doc/ diff --git a/src/3rdparty/libgq/debian/libgq-gconf0.install b/src/3rdparty/libgq/debian/libgq-gconf0.install deleted file mode 100644 index 4ca628315b..0000000000 --- a/src/3rdparty/libgq/debian/libgq-gconf0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libgq-gconf.so.* diff --git a/src/3rdparty/libgq/debian/maemo-sanitize b/src/3rdparty/libgq/debian/maemo-sanitize deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/3rdparty/libgq/debian/rules b/src/3rdparty/libgq/debian/rules deleted file mode 100755 index 1f293b3348..0000000000 --- a/src/3rdparty/libgq/debian/rules +++ /dev/null @@ -1,32 +0,0 @@ -#! /usr/bin/make -f - -# Sanitize build environment when running inside Scratchbox 1 -ifneq (,$(wildcard /targets)) - ifeq (,$(SBOX_DONT_SANITIZE)) - export PATH:=/bin:/usr/bin - export MAKE:=make - ifeq (,$(FAKEROOTKEY)) - export SBOX_REDIRECT_TO_DIRS:=/scratchbox/compilers/bin - else - export SBOX_REDIRECT_TO_DIRS:= - endif - ifneq (,$(shell debian/fixup-scratchbox)) - $(error Error) - endif - endif -endif - -override_dh_auto_configure: - ./autogen.sh - dh_auto_configure - -override_dh_auto_build: - dh_auto_build - cd gconf && doxygen - -override_dh_strip: - dh_strip -plibgq-gconf0 --dbg-package=libgq-gconf0-dbg - dh_strip - -%: - dh $@ -- cgit v1.2.3