From 451a319e92c70afd7a8846e77053e8a88f33fbcf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 30 Dec 2011 15:20:41 -0600 Subject: [PATCH 1/6] Fix libtqt-perl FTBFS on Debian and Ubuntu --- debian/lenny/libraries/libtqt-perl/debian/control | 2 +- debian/squeeze/libraries/libtqt-perl/debian/control | 2 +- ubuntu/maverick/libraries/libtqt-perl/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/libraries/libtqt-perl/debian/control b/debian/lenny/libraries/libtqt-perl/debian/control index e0823f07a..3bef4f1d3 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/control +++ b/debian/lenny/libraries/libtqt-perl/debian/control @@ -3,7 +3,7 @@ Section: perl Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Bart Martens -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, kdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2) +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2) Build-Conflicts: libtqt-perl Standards-Version: 3.8.4 diff --git a/debian/squeeze/libraries/libtqt-perl/debian/control b/debian/squeeze/libraries/libtqt-perl/debian/control index e0823f07a..3bef4f1d3 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/control +++ b/debian/squeeze/libraries/libtqt-perl/debian/control @@ -3,7 +3,7 @@ Section: perl Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Bart Martens -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, kdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2) +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2) Build-Conflicts: libtqt-perl Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/control b/ubuntu/maverick/libraries/libtqt-perl/debian/control index e0823f07a..3bef4f1d3 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/control +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/control @@ -3,7 +3,7 @@ Section: perl Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Bart Martens -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, kdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2) +Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libtqtinterface-dev, perl (>= 5.8.0), automake, autoconf, tdelibs4-trinity-dev, libsmokeqt-trinity-dev, chrpath, libtool (>= 1.5.2) Build-Conflicts: libtqt-perl Standards-Version: 3.8.4 From 617dd978171d339a4fff6a707220468c4ab4b385 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 31 Dec 2011 04:23:35 -0600 Subject: [PATCH 2/6] Enable elficon support on Debian and Ubuntu --- debian/lenny/tdelibs/debian/control | 2 +- debian/lenny/tdelibs/debian/rules | 2 +- debian/squeeze/tdelibs/debian/control | 2 +- debian/squeeze/tdelibs/debian/rules | 2 +- ubuntu/maverick/tdelibs/debian/control | 2 +- ubuntu/maverick/tdelibs/debian/rules | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control index f41f6bebf..f6462c732 100644 --- a/debian/lenny/tdelibs/debian/control +++ b/debian/lenny/tdelibs/debian/control @@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo, libogg-dev-la, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, + gettext-kde, lsb-release, base-files, sudo, libr-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 diff --git a/debian/lenny/tdelibs/debian/rules b/debian/lenny/tdelibs/debian/rules index 119f2a4fe..73323de78 100755 --- a/debian/lenny/tdelibs/debian/rules +++ b/debian/lenny/tdelibs/debian/rules @@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" +-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control index f41f6bebf..f6462c732 100644 --- a/debian/squeeze/tdelibs/debian/control +++ b/debian/squeeze/tdelibs/debian/control @@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo, libogg-dev-la, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, + gettext-kde, lsb-release, base-files, sudo, libr-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 diff --git a/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules index 119f2a4fe..73323de78 100755 --- a/debian/squeeze/tdelibs/debian/rules +++ b/debian/squeeze/tdelibs/debian/rules @@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" +-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control index f2de6e248..dae47fa6b 100644 --- a/ubuntu/maverick/tdelibs/debian/control +++ b/ubuntu/maverick/tdelibs/debian/control @@ -15,7 +15,7 @@ Build-Depends: cdbs (>= 0.4.41ubuntu2), debhelper (>= 5.0.31), autotools-dev, libtiff4-dev (>= 3.7.3-1), libavahi-client-dev (>= 0.4), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo, libogg-dev, libtqtinterface-dev, - gettext-kde, lsb-release, base-files, sudo, + gettext-kde, lsb-release, base-files, sudo, libr-dev, cmake, libltdl-dev Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11 Standards-Version: 3.8.3 diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index 119f2a4fe..73323de78 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -21,7 +21,7 @@ version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" \ --DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" +-DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. From db773533c32db1b7aade68c9af04a4136b3b88b8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 31 Dec 2011 17:37:16 -0600 Subject: [PATCH 3/6] Add tdelfeditor in tdelibs to Debian and Ubuntu --- debian/lenny/tdelibs/debian/control | 2 +- debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install | 1 + debian/squeeze/tdelibs/debian/control | 2 +- debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install | 1 + ubuntu/maverick/tdelibs/debian/control | 2 +- ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdelibs/debian/control b/debian/lenny/tdelibs/debian/control index f6462c732..1ec5ceced 100644 --- a/debian/lenny/tdelibs/debian/control +++ b/debian/lenny/tdelibs/debian/control @@ -88,7 +88,7 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libsasl2-dev, libssl-dev, libxcomposite-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libtqtinterface-dev, - gettext-kde + gettext-kde, libr-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install index 91c12cb5b..63ab8a8bc 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install @@ -50,6 +50,7 @@ debian/tmp/opt/trinity/bin/lnusertemp debian/tmp/opt/trinity/bin/make_driver_db_cups debian/tmp/opt/trinity/bin/make_driver_db_lpr debian/tmp/opt/trinity/bin/meinproc +debian/tmp/opt/trinity/bin/tdelfeditor debian/tmp/opt/trinity/bin/start_tdeinit debian/tmp/opt/trinity/bin/start_tdeinit_wrapper debian/tmp/opt/trinity/lib/trinity/cupsdconf.la diff --git a/debian/squeeze/tdelibs/debian/control b/debian/squeeze/tdelibs/debian/control index f6462c732..1ec5ceced 100644 --- a/debian/squeeze/tdelibs/debian/control +++ b/debian/squeeze/tdelibs/debian/control @@ -88,7 +88,7 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libsasl2-dev, libssl-dev, libxcomposite-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libtqtinterface-dev, - gettext-kde + gettext-kde, libr-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install index 91c12cb5b..63ab8a8bc 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install @@ -50,6 +50,7 @@ debian/tmp/opt/trinity/bin/lnusertemp debian/tmp/opt/trinity/bin/make_driver_db_cups debian/tmp/opt/trinity/bin/make_driver_db_lpr debian/tmp/opt/trinity/bin/meinproc +debian/tmp/opt/trinity/bin/tdelfeditor debian/tmp/opt/trinity/bin/start_tdeinit debian/tmp/opt/trinity/bin/start_tdeinit_wrapper debian/tmp/opt/trinity/lib/trinity/cupsdconf.la diff --git a/ubuntu/maverick/tdelibs/debian/control b/ubuntu/maverick/tdelibs/debian/control index dae47fa6b..4402302e7 100644 --- a/ubuntu/maverick/tdelibs/debian/control +++ b/ubuntu/maverick/tdelibs/debian/control @@ -89,7 +89,7 @@ Depends: tdelibs4c2a-trinity (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libsasl2-dev, libssl-dev, libxcomposite-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-client-dev (>= 0.4), libtqtinterface-dev, - gettext-kde + gettext-kde, libr-dev Provides: tdelibs-trinity-dev Description: development files for the TDE core libraries This package contains all the headers and other related files needed diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install index 91c12cb5b..63ab8a8bc 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install @@ -50,6 +50,7 @@ debian/tmp/opt/trinity/bin/lnusertemp debian/tmp/opt/trinity/bin/make_driver_db_cups debian/tmp/opt/trinity/bin/make_driver_db_lpr debian/tmp/opt/trinity/bin/meinproc +debian/tmp/opt/trinity/bin/tdelfeditor debian/tmp/opt/trinity/bin/start_tdeinit debian/tmp/opt/trinity/bin/start_tdeinit_wrapper debian/tmp/opt/trinity/lib/trinity/cupsdconf.la From 79021dd82896cf6ffe20e7dd6a69e41c320da1aa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 1 Jan 2012 04:28:14 -0600 Subject: [PATCH 4/6] Add kfile elf plugin to tdelibs on Debian and Ubuntu --- debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install | 3 +++ debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install | 3 +++ ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install | 3 +++ 3 files changed, 9 insertions(+) diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install index 63ab8a8bc..3887f606d 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install @@ -315,3 +315,6 @@ debian/tmp/opt/trinity/lib/libkwalletclient.so.1 debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 +debian/tmp/opt/trinity/share/services/kfile_elf.desktop +debian/tmp/opt/trinity/lib/trinity/kfile_elf.so +debian/tmp/opt/trinity/lib/trinity/kfile_elf.la diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install index 63ab8a8bc..3887f606d 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install @@ -315,3 +315,6 @@ debian/tmp/opt/trinity/lib/libkwalletclient.so.1 debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 +debian/tmp/opt/trinity/share/services/kfile_elf.desktop +debian/tmp/opt/trinity/lib/trinity/kfile_elf.so +debian/tmp/opt/trinity/lib/trinity/kfile_elf.la diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install index 63ab8a8bc..3887f606d 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4c2a-trinity.install @@ -315,3 +315,6 @@ debian/tmp/opt/trinity/lib/libkwalletclient.so.1 debian/tmp/opt/trinity/lib/libkwalletclient.so.1.0.1 debian/tmp/opt/trinity/lib/libvcard.so.0 debian/tmp/opt/trinity/lib/libvcard.so.0.0.0 +debian/tmp/opt/trinity/share/services/kfile_elf.desktop +debian/tmp/opt/trinity/lib/trinity/kfile_elf.so +debian/tmp/opt/trinity/lib/trinity/kfile_elf.la From 918358c07d6f983c8209b453411e6b432e07a3a3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 1 Jan 2012 18:42:31 -0600 Subject: [PATCH 5/6] Update libtqt-perl rules for Debian and Ubuntu --- debian/lenny/libraries/libtqt-perl/debian/rules | 4 ++-- debian/squeeze/libraries/libtqt-perl/debian/rules | 4 ++-- ubuntu/maverick/libraries/libtqt-perl/debian/rules | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/lenny/libraries/libtqt-perl/debian/rules b/debian/lenny/libraries/libtqt-perl/debian/rules index 6a7885e21..7bf57d40b 100755 --- a/debian/lenny/libraries/libtqt-perl/debian/rules +++ b/debian/lenny/libraries/libtqt-perl/debian/rules @@ -16,7 +16,7 @@ SAVERESTORE=\ puic/Makefile.in \ smoke/Makefile.in \ smoke/qt/Makefile.in \ - PerlQt/bin \ + PerlTQt/bin \ DEB_AUTO_UPDATE_AUTOCONF := 2.61 @@ -47,7 +47,7 @@ build/libtqt-perl:: chrpath -d puic/puic clean:: - rm -f PerlQt/bin/.exists + rm -f PerlTQt/bin/.exists for f in $(SAVERESTORE) ; do [ ! -e $$f.d-r-orig ] || ( rm -rf $$f && mv $$f.d-r-orig $$f ) ; done rm -f pre-build-stamp diff --git a/debian/squeeze/libraries/libtqt-perl/debian/rules b/debian/squeeze/libraries/libtqt-perl/debian/rules index 6a7885e21..7bf57d40b 100755 --- a/debian/squeeze/libraries/libtqt-perl/debian/rules +++ b/debian/squeeze/libraries/libtqt-perl/debian/rules @@ -16,7 +16,7 @@ SAVERESTORE=\ puic/Makefile.in \ smoke/Makefile.in \ smoke/qt/Makefile.in \ - PerlQt/bin \ + PerlTQt/bin \ DEB_AUTO_UPDATE_AUTOCONF := 2.61 @@ -47,7 +47,7 @@ build/libtqt-perl:: chrpath -d puic/puic clean:: - rm -f PerlQt/bin/.exists + rm -f PerlTQt/bin/.exists for f in $(SAVERESTORE) ; do [ ! -e $$f.d-r-orig ] || ( rm -rf $$f && mv $$f.d-r-orig $$f ) ; done rm -f pre-build-stamp diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/rules b/ubuntu/maverick/libraries/libtqt-perl/debian/rules index 6a7885e21..7bf57d40b 100755 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/rules +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/rules @@ -16,7 +16,7 @@ SAVERESTORE=\ puic/Makefile.in \ smoke/Makefile.in \ smoke/qt/Makefile.in \ - PerlQt/bin \ + PerlTQt/bin \ DEB_AUTO_UPDATE_AUTOCONF := 2.61 @@ -47,7 +47,7 @@ build/libtqt-perl:: chrpath -d puic/puic clean:: - rm -f PerlQt/bin/.exists + rm -f PerlTQt/bin/.exists for f in $(SAVERESTORE) ; do [ ! -e $$f.d-r-orig ] || ( rm -rf $$f && mv $$f.d-r-orig $$f ) ; done rm -f pre-build-stamp From 457845b1c57b70c81d72846a402141d8b4609019 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 1 Jan 2012 20:58:10 -0600 Subject: [PATCH 6/6] Fix remaining references to PerlQt in libtqt-perl on Debian and Ubuntu --- debian/lenny/libraries/libtqt-perl/debian/changelog | 2 +- debian/lenny/libraries/libtqt-perl/debian/docs | 2 +- debian/lenny/libraries/libtqt-perl/debian/examples | 2 +- debian/lenny/libraries/libtqt-perl/debian/pqtapi.1 | 6 +++--- debian/lenny/libraries/libtqt-perl/debian/pqtsh.1 | 6 +++--- debian/lenny/libraries/libtqt-perl/debian/puic.1 | 2 +- debian/lenny/libraries/libtqt-perl/debian/watch | 2 +- debian/squeeze/libraries/libtqt-perl/debian/changelog | 2 +- debian/squeeze/libraries/libtqt-perl/debian/docs | 2 +- debian/squeeze/libraries/libtqt-perl/debian/examples | 2 +- debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1 | 6 +++--- debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1 | 6 +++--- debian/squeeze/libraries/libtqt-perl/debian/puic.1 | 2 +- debian/squeeze/libraries/libtqt-perl/debian/watch | 2 +- ubuntu/maverick/libraries/libtqt-perl/debian/changelog | 2 +- ubuntu/maverick/libraries/libtqt-perl/debian/docs | 2 +- ubuntu/maverick/libraries/libtqt-perl/debian/examples | 2 +- ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 | 6 +++--- ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 | 6 +++--- ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 | 2 +- ubuntu/maverick/libraries/libtqt-perl/debian/watch | 2 +- 21 files changed, 33 insertions(+), 33 deletions(-) diff --git a/debian/lenny/libraries/libtqt-perl/debian/changelog b/debian/lenny/libraries/libtqt-perl/debian/changelog index 78d64b05a..c5a93479e 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/changelog +++ b/debian/lenny/libraries/libtqt-perl/debian/changelog @@ -46,7 +46,7 @@ libqt-perl (3.008-3) unstable; urgency=low * debian/compat, debian/control, debian/examples, debian/manpages, debian/rules: Repackaged using dh-make and cdbs. Closes: #463089. * debian/control, debian/rules: Using chrpath to remove rpath. - * config.h.in, PerlQt/bin/pqtapi, PerlQt/bin/pqtsh: Removed previously + * config.h.in, PerlTQt/bin/pqtapi, PerlTQt/bin/pqtsh: Removed previously automatically added changes. * debian/watch: Added. diff --git a/debian/lenny/libraries/libtqt-perl/debian/docs b/debian/lenny/libraries/libtqt-perl/debian/docs index 83bf44358..60566c90c 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/docs +++ b/debian/lenny/libraries/libtqt-perl/debian/docs @@ -1,3 +1,3 @@ README TODO -PerlQt/tutorials +PerlTQt/tutorials diff --git a/debian/lenny/libraries/libtqt-perl/debian/examples b/debian/lenny/libraries/libtqt-perl/debian/examples index f60bcd7e0..50594b81e 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/examples +++ b/debian/lenny/libraries/libtqt-perl/debian/examples @@ -1 +1 @@ -PerlQt/examples/* +PerlTQt/examples/* diff --git a/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1 b/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1 index 009ac1643..f6005623a 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1 +++ b/debian/lenny/libraries/libtqt-perl/debian/pqtapi.1 @@ -1,6 +1,6 @@ .TH PERLQT 1 "July 31, 2002" .SH NAME -pqtapi \- PerlQt introspection tool +pqtapi \- PerlTQt introspection tool .SH SYNOPSIS .B pqtapi .RI " [ " -r " " " ] [ " " ] @@ -10,14 +10,14 @@ This manual page documents briefly the .B pqtapi command. .PP -\fBpqtapi\fP is a PerlQt Introspection tool. +\fBpqtapi\fP is a PerlTQt Introspection tool. For example: $ pqtapi -ir 'setpoint.* int' void QCanvasLine::setPoints(int, int, int, int) void QPointArray::setPoint(uint, int, int) -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH OPTIONS diff --git a/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1 b/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1 index 402884ba5..19c7a93a0 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1 +++ b/debian/lenny/libraries/libtqt-perl/debian/pqtsh.1 @@ -1,6 +1,6 @@ .TH PERLQT 1 "July 31, 2002" .SH NAME -pqtsh \- PerlQt Graphical shell +pqtsh \- PerlTQt Graphical shell .SH SYNOPSIS .B pqtsh @@ -10,10 +10,10 @@ This manual page documents briefly the command. .PP \fBpqtsh\fP is a graphical shell that can be used to test and experiment -with the PerlQt api interactively. It is fairly self-explanatory and includes +with the PerlTQt api interactively. It is fairly self-explanatory and includes an interactive example (Help -> Example). -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH AUTHOR diff --git a/debian/lenny/libraries/libtqt-perl/debian/puic.1 b/debian/lenny/libraries/libtqt-perl/debian/puic.1 index b83219b02..671bd97fd 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/puic.1 +++ b/debian/lenny/libraries/libtqt-perl/debian/puic.1 @@ -32,7 +32,7 @@ command. file created with the Qt Designer package. This will generate the package defined in the UI file and a basic main package for testing purposes. -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH OPTIONS diff --git a/debian/lenny/libraries/libtqt-perl/debian/watch b/debian/lenny/libraries/libtqt-perl/debian/watch index 2dfa7626d..18c470968 100644 --- a/debian/lenny/libraries/libtqt-perl/debian/watch +++ b/debian/lenny/libraries/libtqt-perl/debian/watch @@ -1,2 +1,2 @@ version=3 -http://sf.net/perlqt/PerlQt-([^b]+)\.tar\.gz +http://sf.net/perlqt/PerlTQt-([^b]+)\.tar\.gz diff --git a/debian/squeeze/libraries/libtqt-perl/debian/changelog b/debian/squeeze/libraries/libtqt-perl/debian/changelog index 78d64b05a..c5a93479e 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/changelog +++ b/debian/squeeze/libraries/libtqt-perl/debian/changelog @@ -46,7 +46,7 @@ libqt-perl (3.008-3) unstable; urgency=low * debian/compat, debian/control, debian/examples, debian/manpages, debian/rules: Repackaged using dh-make and cdbs. Closes: #463089. * debian/control, debian/rules: Using chrpath to remove rpath. - * config.h.in, PerlQt/bin/pqtapi, PerlQt/bin/pqtsh: Removed previously + * config.h.in, PerlTQt/bin/pqtapi, PerlTQt/bin/pqtsh: Removed previously automatically added changes. * debian/watch: Added. diff --git a/debian/squeeze/libraries/libtqt-perl/debian/docs b/debian/squeeze/libraries/libtqt-perl/debian/docs index 83bf44358..60566c90c 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/docs +++ b/debian/squeeze/libraries/libtqt-perl/debian/docs @@ -1,3 +1,3 @@ README TODO -PerlQt/tutorials +PerlTQt/tutorials diff --git a/debian/squeeze/libraries/libtqt-perl/debian/examples b/debian/squeeze/libraries/libtqt-perl/debian/examples index f60bcd7e0..50594b81e 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/examples +++ b/debian/squeeze/libraries/libtqt-perl/debian/examples @@ -1 +1 @@ -PerlQt/examples/* +PerlTQt/examples/* diff --git a/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1 b/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1 index 009ac1643..f6005623a 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1 +++ b/debian/squeeze/libraries/libtqt-perl/debian/pqtapi.1 @@ -1,6 +1,6 @@ .TH PERLQT 1 "July 31, 2002" .SH NAME -pqtapi \- PerlQt introspection tool +pqtapi \- PerlTQt introspection tool .SH SYNOPSIS .B pqtapi .RI " [ " -r " " " ] [ " " ] @@ -10,14 +10,14 @@ This manual page documents briefly the .B pqtapi command. .PP -\fBpqtapi\fP is a PerlQt Introspection tool. +\fBpqtapi\fP is a PerlTQt Introspection tool. For example: $ pqtapi -ir 'setpoint.* int' void QCanvasLine::setPoints(int, int, int, int) void QPointArray::setPoint(uint, int, int) -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH OPTIONS diff --git a/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1 b/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1 index 402884ba5..19c7a93a0 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1 +++ b/debian/squeeze/libraries/libtqt-perl/debian/pqtsh.1 @@ -1,6 +1,6 @@ .TH PERLQT 1 "July 31, 2002" .SH NAME -pqtsh \- PerlQt Graphical shell +pqtsh \- PerlTQt Graphical shell .SH SYNOPSIS .B pqtsh @@ -10,10 +10,10 @@ This manual page documents briefly the command. .PP \fBpqtsh\fP is a graphical shell that can be used to test and experiment -with the PerlQt api interactively. It is fairly self-explanatory and includes +with the PerlTQt api interactively. It is fairly self-explanatory and includes an interactive example (Help -> Example). -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH AUTHOR diff --git a/debian/squeeze/libraries/libtqt-perl/debian/puic.1 b/debian/squeeze/libraries/libtqt-perl/debian/puic.1 index b83219b02..671bd97fd 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/puic.1 +++ b/debian/squeeze/libraries/libtqt-perl/debian/puic.1 @@ -32,7 +32,7 @@ command. file created with the Qt Designer package. This will generate the package defined in the UI file and a basic main package for testing purposes. -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH OPTIONS diff --git a/debian/squeeze/libraries/libtqt-perl/debian/watch b/debian/squeeze/libraries/libtqt-perl/debian/watch index 2dfa7626d..18c470968 100644 --- a/debian/squeeze/libraries/libtqt-perl/debian/watch +++ b/debian/squeeze/libraries/libtqt-perl/debian/watch @@ -1,2 +1,2 @@ version=3 -http://sf.net/perlqt/PerlQt-([^b]+)\.tar\.gz +http://sf.net/perlqt/PerlTQt-([^b]+)\.tar\.gz diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/changelog b/ubuntu/maverick/libraries/libtqt-perl/debian/changelog index 78d64b05a..c5a93479e 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/changelog +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/changelog @@ -46,7 +46,7 @@ libqt-perl (3.008-3) unstable; urgency=low * debian/compat, debian/control, debian/examples, debian/manpages, debian/rules: Repackaged using dh-make and cdbs. Closes: #463089. * debian/control, debian/rules: Using chrpath to remove rpath. - * config.h.in, PerlQt/bin/pqtapi, PerlQt/bin/pqtsh: Removed previously + * config.h.in, PerlTQt/bin/pqtapi, PerlTQt/bin/pqtsh: Removed previously automatically added changes. * debian/watch: Added. diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/docs b/ubuntu/maverick/libraries/libtqt-perl/debian/docs index 83bf44358..60566c90c 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/docs +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/docs @@ -1,3 +1,3 @@ README TODO -PerlQt/tutorials +PerlTQt/tutorials diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/examples b/ubuntu/maverick/libraries/libtqt-perl/debian/examples index f60bcd7e0..50594b81e 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/examples +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/examples @@ -1 +1 @@ -PerlQt/examples/* +PerlTQt/examples/* diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 index 009ac1643..f6005623a 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtapi.1 @@ -1,6 +1,6 @@ .TH PERLQT 1 "July 31, 2002" .SH NAME -pqtapi \- PerlQt introspection tool +pqtapi \- PerlTQt introspection tool .SH SYNOPSIS .B pqtapi .RI " [ " -r " " " ] [ " " ] @@ -10,14 +10,14 @@ This manual page documents briefly the .B pqtapi command. .PP -\fBpqtapi\fP is a PerlQt Introspection tool. +\fBpqtapi\fP is a PerlTQt Introspection tool. For example: $ pqtapi -ir 'setpoint.* int' void QCanvasLine::setPoints(int, int, int, int) void QPointArray::setPoint(uint, int, int) -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH OPTIONS diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 index 402884ba5..19c7a93a0 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/pqtsh.1 @@ -1,6 +1,6 @@ .TH PERLQT 1 "July 31, 2002" .SH NAME -pqtsh \- PerlQt Graphical shell +pqtsh \- PerlTQt Graphical shell .SH SYNOPSIS .B pqtsh @@ -10,10 +10,10 @@ This manual page documents briefly the command. .PP \fBpqtsh\fP is a graphical shell that can be used to test and experiment -with the PerlQt api interactively. It is fairly self-explanatory and includes +with the PerlTQt api interactively. It is fairly self-explanatory and includes an interactive example (Help -> Example). -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH AUTHOR diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 b/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 index b83219b02..671bd97fd 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/puic.1 @@ -32,7 +32,7 @@ command. file created with the Qt Designer package. This will generate the package defined in the UI file and a basic main package for testing purposes. -For more information, please see the documentation on the PerlQt website +For more information, please see the documentation on the PerlTQt website http://perlqt.sourceforge.net/ .SH OPTIONS diff --git a/ubuntu/maverick/libraries/libtqt-perl/debian/watch b/ubuntu/maverick/libraries/libtqt-perl/debian/watch index 2dfa7626d..18c470968 100644 --- a/ubuntu/maverick/libraries/libtqt-perl/debian/watch +++ b/ubuntu/maverick/libraries/libtqt-perl/debian/watch @@ -1,2 +1,2 @@ version=3 -http://sf.net/perlqt/PerlQt-([^b]+)\.tar\.gz +http://sf.net/perlqt/PerlTQt-([^b]+)\.tar\.gz