summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/abakus/debian/rules4
-rw-r--r--ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/fusion-icon/debian/rules2
-rw-r--r--ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/kcpuload/debian/rules4
-rw-r--r--ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk218
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/control2
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/docs1
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/kdpkg-install.134
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/kdpkg.134
-rw-r--r--ubuntu/_base/applications/kdpkg/debian/manpages2
-rwxr-xr-xubuntu/_base/applications/kdpkg/debian/rules42
-rw-r--r--ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/keep/debian/control2
-rw-r--r--ubuntu/_base/applications/keep/debian/docs1
-rw-r--r--ubuntu/_base/applications/keep/debian/keep.xml113
-rwxr-xr-xubuntu/_base/applications/keep/debian/rules49
-rw-r--r--ubuntu/_base/applications/keep/debian/watch2
-rw-r--r--ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk218
-rw-r--r--ubuntu/_base/applications/kerberostray/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/kerberostray/debian/control2
-rw-r--r--ubuntu/_base/applications/kerberostray/debian/docs1
-rwxr-xr-xubuntu/_base/applications/kerberostray/debian/rules37
-rw-r--r--ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kerry/debian/control2
-rw-r--r--ubuntu/_base/applications/kerry/debian/kerry.1.docbook109
-rw-r--r--ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch3
-rwxr-xr-xubuntu/_base/applications/kerry/debian/rules36
-rw-r--r--ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/kgtk-qt3/debian/rules4
-rw-r--r--ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kima/debian/control3
-rwxr-xr-xubuntu/_base/applications/kima/debian/rules5
-rw-r--r--ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/knetworkmanager8/debian/rules36
-rw-r--r--ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kpowersave/debian/kpowersave.1148
-rw-r--r--ubuntu/_base/applications/kpowersave/debian/manpages1
-rwxr-xr-xubuntu/_base/applications/kpowersave/debian/rules34
-rw-r--r--ubuntu/_base/applications/kpowersave/debian/watch2
-rw-r--r--ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/rosegarden/debian/rules4
-rw-r--r--ubuntu/_base/applications/smartcardauth/debian/control2
-rwxr-xr-xubuntu/_base/applications/smartcardauth/debian/rules13
-rw-r--r--ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk17
-rwxr-xr-x[-rw-r--r--]ubuntu/_base/applications/tde-guidance/debian/rules2
-rw-r--r--ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/tde-style-qtcurve/debian/rules4
-rw-r--r--ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/tdedocker/debian/rules4
-rw-r--r--ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/tdeio-ftps/debian/rules4
-rw-r--r--ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/tdeio-gopher/debian/rules4
-rw-r--r--ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/tdeio-locate/debian/rules4
-rw-r--r--ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tdepowersave/debian/manpages1
-rwxr-xr-xubuntu/_base/applications/tdepowersave/debian/rules33
-rw-r--r--ubuntu/_base/applications/tdepowersave/debian/tdepowersave.1148
-rw-r--r--ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/tdesvn/debian/rules4
-rw-r--r--ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/wlassistant/debian/rules4
-rw-r--r--ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/applications/yakuake/debian/rules4
-rw-r--r--ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/dependencies/arts/debian/rules4
-rw-r--r--ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/dependencies/libr/debian/rules2
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/README.Debian277
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/changelog2664
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/compat1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/control372
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/copyright145
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install51
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install270
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install8
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-data.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs4
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install9
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links11
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs4
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install4
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm9
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop12
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh36
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop77
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop25
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh3
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop12
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff30
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff16
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff50
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/patches/series3
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install4
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links8
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install3
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu6
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst8
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm12
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-designer-plugins.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-designer.install7
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-designer.links1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu7
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst10
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm12
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install5
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install2
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links2
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install9
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links7
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst28
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm16
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base11
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs2
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-doc.links2
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install4
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu6
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst10
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm12
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu8
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst10
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm12
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc4
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/qtrc28
-rwxr-xr-xubuntu/_base/dependencies/qt3/debian/rules496
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/source/format1
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/source/options6
-rwxr-xr-xubuntu/_base/dependencies/tqca-tls/debian/rules4
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop12
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop77
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop25
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh3
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop12
-rwxr-xr-xubuntu/_base/dependencies/tqt3/debian/rules9
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install2
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install2
-rwxr-xr-xubuntu/_base/dependencies/tqtinterface/debian/rules2
-rw-r--r--ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/libraries/pytdeextensions/debian/rules2
-rwxr-xr-xubuntu/_base/tde-i18n/debian/rules4
-rw-r--r--ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdebase/debian/libtqt3-integration-trinity.install11
-rwxr-xr-xubuntu/_base/tdebase/debian/rules4
-rw-r--r--ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install30
-rw-r--r--ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdeedu/debian/blinken-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/blinken-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdeedu/debian/control2
-rw-r--r--ubuntu/_base/tdeedu/debian/indi-trinity.install11
-rw-r--r--ubuntu/_base/tdeedu/debian/indi-trinity.manpages11
-rw-r--r--ubuntu/_base/tdeedu/debian/kalzium-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kalzium-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kanagram-trinity.install2
-rw-r--r--ubuntu/_base/tdeedu/debian/kanagram-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kbruch-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kbruch-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/keduca-trinity.install3
-rw-r--r--ubuntu/_base/tdeedu/debian/keduca-trinity.manpages3
-rw-r--r--ubuntu/_base/tdeedu/debian/kgeography-trinity.install2
-rw-r--r--ubuntu/_base/tdeedu/debian/kgeography-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/khangman-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/khangman-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kig-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kig-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kiten-trinity.install2
-rw-r--r--ubuntu/_base/tdeedu/debian/kiten-trinity.manpages2
-rw-r--r--ubuntu/_base/tdeedu/debian/klatin-trinity.install2
-rw-r--r--ubuntu/_base/tdeedu/debian/klatin-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/klettres-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/klettres-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kmplot-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kmplot-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kpercentage-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kpercentage-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kstars-trinity.install5
-rw-r--r--ubuntu/_base/tdeedu/debian/kstars-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/ktouch-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/ktouch-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kturtle-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kturtle-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kverbos-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kverbos-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/kvoctrain-trinity.install3
-rw-r--r--ubuntu/_base/tdeedu/debian/kvoctrain-trinity.manpages3
-rw-r--r--ubuntu/_base/tdeedu/debian/kwordquiz-trinity.install1
-rw-r--r--ubuntu/_base/tdeedu/debian/kwordquiz-trinity.manpages1
-rw-r--r--ubuntu/_base/tdeedu/debian/libkiten-dev-trinity.install2
-rw-r--r--ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.install2
-rw-r--r--ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.manpages2
-rw-r--r--ubuntu/_base/tdeedu/debian/man/blinken-trinity.152
-rw-r--r--ubuntu/_base/tdeedu/debian/man/celestrongps-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/fliccd-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/indiserver-trinity.1123
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kalzium-trinity.155
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kanagram-trinity.153
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kbruch-trinity.147
-rw-r--r--ubuntu/_base/tdeedu/debian/man/keduca-shrinker-trinity.166
-rw-r--r--ubuntu/_base/tdeedu/debian/man/keduca-trinity.153
-rw-r--r--ubuntu/_base/tdeedu/debian/man/keducabuilder-trinity.153
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kgeography-trinity.147
-rw-r--r--ubuntu/_base/tdeedu/debian/man/khangman-trinity.152
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kig-trinity.181
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kiten-trinity.152
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kitengen-trinity.155
-rw-r--r--ubuntu/_base/tdeedu/debian/man/klatin-trinity.156
-rw-r--r--ubuntu/_base/tdeedu/debian/man/klettres-trinity.150
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kmplot-trinity.158
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kpercentage-trinity.150
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kstars-trinity.1117
-rw-r--r--ubuntu/_base/tdeedu/debian/man/ktouch-trinity.156
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kturtle-trinity.161
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kverbos-trinity.154
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kvoctrain-trinity.160
-rw-r--r--ubuntu/_base/tdeedu/debian/man/kwordquiz-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/langen2kvtml-trinity.183
-rw-r--r--ubuntu/_base/tdeedu/debian/man/lx200_16-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/lx200autostar-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/lx200classic-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/lx200generic-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/lx200gps-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/spotlight2kvtml-trinity.152
-rw-r--r--ubuntu/_base/tdeedu/debian/man/temma-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/test_extdate-trinity.147
-rw-r--r--ubuntu/_base/tdeedu/debian/man/test_extdatepicker-trinity.150
-rw-r--r--ubuntu/_base/tdeedu/debian/man/v4ldriver-trinity.169
-rw-r--r--ubuntu/_base/tdeedu/debian/man/v4lphilips-trinity.169
-rwxr-xr-xubuntu/_base/tdeedu/debian/rules70
-rw-r--r--ubuntu/_base/tdegames/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdegraphics/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/tdegraphics/debian/rules4
-rw-r--r--ubuntu/_base/tdelibs/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/tdelibs/debian/rules7
-rw-r--r--ubuntu/_base/tdemultimedia/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdenetwork/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdepim/debian/cdbs/debian-tde.mk17
-rwxr-xr-xubuntu/_base/tdepim/debian/rules4
-rw-r--r--ubuntu/_base/tdesdk/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdetoys/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdeutils/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdevelop/debian/cdbs/debian-tde.mk17
-rw-r--r--ubuntu/_base/tdewebdev/debian/cdbs/debian-tde.mk17
l---------ubuntu/disco1
l---------ubuntu/eoan1
353 files changed, 2855 insertions, 8350 deletions
diff --git a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/abakus/debian/rules b/ubuntu/_base/applications/abakus/debian/rules
index 1180312f8..8ab9fb501 100755
--- a/ubuntu/_base/applications/abakus/debian/rules
+++ b/ubuntu/_base/applications/abakus/debian/rules
@@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
debian/abakus.xpm: icons/hi64-app-abakus.png
convert -resize 32 $< $@
diff --git a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/fusion-icon/debian/rules
index f1b2fcb21..4f2025eca 100755
--- a/ubuntu/_base/applications/fusion-icon/debian/rules
+++ b/ubuntu/_base/applications/fusion-icon/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity
diff --git a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kcpuload/debian/rules b/ubuntu/_base/applications/kcpuload/debian/rules
index 8a8c4ebb0..7ee0b8693 100755
--- a/ubuntu/_base/applications/kcpuload/debian/rules
+++ b/ubuntu/_base/applications/kcpuload/debian/rules
@@ -17,9 +17,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON"
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
diff --git a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..7a55130b2
--- /dev/null
+++ b/ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk
@@ -0,0 +1,218 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+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)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+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
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ 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)/opt/trinity/share/doc/tde/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/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl b/ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/kdpkg/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/kdpkg/debian/control b/ubuntu/_base/applications/kdpkg/debian/control
index 876bd2bf0..2c367e892 100644
--- a/ubuntu/_base/applications/kdpkg/debian/control
+++ b/ubuntu/_base/applications/kdpkg/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Alexander Kopf <kopf-alexander@gmx.de>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: kdpkg-trinity
diff --git a/ubuntu/_base/applications/kdpkg/debian/docs b/ubuntu/_base/applications/kdpkg/debian/docs
new file mode 100644
index 000000000..62deb0497
--- /dev/null
+++ b/ubuntu/_base/applications/kdpkg/debian/docs
@@ -0,0 +1 @@
+AUTHORS
diff --git a/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1 b/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1
deleted file mode 100644
index c49586d4e..000000000
--- a/ubuntu/_base/applications/kdpkg/debian/kdpkg-install.1
+++ /dev/null
@@ -1,34 +0,0 @@
-'\" -*- coding: us-ascii -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH kdpkg 1 2008-07-03 "" ""
-.SH NAME
-kdpkg \- TDE frontend for dpkg
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBkdpkg\fR \kx
-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
-'in \n(.iu+\nxu
-'in \n(.iu-\nxu
-.ad b
-'hy
-.SH DESCRIPTION
-If you klick on a .deb file kdpkg starts automatically for installing it.
-It works like gdebi with the difference that kdpkg is a TDE application
-.SH COPYRIGHT
-This manual page was written by Alexander Kopf
-<\*(T<kopf\-alexander@gmx.de\*(T>> for the
-Ubuntu system (but may be used by others).
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU General Public License,
-Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public
-License can be found in
-\*(T<\fI/usr/share/common\-licenses/GPL\-2\fR\*(T>.
diff --git a/ubuntu/_base/applications/kdpkg/debian/kdpkg.1 b/ubuntu/_base/applications/kdpkg/debian/kdpkg.1
deleted file mode 100644
index c49586d4e..000000000
--- a/ubuntu/_base/applications/kdpkg/debian/kdpkg.1
+++ /dev/null
@@ -1,34 +0,0 @@
-'\" -*- coding: us-ascii -*-
-.if \n(.g .ds T< \\FC
-.if \n(.g .ds T> \\F[\n[.fam]]
-.de URL
-\\$2 \(la\\$1\(ra\\$3
-..
-.if \n(.g .mso www.tmac
-.TH kdpkg 1 2008-07-03 "" ""
-.SH NAME
-kdpkg \- TDE frontend for dpkg
-.SH SYNOPSIS
-'nh
-.fi
-.ad l
-\fBkdpkg\fR \kx
-.if (\nx>(\n(.l/2)) .nr x (\n(.l/5)
-'in \n(.iu+\nxu
-'in \n(.iu-\nxu
-.ad b
-'hy
-.SH DESCRIPTION
-If you klick on a .deb file kdpkg starts automatically for installing it.
-It works like gdebi with the difference that kdpkg is a TDE application
-.SH COPYRIGHT
-This manual page was written by Alexander Kopf
-<\*(T<kopf\-alexander@gmx.de\*(T>> for the
-Ubuntu system (but may be used by others).
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU General Public License,
-Version 2 or any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public
-License can be found in
-\*(T<\fI/usr/share/common\-licenses/GPL\-2\fR\*(T>.
diff --git a/ubuntu/_base/applications/kdpkg/debian/manpages b/ubuntu/_base/applications/kdpkg/debian/manpages
deleted file mode 100644
index 7835ccb72..000000000
--- a/ubuntu/_base/applications/kdpkg/debian/manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/kdpkg.1
-debian/kdpkg-install.1
diff --git a/ubuntu/_base/applications/kdpkg/debian/rules b/ubuntu/_base/applications/kdpkg/debian/rules
index fc6797244..cee2a3058 100755
--- a/ubuntu/_base/applications/kdpkg/debian/rules
+++ b/ubuntu/_base/applications/kdpkg/debian/rules
@@ -1,35 +1,19 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-binary-install/kdpkg-trinity::
- mv debian/kdpkg-trinity/usr/share/man debian/kdpkg-trinity/opt/trinity/share/
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/keep/debian/control b/ubuntu/_base/applications/keep/debian/control
index 2330b6b42..11d27c58d 100644
--- a/ubuntu/_base/applications/keep/debian/control
+++ b/ubuntu/_base/applications/keep/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev
Standards-Version: 3.8.4
Package: keep-trinity
diff --git a/ubuntu/_base/applications/keep/debian/docs b/ubuntu/_base/applications/keep/debian/docs
index 724e08449..ca0272abf 100644
--- a/ubuntu/_base/applications/keep/debian/docs
+++ b/ubuntu/_base/applications/keep/debian/docs
@@ -1,2 +1,3 @@
+AUTHORS
README
TODO
diff --git a/ubuntu/_base/applications/keep/debian/keep.xml b/ubuntu/_base/applications/keep/debian/keep.xml
deleted file mode 100644
index 0e97d35b3..000000000
--- a/ubuntu/_base/applications/keep/debian/keep.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Mercatante</firstname>
- <surname>Anthony</surname>
- <email>anthony.mercatante@laposte.net</email>
- </author>
- <copyright>
- <year>2005</year>
- <holder>Anthony Mercatante</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2005-12-27</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>keep</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>keep</refname>
- <refpurpose>backup system for TDE</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>keep</command>
- <arg choice="opt">
- <option><replaceable>Qt-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>TDE-options</replaceable></option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- backup system for TDE.
- </para>
- <para>
- The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
- </para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <para>
- All <productname>TDE</productname> and <productname>Qt</productname>
- programs accept a some common command-line options. keep has no
- application-specific options.
- </para>
- <para>
- <variablelist>
- <title>Generic options:</title>
- <varlistentry>
- <term> <option>--help</option> </term>
- <listitem> <para>Show help about options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-qt</option> </term>
- <listitem> <para>Show Qt specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-tde</option> </term>
- <listitem> <para>Show TDE specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-all</option> </term>
- <listitem> <para>Show all options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--author</option> </term>
- <listitem> <para>Show author information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>-v</option>, <option>--version</option> </term>
- <listitem> <para>Show version information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--license</option> </term>
- <listitem> <para>Show license information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--</option> </term>
- <listitem> <para>Indicates end of options</para> </listitem>
- </varlistentry>
- </variablelist>
- <!-- TODO * add all the rest of the options, but maybe find an automated
- way to keep it up to date -->
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Anthony Mercatante
- <email>anthony.mercatante@laposte.net</email> for the
- <productname>Debian</productname> system (but may be used by others).
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the <acronym>GNU</acronym> General Public License,
- Version 2 or any later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
-
diff --git a/ubuntu/_base/applications/keep/debian/rules b/ubuntu/_base/applications/keep/debian/rules
index aef7a1ca5..cee2a3058 100755
--- a/ubuntu/_base/applications/keep/debian/rules
+++ b/ubuntu/_base/applications/keep/debian/rules
@@ -1,46 +1,19 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_INSTALL_MANPAGES_keep := keep.1
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
-build/keep-trinity::
- /usr/bin/docbook2x-man debian/keep.xml
-
-install/keep-trinity::
- dh_installman keep.1
- mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
- rm -f debian/stamp-bootstrap
- rm -f keep.1
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/keep/debian/watch b/ubuntu/_base/applications/keep/debian/watch
deleted file mode 100644
index db207d2d8..000000000
--- a/ubuntu/_base/applications/keep/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://jr.falleri.free.fr/files/devel/keep/keep-(.*)\.tar\.gz
diff --git a/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk
new file mode 100644
index 000000000..7a55130b2
--- /dev/null
+++ b/ubuntu/_base/applications/kerberostray/debian/cdbs/debian-tde.mk
@@ -0,0 +1,218 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
+# Copyright © 2019 TDE Team
+# Description: A class for TDE packages; sets TDE environment variables, etc
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+ifndef _cdbs_bootstrap
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+endif
+
+ifndef _cdbs_class_debian-qt-kde
+_cdbs_class_debian-qt-kde := 1
+
+# for dh_icons
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
+
+# Note: This _must_ be included before autotools.mk, or it won't work.
+common-configure-arch common-configure-indep:: debian/stamp-cvs-make
+debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
+ cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
+ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
+endif
+ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
+ cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
+endif
+ $(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
+ touch debian/stamp-cvs-make
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+ifdef _cdbs_tarball_dir
+DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
+else
+DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
+endif
+
+ifndef _cdbs_class_cmake
+include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
+
+ifndef _cdbs_rules_patchsys_quilt
+DEB_PATCHDIRS := debian/patches/common debian/patches
+endif
+
+export kde_cgidir = \$${libdir}/cgi-bin
+export kde_confdir = \$${sysconfdir}/trinity
+export kde_htmldir = \$${datadir}/doc/tde/HTML
+
+DEB_KDE_ENABLE_FINAL := yes
+DEB_INSTALL_DOCS_ALL :=
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
+
+DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
+DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
+
+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)))
+ cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
+ else
+ cdbs_kde_enable_final =
+ endif
+endif
+
+ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_final =
+ cdbs_kde_enable_debug = --enable-debug=yes
+else
+ cdbs_kde_enable_debug = --disable-debug
+endif
+
+ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
+ cdbs_kde_enable_debug = --enable-debug=full
+endif
+
+DEB_BUILD_PARALLEL ?= true
+
+cdbs_configure_flags += \
+ --with-qt-dir=/usr/share/qt3 \
+ --disable-rpath \
+ --with-xinerama \
+ $(cdbs_kde_enable_final) \
+ $(cdbs_kde_enable_debug)
+
+
+# This is a convenience target for calling manually.
+# It's not part of the build process.
+buildprep: clean apply-patches
+ifndef _cdbs_class_cmake
+ $(MAKE) -f admin/Makefile.common dist
+endif
+ debian/rules clean
+
+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
+
+common-binary-indep::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_INDEP_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+
+common-binary-arch::
+ ( set -e; \
+ tmpf=`mktemp debian/versions.XXXXXX`; \
+ perl debian/cdbs/versions.pl >$$tmpf; \
+ for p in $(DEB_ARCH_PACKAGES); do \
+ cat $$tmpf >>debian/$$p.substvars; \
+ done; \
+ rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
+
+clean::
+ rm -rf debian/man/out
+ -rmdir debian/man
+ rm -f debian/stamp-man-pages
+ rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
+ 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)/opt/trinity/share/doc/tde/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/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ /opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
+ done
+ for pkg in $(DOC_HTML_PRUNE) ; do \
+ rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
+ done
+
+common-build-indep:: debian/stamp-kde-apidox
+debian/stamp-kde-apidox:
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
+ touch $@
+
+common-install-indep:: common-install-kde-apidox
+common-install-kde-apidox::
+ $(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
+
+cleanbuilddir::
+ -$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
+
+clean::
+ifndef _cdbs_class_cmake
+ if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
+ cd $(DEB_SRCDIR); \
+ find . -name Makefile.in -print | \
+ xargs --no-run-if-empty rm -f; \
+ rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
+ configure configure.files configure.in stamp-h.in \
+ subdirs; \
+ fi
+endif
+ rm -f debian/stamp-kde-apidox
+ rm -f debian/stamp-cvs-make
+
+endif
diff --git a/ubuntu/_base/applications/kerberostray/debian/cdbs/versions.pl b/ubuntu/_base/applications/kerberostray/debian/cdbs/versions.pl
new file mode 100644
index 000000000..1b110f7af
--- /dev/null
+++ b/ubuntu/_base/applications/kerberostray/debian/cdbs/versions.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
+my ($version3, $version3_next);
+my ($version2, $version2_next);
+
+($version3 = $version) =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
+($version2 = $version3) =~ s/\.[^.]+$//;
+
+($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
+($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
+
+print "TDE-Version3=$version3\n";
+print "TDE-Version2=$version2\n";
+print "TDE-Next-Version3=$version3_next\n";
+print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/applications/kerberostray/debian/control b/ubuntu/_base/applications/kerberostray/debian/control
index f0ddc337e..c24c10bcf 100644
--- a/ubuntu/_base/applications/kerberostray/debian/control
+++ b/ubuntu/_base/applications/kerberostray/debian/control
@@ -2,7 +2,7 @@ Source: kerberostray-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, libtdeldap-trinity-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libtdeldap-trinity-dev
Standards-Version: 3.8.4
Package: kerberostray-trinity
diff --git a/ubuntu/_base/applications/kerberostray/debian/docs b/ubuntu/_base/applications/kerberostray/debian/docs
new file mode 100644
index 000000000..62deb0497
--- /dev/null
+++ b/ubuntu/_base/applications/kerberostray/debian/docs
@@ -0,0 +1 @@
+AUTHORS
diff --git a/ubuntu/_base/applications/kerberostray/debian/rules b/ubuntu/_base/applications/kerberostray/debian/rules
index 272168641..cee2a3058 100755
--- a/ubuntu/_base/applications/kerberostray/debian/rules
+++ b/ubuntu/_base/applications/kerberostray/debian/rules
@@ -1,32 +1,19 @@
#!/usr/bin/make -f
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+include /usr/share/cdbs/1/class/cmake.mk
+include debian/cdbs/debian-tde.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kerry/debian/control b/ubuntu/_base/applications/kerry/debian/control
index 191180cf7..0ae6c68f9 100644
--- a/ubuntu/_base/applications/kerry/debian/control
+++ b/ubuntu/_base/applications/kerry/debian/control
@@ -2,7 +2,7 @@ Source: kerry-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0)
Homepage: http://en.opensuse.org/Kerry
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/applications/kerry/debian/kerry.1.docbook b/ubuntu/_base/applications/kerry/debian/kerry.1.docbook
deleted file mode 100644
index c286af6db..000000000
--- a/ubuntu/_base/applications/kerry/debian/kerry.1.docbook
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
- <refentryinfo>
- <author>
- <firstname>Jonathan Patrick</firstname>
- <surname>Davies</surname>
- <email>jpatrick@ubuntu.com</email>
- </author>
- <copyright>
- <year>2006</year>
- <holder>Jonathan Patrick Davies</holder>
- </copyright>
- <!-- XXX IMPORTANT XXX -->
- <!-- Keep this date up to date: -->
- <date>2006-03-26</date>
- <!-- ^^^^^^^^^^ -->
- </refentryinfo>
- <refmeta>
- <refentrytitle>kerry</refentrytitle>
- <manvolnum>1</manvolnum>
- </refmeta>
- <refnamediv>
- <refname>kerry</refname>
- <refpurpose>a Beagle frontend for TDE</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>kautoclick</command>
- <arg choice="opt">
- <option><replaceable>Qt-options</replaceable></option>
- </arg>
- <arg choice="opt">
- <option><replaceable>TDE-options</replaceable></option>
- </arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
- <para>
- Kerry is a frontend for Beagle for the <productname>TDE</productname> desktop.
- </para>
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
- <para>
- All <productname>TDE</productname> and <productname>Qt</productname>
- programs accept a some common command-line options. Kerry has no
- application-specific options.
- </para>
- <para>
- <variablelist>
- <title>Generic options:</title>
- <varlistentry>
- <term> <option>--help</option> </term>
- <listitem> <para>Show help about options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-qt</option> </term>
- <listitem> <para>Show Qt specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-tde</option> </term>
- <listitem> <para>Show TDE specific options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--help-all</option> </term>
- <listitem> <para>Show all options</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--author</option> </term>
- <listitem> <para>Show author information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>-v</option>, <option>--version</option> </term>
- <listitem> <para>Show version information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--license</option> </term>
- <listitem> <para>Show license information</para> </listitem>
- </varlistentry>
- <varlistentry>
- <term> <option>--</option> </term>
- <listitem> <para>Indicates end of options</para> </listitem>
- </varlistentry>
- </variablelist>
- <!-- TODO * add all the rest of the options, but maybe find an automated
- way to keep it up to date -->
- </para>
- </refsect1>
- <refsect1>
- <title>COPYRIGHT</title>
- <para>
- This manual page was written by Jonathan Patrick Davies
- <email>jpatrick@ubuntu.com</email> for the
- <productname>Ubuntu</productname> system (but may be used by others).
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the <acronym>GNU</acronym> General Public License,
- Version 2 or any later version published by the Free Software Foundation.
- </para>
- <para>
- On Debian systems, the complete text of the GNU General Public
- License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
- </para>
- </refsect1>
-</refentry>
diff --git a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
index 896193aba..07576f0eb 100644
--- a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
+++ b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
@@ -1,9 +1,8 @@
diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/src/kerry.desktop kerry-0.2.1.new/kerry/src/kerry.desktop
--- kerry-0.2.1/kerry/src/kerry.desktop 2006-12-04 14:35:38.000000000 +0100
+++ kerry-0.2.1.new/kerry/src/kerry.desktop 2008-04-08 22:55:31.000000000 +0200
-@@ -1,6 +1,5 @@
+@@ -1,5 +1,4 @@
[Desktop Entry]
- X-SuSE-translate=true
-Encoding=UTF-8
Name=Kerry Beagle
GenericName=Desktop Search
diff --git a/ubuntu/_base/applications/kerry/debian/rules b/ubuntu/_base/applications/kerry/debian/rules
index a84cc1fed..cee2a3058 100755
--- a/ubuntu/_base/applications/kerry/debian/rules
+++ b/ubuntu/_base/applications/kerry/debian/rules
@@ -1,33 +1,19 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-DEB_INSTALL_MANPAGES_kerry-trinity = kerry.1
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-build/kerry-trinity::
- docbook2x-man debian/kerry.1.docbook
-
-clean::
- rm -f kerry.1
-
-binary-post-install/kerry-trinity::
- chrpath -d debian/kerry-trinity/opt/trinity/lib/libtdeinit_kerry.so
- chrpath -d debian/kerry-trinity/opt/trinity/bin/kerry
- chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kerry.so
- chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kcm_beagle.so
- mkdir -p debian/kerry-trinity/opt/trinity/share/man/man1/
- mv debian/kerry-trinity/usr/share/man/man1/kerry.1 debian/kerry-trinity/opt/trinity/share/man/man1/kerry.1
- rm -rf debian/kerry-trinity/usr/share/man
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kgtk-qt3/debian/rules b/ubuntu/_base/applications/kgtk-qt3/debian/rules
index 8e3edaf95..877cefbb8 100755
--- a/ubuntu/_base/applications/kgtk-qt3/debian/rules
+++ b/ubuntu/_base/applications/kgtk-qt3/debian/rules
@@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
binary-install/kgtk-qt3-trinity::
mkdir -p $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/
cp -Rp $(CURDIR)/debian/preload $(CURDIR)/debian/kgtk-qt3-trinity/opt/trinity/share/kgtk/
diff --git a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kima/debian/control b/ubuntu/_base/applications/kima/debian/control
index 22547bcd7..eb5bcef62 100644
--- a/ubuntu/_base/applications/kima/debian/control
+++ b/ubuntu/_base/applications/kima/debian/control
@@ -2,7 +2,8 @@ Source: kima-trinity
Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libxnvctrl-dev | nvidia-settings
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev,
+ libxnvctrl-dev [amd64 i386] | nvidia-settings [amd64 i386]
Standards-Version: 3.8.4
Package: kima-trinity
diff --git a/ubuntu/_base/applications/kima/debian/rules b/ubuntu/_base/applications/kima/debian/rules
index cee2a3058..5598f7f9f 100755
--- a/ubuntu/_base/applications/kima/debian/rules
+++ b/ubuntu/_base/applications/kima/debian/rules
@@ -7,6 +7,8 @@ include debian/cdbs/debian-tde.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+WITH_NVCONTROL = $(if $(filter $(DEB_HOST_ARCH_CPU),amd64 i386),ON,OFF)
+
DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \
@@ -16,4 +18,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
- -DWITH_ALL_OPTIONS="ON"
+ -DWITH_ALL_OPTIONS="ON" \
+ -DWITH_NVCONTROL="$(WITH_NVCONTROL)"
diff --git a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/rules b/ubuntu/_base/applications/knetworkmanager8/debian/rules
index 7c153216e..1b87e9c65 100755
--- a/ubuntu/_base/applications/knetworkmanager8/debian/rules
+++ b/ubuntu/_base/applications/knetworkmanager8/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
-
+
+# Currently is not possible to build piklab with --enable-final
+DEB_BUILD_OPTIONS += noopt
+
include /usr/share/cdbs/1/rules/debhelper.mk
include debian/cdbs/debian-tde.mk
@@ -17,39 +20,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --with-openvpn --with-vpnc --with-pptp
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
binary-install/network-manager-kde-trinity::
# Install autostart file
install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
mv debian/network-manager-kde-trinity/usr/share/man debian/network-manager-kde-trinity/opt/trinity/share/
-
-clean::
- find . -name Makefile.in | xargs rm -f
- rm -f aclocal.m4
- rm -f acinclude.m4
- rm -f configure
- rm -f configure.files
- rm -f configure.in
- rm -f config.h.in
- rm -f stamp-h.in
- rm -f subdirs
- rm -f admin/ltmain.sh
- rm -f admin/libtool.m4.in
- rm -f debian/stamp-bootstrap
diff --git a/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kpowersave/debian/kpowersave.1 b/ubuntu/_base/applications/kpowersave/debian/kpowersave.1
deleted file mode 100644
index 1f816da69..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/kpowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
-.SH NAME
-kpowersave
-\- A TDE KPart Application
-.SH SYNOPSIS
-kpowersave [Qt\-options] [TDE\-options]
-.SH DESCRIPTION
-A TDE KPart Application
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/kpowersave/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/kpowersave/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Danny Kukawka <dkukawka@suse.de>
-.br
-Thomas Renninger <trenn@suse.de>
-.br
-
diff --git a/ubuntu/_base/applications/kpowersave/debian/manpages b/ubuntu/_base/applications/kpowersave/debian/manpages
deleted file mode 100644
index c8fa7b85f..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/kpowersave.1
diff --git a/ubuntu/_base/applications/kpowersave/debian/rules b/ubuntu/_base/applications/kpowersave/debian/rules
index 0acb64152..1273679da 100755
--- a/ubuntu/_base/applications/kpowersave/debian/rules
+++ b/ubuntu/_base/applications/kpowersave/debian/rules
@@ -28,40 +28,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DBUILD_ALL="ON" \
-DWITH_GCC_VISIBILITY="ON"
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
-
install/kpowersave-trinity::
install -p -D -m644 debian/$(cdbs_curpkg).lintian debian/kpowersave/usr/share/lintian/overrides/$(cdbs_curpkg)
install -p -D -m644 debian/$(cdbs_curpkg).linda debian/kpowersave/usr/share/linda/overrides/$(cdbs_curpkg)
-
-binary-install/kpowersave-trinity::
- mv debian/kpowersave-trinity/usr/share/man debian/kpowersave-trinity/opt/trinity/share/
-
-clean::
- find . -name Makefile.in | xargs rm -f
- rm -f acinclude.m4
- rm -f aclocal.m4
- rm -f configure
- rm -f configure.files
- rm -f configure.in
- rm -f config.h.in
- rm -f stamp-h.in
- rm -f subdirs
- rm -f admin/ltmain.sh
- rm -f admin/libtool.m4.in
- rm -f debian/stamp-bootstrap
diff --git a/ubuntu/_base/applications/kpowersave/debian/watch b/ubuntu/_base/applications/kpowersave/debian/watch
deleted file mode 100644
index 832285e63..000000000
--- a/ubuntu/_base/applications/kpowersave/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/powersave/kpowersave-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/rosegarden/debian/rules b/ubuntu/_base/applications/rosegarden/debian/rules
index 47e0616c9..6e3b7df21 100755
--- a/ubuntu/_base/applications/rosegarden/debian/rules
+++ b/ubuntu/_base/applications/rosegarden/debian/rules
@@ -30,10 +30,6 @@ DEB_COMPRESS_EXCLUDE += .rg .wav .docbook
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
binary-install/rosegarden-trinity::
dh_testdir
find debian/rosegarden-trinity/usr/share/doc/rosegarden-trinity/examples -type f -exec chmod 664 {} \;
diff --git a/ubuntu/_base/applications/smartcardauth/debian/control b/ubuntu/_base/applications/smartcardauth/debian/control
index 0e7a8c574..be0ac51ac 100644
--- a/ubuntu/_base/applications/smartcardauth/debian/control
+++ b/ubuntu/_base/applications/smartcardauth/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: extra
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), cdbs, libpcsclite1, libpcsc-perl, libpar-packer-perl, libdb-dev (>= 4.7), libpam0g-dev, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev, libkrb5-dev, libtqtinterface-dev
+Build-Depends: debhelper (>= 7.0.50~), cdbs, quilt, cmake, libpkcs11-helper1-dev, libgnutls-dev | libgnutls28-dev | libgnutls30-dev
Standards-Version: 3.8.4
Package: smartcardauth
diff --git a/ubuntu/_base/applications/smartcardauth/debian/rules b/ubuntu/_base/applications/smartcardauth/debian/rules
index fb1fa68e3..b51d7e7ba 100755
--- a/ubuntu/_base/applications/smartcardauth/debian/rules
+++ b/ubuntu/_base/applications/smartcardauth/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
+
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
DEB_BUILD_OPTIONS := nostrip
export DEB_BUILD_OPTIONS = debug nostrip
@@ -14,3 +15,13 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
DEB_DH_SHLIBDEPS_ARGS_ALL=--dpkg-shlibdeps-params=--ignore-missing-info
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/tde-guidance/debian/rules
index 656eac6d4..b4a195a5c 100644..100755
--- a/ubuntu/_base/applications/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/tde-guidance/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tde-style-qtcurve/debian/rules b/ubuntu/_base/applications/tde-style-qtcurve/debian/rules
index 122d7896f..9b96d4f85 100755
--- a/ubuntu/_base/applications/tde-style-qtcurve/debian/rules
+++ b/ubuntu/_base/applications/tde-style-qtcurve/debian/rules
@@ -26,7 +26,3 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
diff --git a/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdedocker/debian/rules b/ubuntu/_base/applications/tdedocker/debian/rules
index 74d475e75..eb2a2e4b5 100755
--- a/ubuntu/_base/applications/tdedocker/debian/rules
+++ b/ubuntu/_base/applications/tdedocker/debian/rules
@@ -14,9 +14,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON"
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
diff --git a/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdeio-ftps/debian/rules b/ubuntu/_base/applications/tdeio-ftps/debian/rules
index 1b2078eae..18aa16b96 100755
--- a/ubuntu/_base/applications/tdeio-ftps/debian/rules
+++ b/ubuntu/_base/applications/tdeio-ftps/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdeio-gopher/debian/rules b/ubuntu/_base/applications/tdeio-gopher/debian/rules
index 86cca3700..ec689af11 100755
--- a/ubuntu/_base/applications/tdeio-gopher/debian/rules
+++ b/ubuntu/_base/applications/tdeio-gopher/debian/rules
@@ -23,8 +23,4 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_INSTALL_DOCS_tdeio-gopher-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdeio-locate/debian/rules b/ubuntu/_base/applications/tdeio-locate/debian/rules
index 855a20a5b..0f27aed49 100755
--- a/ubuntu/_base/applications/tdeio-locate/debian/rules
+++ b/ubuntu/_base/applications/tdeio-locate/debian/rules
@@ -23,8 +23,4 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_INSTALL_DOCS_tdeio-locate-trinity := -XREADME -XNEWS -XTODO -XAUTHORS
diff --git a/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdepowersave/debian/manpages b/ubuntu/_base/applications/tdepowersave/debian/manpages
deleted file mode 100644
index aff0f8470..000000000
--- a/ubuntu/_base/applications/tdepowersave/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tdepowersave.1
diff --git a/ubuntu/_base/applications/tdepowersave/debian/rules b/ubuntu/_base/applications/tdepowersave/debian/rules
index f3d74f11a..8c39e239d 100755
--- a/ubuntu/_base/applications/tdepowersave/debian/rules
+++ b/ubuntu/_base/applications/tdepowersave/debian/rules
@@ -28,39 +28,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DBUILD_ALL="ON" \
-DWITH_GCC_VISIBILITY="ON"
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifndef _cdbs_class_cmake
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
-endif
- touch debian/stamp-bootstrap
-
install/tdepowersave-trinity::
install -p -D -m644 debian/tdepowersave-trinity.lintian debian/tdepowersave-trinity/usr/share/lintian/overrides/tdepowersave-trinity
install -p -D -m644 debian/tdepowersave-trinity.linda debian/tdepowersave-trinity/usr/share/linda/overrides/tdepowersave-trinity
-
-clean::
- find . -name Makefile.in | xargs rm -f
- rm -f acinclude.m4
- rm -f aclocal.m4
- rm -f configure
- rm -f configure.files
- rm -f configure.in
- rm -f config.h.in
- rm -f stamp-h.in
- rm -f subdirs
- rm -f admin/ltmain.sh
- rm -f admin/libtool.m4.in
- rm -f debian/stamp-bootstrap
diff --git a/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.1 b/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.1
deleted file mode 100644
index d79cfd21d..000000000
--- a/ubuntu/_base/applications/tdepowersave/debian/tdepowersave.1
+++ /dev/null
@@ -1,148 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH TDEPOWERSAVE 1 "Sep 2005" "Trinity Desktop Environment" "A TDE KPart Application"
-.SH NAME
-tdepowersave
-\- A TDE KPart Application
-.SH SYNOPSIS
-tdepowersave [Qt\-options] [TDE\-options]
-.SH DESCRIPTION
-A TDE KPart Application
-.SH OPTIONS
-.SS Generic options:
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.TP
-.B \-\-
-End of options
-.SS
-.SS TDE options:
-.TP
-.B \-\-caption <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B \-\-icon <icon>
-Use 'icon' as the application icon
-.TP
-.B \-\-miniicon <icon>
-Use 'icon' as the icon in the titlebar
-.TP
-.B \-\-config <filename>
-Use alternative configuration file
-.TP
-.B \-\-dcopserver <server>
-Use the DCOP Server specified by 'server'
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager
-.TP
-.B \-\-style <style>
-sets the application GUI style
-.TP
-.B \-\-geometry <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.TP
-.B \-\-nofork
-Don't run in the background.
-.SS Qt options:
-.TP
-.B \-\-display <displayname>
-Use the X-server display 'displayname'
-.TP
-.B \-\-session <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B \-\-cmap
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B \-\-ncols <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B \-\-nograb
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B \-\-dograb
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B \-\-sync
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn, \-\-font <fontname>
-defines the application font
-.TP
-.B \-\-bg, \-\-background <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg, \-\-foreground <color>
-sets the default foreground color
-.TP
-.B \-\-btn, \-\-button <color>
-sets the default button color
-.TP
-.B \-\-name <name>
-sets the application name
-.TP
-.B \-\-title <title>
-sets the application title (caption)
-.TP
-.B \-\-visual TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B \-\-inputstyle <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B \-\-im <XIM server>
-set XIM server
-.TP
-.B \-\-noxim
-disable XIM
-.TP
-.B \-\-reverse
-mirrors the whole layout of widgets
-.SS
-
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Center. You can also enter the URL
-.BR help:/tdepowersave/
-directly into konqueror or you can run
-.BR "`khelpcenter help:/tdepowersave/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-Danny Kukawka <dkukawka@suse.de>
-.br
-Thomas Renninger <trenn@suse.de>
-.br
-
diff --git a/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tdesvn/debian/rules b/ubuntu/_base/applications/tdesvn/debian/rules
index edc3001cb..b142b22ec 100755
--- a/ubuntu/_base/applications/tdesvn/debian/rules
+++ b/ubuntu/_base/applications/tdesvn/debian/rules
@@ -23,10 +23,6 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
binary-install/tdesvn-trinity::
# remove libsvnqt.so* from tdesvn-trinity - are included in libsvnqt4-trinity
rm debian/$(cdbs_curpkg)/opt/trinity/lib*/libsvnqt.so*
diff --git a/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/wlassistant/debian/rules b/ubuntu/_base/applications/wlassistant/debian/rules
index 160785a54..1102d407d 100755
--- a/ubuntu/_base/applications/wlassistant/debian/rules
+++ b/ubuntu/_base/applications/wlassistant/debian/rules
@@ -22,7 +22,3 @@ DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
-
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
diff --git a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/applications/yakuake/debian/rules b/ubuntu/_base/applications/yakuake/debian/rules
index 1b2078eae..18aa16b96 100755
--- a/ubuntu/_base/applications/yakuake/debian/rules
+++ b/ubuntu/_base/applications/yakuake/debian/rules
@@ -4,10 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include debian/cdbs/debian-tde.mk
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
diff --git a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/dependencies/arts/debian/rules b/ubuntu/_base/dependencies/arts/debian/rules
index 7f5debe08..c3167d04f 100755
--- a/ubuntu/_base/dependencies/arts/debian/rules
+++ b/ubuntu/_base/dependencies/arts/debian/rules
@@ -15,10 +15,6 @@ include debian/cdbs/debian-tde.mk
DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -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/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
diff --git a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/dependencies/libr/debian/rules b/ubuntu/_base/dependencies/libr/debian/rules
index 1b6b94b3e..5d37a7e50 100755
--- a/ubuntu/_base/dependencies/libr/debian/rules
+++ b/ubuntu/_base/dependencies/libr/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_BUILD_PARALLEL = true
+DEB_BUILD_PARALLEL ?= true
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
diff --git a/ubuntu/_base/dependencies/qt3/debian/README.Debian b/ubuntu/_base/dependencies/qt3/debian/README.Debian
deleted file mode 100644
index afdde2610..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/README.Debian
+++ /dev/null
@@ -1,277 +0,0 @@
-Qt for Debian README
---------------------
-
-1. Preface
-
-This README is intended to give developers and users exact information
-about how the qt-x11-free package provided by TrollTech AS has been packaged
-for Debian in case you either want to faciliate it for development
-of applications and libraries or plugins using the Qt class library. With
-qt-x11-3.1.1, the Debian packages have been massively restructured to get
-the most out of theoriginal Qt package and spit the contents up into
-several packages so that they make the most sensefor several groups of
-users; developers, application users, translators of Qt-based
-applications and Debian packagers who are packaging applications developed
-with Qt.2.
-
-2. General Overview
-
-As Qt is a huge package that contains a complete environment for
-developers, it needs to be split up into several packages that make it
-easier for everyone else to handle it and not to require
-unnecessary disk space for end-users. Additionally, Qt can be configured
-in several ways - and therefore also used in several ways. Qt development
-usually requires the environment variable QTDIR. As Debian is placing
-libraries and header files in a quite specific filesystem order, this
-usually breaks setting a single environment variable to meet the
-requirements of packages. Therefore, symlinks are used to set up the system
-to meet both, the Debian filesystem standard and the QTDIR variable. All of
-Qt (so the QTDIR path) is available in /usr/share/qt3. If you need to set
-QTDIR, do export QTDIR=/usr/share/qt3
-
-As far as the common build configuration goes, we note explicitely that the
-Debian package of Qt will in very rare cases break the compilation (most
-likely the linking) of applications on Debian which use Qt, in particular
-utilizing styles in an incorrect way by deriving from one of the styles
-that ship with Qt. In case you are a Debian packager and encounter
-problems, contact Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org).
-We will tell you why things don't work and what you should communicate on
-with the programmers of your application that you are packaging. The build
-configuration generally is intended to provide a Qt version that is as
-small as possible in terms of the memory size it requires. Therefore,
-everything inside Qt that can be compiled as plugins has been compiled that
-way. This includes:
-
-- imageformats: jpeg and mng - codecs (for languages like arab, japanese
- etc provided with Qt)
-- sql drivers for databases (MySQL, ODBC and PostgreSQL)
-
-The only exception is the imageformat png which has been compiled built-in
-due to the fact that there is literally no program that uses no icons at
-all and icons are to be used preferrably in png format. The plugins are all
-located under /usr/lib/qt3/plugins. This is also the install location you
-should choose as a package maintainer for
-qt-plugins so the user doesn't have to customize his library path for
-loading Qt plugins. The only exception is that KDE delivers a set of Qt
-plugins as well (mainly styles and designer plugins); those are placed in
-/usr/lib/trinity/plugins.
-
-QMotif Extension: As this code is only available in commercial environments
-(and produces a static library libqmotif.a anyway that those commercial
-applications have to be linked against in addition to Qt), we left out all
-header files of the libqt3-headers package that are belonging to this
-QMotif extension.
-
-Oracle Database driver, Sybase & Microsoft SQL Server driver: Those drivers
-are only available in a commercial version of Qt due to license
-incompatibilities with the GPL. If you need to faciliate those drivers,
-please visit http://www.trolltech.com and have a read at
-http://doc.trolltech.com/3.0/sql-driver.html.
-
-3. Packages (End-User)
-
-The Qt built has been split up into several packages that allow for easy
-installation for all types of users. The End-user usually only requires to
-have the following packages installed to run an application that links
-against Qt:
-
-Threaded version:libqt3-mt (the library libqt-mt.so.* and libqui.so.* for
-loading designer-made user interfaces at runtime).
-
-Optionally depending on the program's requirements:
-
-libqt3-mt-odbc
-libqt3-mt-mysql
-libqt3-mt-psql
-
-In addition to the libraries, it may make sense to install the program
-qtconfig to customize the look and behaviorof Qt programs. If you have KDE
-installed, the KDE control center will take this task automatically in most
-cases. qtconfig is available in the package qt3-qtconfig.
-
-Also, Qt programs can make use of the online-help tool that ships with Qt,
-the Qt Assistant. The Assistant can be installed with the package
-qt3-assistant.
-
-Qt Configuration files
-----------------------
-Qt programs most often use QSettings to store their information in configuration
-files. With Qt 3.2, the new option --sysconfdir has been introduced that allows
-us to use /etc/qt3 as the system-wide location where qt-program specific global
-configuration files can go. If you're a programmer that wants to get familiar with
-that, please look at the examples, documentation and the code in designer or
-assistant as well as qtconfig.
-
-4. Packages (Package maintainers)
-
-In addition to the library, a package maintainer will require an additional
-set of packages to compile a package that requires Qt. Depending on the
-version of the qt library, you will require a different set of packages;
-the most common option should be to make your application link against the
-multi-threaded version (-mt).Packages necessary for compiling Qt
-applications from source:
-
-libqt3-mt-dev (use libqt3-dev for linking against -lqt, this package only
- contains the .so files and the header file for libqui.so)
-
-libqt3-headers (header files for libqt and libqt-mt)
-
-qt3-dev-tools (this package contains the tools uic and moc as well as
-qmake, required for building Qt applications)
-
-If, however, you encounter an older program not to compile with this set
-read the FAQ at the end of this document.
-
-5. Packages (Developers)
-
-In addition to the packages that packagers require, a developer usually
-will require the Qt API documentationas well as tools like the assistant,
-linguist or designer. However, you should be fine with installing the API
-documentation that you can browse with a webbrowser, optionally with the
-assistant. They are available in /usr/share/doc/qt3-doc/html.
-For a regular development environment, install qt3-designer and qt3-doc.
-
-For faciliating Qt's extended environment to write plugins for the Qt
-Designer or extend the Designer as well as utilizing the Qt Assistant by
-calling it from within your program, install qt3-apps-dev, which contains
-the static libraries and header files required for this functionality.
-
-For Embedded Developers, the program qvfb (Qt Virtual Frambuffer) and
-makeqpf (embedded fonts tool)have been packaged into
-qt3-dev-tools-embedded. For developers that work on migrating their program
-from any Qt version prior to Qt 3.x to the Qt 3.x platform you will find
-additional tools in the qt3-dev-tools-compat.
-
-For using the QTranslator class and where to find the qm-file for qt as
-well as where to place your translations,see the next section.
-
-If your program doesn't compile with those settings in case you have
-started your project with Qt 1.x or 2.x, please read the FAQ section at the
-end of this document.
-
-5. Packages (Translators)
-
-In order to translate a Qt program into any other language, the Qt 3 way to
-do this is to let the developer create a ts-file containing the strings
-that the program exposes on the user interface. The tools to create the
-ts-file and to create the final qm (Q-message binary) file, lupdate and
-lrelease, are included in qt3-dev-tools.The single translator that only
-gets provided the ts file and has to return a translated ts file, it
-is absolutely enough to install qt3-linguist; the package qt3-assistant can
-be installed to access the online-help for the Qt Linguist itself.
-In case you're converting an application using Qt prior to Qt 3, you may
-want to uitilize the qt3-dev-tools-compat which include the necessary tools
-to convert older qm files to the new ts file standard.
-
-Locations of message translations:
-
-Qt ships with a set of translations for the strings used inside Qt. Those
-translations will be installed into /usr/share/qt3/translations (qm files
-only), which equals $QTDIR/translations respectively
-qInstallPath() + QString( "/translations" ).
-
-The configure option --translationdir has been set to /usr/share/qt3/translations
-accordingly since it was introduced in Qt 3.2.
-
-To correctly enable your program to display the translations to the Qt
-library and to load the translation of the program itself, we currently
-suggest to either install your translations along with any other data files
-into/usr/share/<appname>/, translation files into the subdirectory
-translations (that is /usr/share/<appname>/translations) The code that your
-application should use to load the Qt translation will have to look like
-the following:
-
-int main( int argc, char **argv )
- {
- QApplication app( argc, argv );
-
- // translation file for Qt
- QTranslator qt( 0 );
- qt.load( QString( "qt_" ) + QTextCodec::locale(), qInstallPath() +
- QString( "/translations" );
- app.installTranslator( &qt );
-
- // translation file for application strings
- QTranslator myapp( 0 );
- myapp.load( QString( "myapp_" ) + QTextCodec::locale(), "." );
- // use a substitue for $prefix/share/appname/translations here
- app.installTranslator( &myapp );
-
-6. Frequently Asked Questions
-
-Using Qt for Debian as a developer or packager
-----------------------------------------------
-
-Q: I want to compile a source package that utilizes qmake to build the
-Makefiles. What do I need to do to makeit work ?
-
-A: qmake requires two environment variables to be set, QTDIR and QMAKESPEC.
-To make it work, do
-export QTDIR=/usr/share/qt3
-export QMAKESPEC=linux-g++
-
-Then run qmake -o Makefile <projectfile>.pro
-
-After that, the Makefile is correctly created to build your application on
-Debian. As a packager, export thosetwo variables in the rules file before
-calling qmake.
-
-Q: I have an application that when linking gives me symbol referencing
-errors to Q*Style. Why does my applicationnot link correctly ?
-
-A: The author of the program is using the styles that ship with Qt directly
-instead of using the QStylePlugin interface.If you are the author of the
-program, change your program to use QStylePlugin. If you are a packager,
-write to theauthor of the program that he is assuming that the styles
-shipped with Qt are built-in to the library which is not the case on Debian
-and that he please should fix this and use QStylePlugin.
-
-Q: Where are all the examples and tutorials ? And how do I build them ?
-
-A: Qt ships with examples and tutorials; so does the Linguist and Designer.
-The tutorials and examples are compressed tarballs which you can unpack with
-tar -zxvf into your home directory. Change into the qt3-examples directory
-and run the provided ./build-examples script. All Qt examples and tutorials,
-including those for designer and the linguist, will be compiled. You will
-notice however, that those examples that inherit from style classes which
-are not built-in into Qt but configured as a plugin will not compile due
-to the fact that they can't link to the Qt library.
-
-Q: I'm writing a pure Qt application and I want to ship it with a default
-configuration file. Where does that global configuration file go if I make
-use of the QSettings class ?
-
-A: With qt-3.2.0, Trolltech has introduced a configure option to Qt called
---sysconfdir which we intentionally set to /etc/qt3 similar to /etc/trinity for
-KDE programs. Install your application's system wide configuration file
-to /etc/qt3.
-
-Q: I'm compiling a program and I have a compile error due to a missing
-include. Why isn't that include not present in the Debian packages anymore
-? It compiled with older versions of Debian packages of Qt !
-
-A: This may be due to two reasons: either the package still uses the old
-includes from Qt 1.x or 2.x that got basically renamed by Trolltech due to
-the naming convention. The filenames are now all following the scheme
-
-ClassName -> classname.h.
-
-Therefore, if you are the developer of the affected program, change your
-sources according to this scheme. Qt ships with qtrename140, a tool
-to help developers migrate their API to the Qt 3 version,
-which can help you in the transition upgrade to Qt 3.
-
-If you are affected by this as a packager, notify upstream to fix those
-problems and in the meanwhile use libqt3-compat-headers as a build
-dependency which includes the compatibility headers that just include the
-right files from the new API again.
-
-Q: I have a question not covered by this FAQ and README file. Who should I
-turn to ?
-
-A: Please turn to Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org)
-for any questions regarding Qt on Debian.
-
- -- Ralf Nolden <nolden@kde.org> Sun, 26 Jan 2003 20:39:19 +0100
- -- Ralf Nolden <nolden@kde.org> Mon, 1 Sep 2003 19:24:16 +0200
- -- Modestas Vainius <modestas@vainius.eu> Fri, 22 Feb 2008 01:40:06 +0200
diff --git a/ubuntu/_base/dependencies/qt3/debian/changelog b/ubuntu/_base/dependencies/qt3/debian/changelog
deleted file mode 100644
index 8c265b2d1..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/changelog
+++ /dev/null
@@ -1,2664 +0,0 @@
-qt-x11-free (3:3.3.8-d-0ubuntu0) maverick; urgency=low
-
- * Upload of 3.3.8d (working revision) from GIT
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Fri, 22 Jul 2011 16:40:00 -0600
-
-qt-x11-free (3:3.3.8-c-0ubuntu0) maverick; urgency=low
-
- * Patch to 3.3.8c
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Wed, 09 Mar 2011 16:12:00 -0600
-
-qt-x11-free (3:3.3.8-b-6ubuntu2) lucid; urgency=low
-
- * Fix locations in libqt3-mt.install file
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 09 Nov 2009 17:26:38 +0000
-
-qt-x11-free (3:3.3.8-b-6ubuntu1) lucid; urgency=low
-
- * Merge with Debian, remaining changes:
- - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen.
- Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686
- - Add kubuntu_09_flickerfree_qiconview.dpatch to add
- double-buffering for the icon redraw - prevents flicker on window
- redrawing (LP: #209227)
- - No firebird/ibase build (remove build-dep, control entry, ibase
- ./configure option), firebird is not in Ubuntu main
- - Add debian/qt_plugins_3.3rc and debian/qtrc to set default style to plastique, edit libqt3-mt.install to install them
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 09 Nov 2009 14:37:51 +0000
-
-qt-x11-free (3:3.3.8b-6) unstable; urgency=low
-
- +++ Changes by Fathi Boudra:
-
- * Add firebird2-dev as alternative build-dependency for backports.
- (Closes: #475251)
- * Replace old libcupsys2-dev names by libcups2-dev in Build-Depends and
- Depends. Thanks to Martin-Éric Racine. (Closes: #529965).
- * Add missing build-dependency on cpio. (Closes: #536848)
-
- +++ Changes by Modestas Vainius:
-
- * Build depend on libmysqlclient-dev only. It is a virtual package in Lenny.
-
- +++ Changes by Sune Vuorela:
-
- * Add debian/patches/71_sparc_only_-O1.diff and use linux-g++-sparc:
- - Build with -O1 on sparc as something is broken here. (Closes: #490999)
- * Fix parallel build. Thanks Robert Millan. (Closes: 475333)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 26 Aug 2009 12:50:18 +0300
-
-qt-x11-free (3:3.3.8-b-5ubuntu3) karmic; urgency=low
-
- * Build-depend on cpio (LP: #445582).
-
- -- Colin Watson <cjwatson@ubuntu.com> Wed, 07 Oct 2009 18:00:08 +0100
-
-qt-x11-free (3:3.3.8-b-5ubuntu2) karmic; urgency=low
-
- * Build against mysql 5.1
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 19 Aug 2009 21:22:20 +0100
-
-qt-x11-free (3:3.3.8-b-5ubuntu1) intrepid; urgency=low
-
- * Merge with Debian, remaining changes:
- - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen.
- Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686
- - Add kubuntu_09_flickerfree_qiconview.dpatch to add
- double-buffering for the icon redraw - prevents flicker on window
- redrawing (LP: #209227)
- - No firebird/ibase build (remove build-dep, control entry, ibase
- ./configure option), firebird is not in Ubuntu main
- - install qtrc and qt_plugins_3.3rc
- - add /etc/ to libqt3-mt
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 02 May 2008 11:30:32 +0100
-
-qt-x11-free (3:3.3.8b-5) unstable; urgency=medium
-
- +++ Changes by Modestas Vainius:
-
- * The previous implemention of the hack was still incomplete solution for
- restoration of [fl]?stat64 symbols on libqt-mt.so.3 compiled with -O2
- against glibc << 2.7. In such a case, [fl]?stat64 were still inlined and
- not exported. Therefore, the hack implementation was extended to cover the
- latter case as a well and as result it should be fully compatible with
- m68k/unstable and backports.
- * Cleanup README.Debian: remove old information about non-threaded version
- of Qt3 and substitude contacts of previous maintainers with
- Debian Qt/KDE Maintainers (debian-qt-kde@lists.debian.org).
- * Drop 61_fcfontmatch_fontwidth_fix.diff patch. A bit different fix was
- applied upstream.
- * Add 61_eastern_asian_languagues.diff to fix font substitution for Eastern
- Asian languages under other locales (Closes: #468430).
- * Set urgency to medium because this revision fixes 3.3.8 regressions from
- 3.3.7 and 3.3.8 has already entered testing.
-
- +++ Changes by Fathi Boudra:
-
- * Suggest qt3-apps-dev to qt3-examples. Thanks to Matthew Rosewarne.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Mon, 10 Mar 2008 17:10:24 +0200
-
-qt-x11-free (3:3.3.8b-4) unstable; urgency=low
-
- +++ Changes by Modestas Vainius:
-
- * Make 01_export_stat64_symbols.diff hack glibc >=2.7 dependant instead of
- build depending on libc6-dev (>=2.7-1) and its other incarnations. This
- will restore Qt3 backports friendliness. Thanks to Pierre Habouzit for
- this idea.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 21 Feb 2008 12:59:07 +0200
-
-qt-x11-free (3:3.3.8b-3) unstable; urgency=low
-
- * The "Optimized Qt3" release.
-
- ++ Changes by Modestas Vainius:
-
- * Add 00_qmake_debian_compliant_release_target.diff patch to make 'qmake'
- release target debian policy compliant:
- - Use C(XX)FLAGS=-02 -g
- - Prevent qmake from striping binaries. Debian has dh_strip for that.
- - Patch configure script to build qmake itself with 'release'
- configuration too.
- * Build Qt3 using "release" build configuration.
- * Remove 01_stat_extern_inline_hack.diff and use different way of exporting
- [fl]?stat64 symbols because previous way is ineffective with -O2. Add
- 01_export_stat64_symbols.diff patch for that.
- * The hack above depends on libc6-dev (>= 2.7-1). Adjust Build-Depends.
- * Add 73_configure_quilt_compat.diff patch to make ./configure script ignore
- "project files" under quilt temporary directory (./.pc/). I think that
- this problem was the cause of FTBFS on alpha & mips since *.pro files
- under .pc had to be `found` last in order for ./configure to succeed.
- Probably, this condition was not met on alpha & mips, but it was met on
- other arches.
- * Add myself to uploaders.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 21 Feb 2008 01:13:16 +0200
-
-qt-x11-free (3:3.3.8b-2) unstable; urgency=medium
-
- * Re-add *stat64 symbols to Qt3 using 01_stat_extern_inline_hack patch:
-
- * the extern inlines from sys/stat.h are just gone, and that's just normal
- in fact.
- * /usr/lib/libc.so is a linker script that pulls /lib/libc-2.7.so _and_
- /usr/lib/libc_nonshared.a.
- * the latter defines stat64 and friends as weak-symbols and alises to
- __xstat64 and friends.
-
- That's how when you link something that uses fstat64 it finds the symbol at
- link time, letting you the possibility to override it with your own
- implementation.
-
- The fact that the extern inlines were used at some point in the past _was_
- a bug, and let qt3 divert those, which should have not happened in the
- first place. Sadly, when you link against qt3, it picks those symbols
- because it will always prefer symbols from a shared lib than from the .a
- IIRC, or it's due to the link order, anyways, it's not relevant.
-
- Thanks to Pierre Habouzit and Modestas Vainius. (Closes: #465028)
-
- -- Fathi Boudra <fabo@debian.org> Sat, 16 Feb 2008 16:02:03 +0100
-
-qt-x11-free (3:3.3.8b-1) unstable; urgency=low
-
- * New upstream release:
- * This version adds the GNU Public License version 3 as a
- possible choice for licenses to the Open Source releases of Qt 3.
- * It includes the patch for CVE-2007-3388, a potential vulnerability in
- QTextEdit, which might cause remote execution when parsing maliciously
- crafted text from an unknown source.
-
- * Fix desktop files:
- * Add semicolon at the end of the MimeType key. Thanks to Pino Toscano.
- * Remove deprecated MapNotify key.
- * Bump compat/debhelper to 6.
- * Add myself in Uploaders field.
- * Switch to quilt patch system.
- * Add Homepage, Vcs-Browser and Vcs-Svn fields.
- * Update copyright file. Add the GNU GPL 3 as a possible choice of licenses.
- (Closes: #464613)
- * Update libqt3-mt* links.
- * Update rules: install upstream changelog changes-3.3.8 and changes-3.3.8b.
- * Refresh patches. (Closes: #441580)
- * Remove patches:
- * 30_qtc_arabic_font_fixes.dpatch
- * 49_immodule_inputcontext_fix.dpatch
- * 62_bengali_charfix.dpatch
- * 64_utf8-parsing-vulnerability.dpatch
- * 69_CVE-2007-3388.dpatch
- * Add patches:
- * lubos lunak xinerama patch. It adds _net_wm_full_placement support.
- * xinerama dialog placement fix.
- * Use qt-copy patches original name. Don't use "xx_qtc_patch_name" scheme.
- * Replace deprecated Source-Version by binary:Version.
- * Update menu files to latest Debian menu policy.
- * Install translations files with 644 permissions.
-
- -- Fathi Boudra <fabo@debian.org> Fri, 08 Feb 2008 11:01:58 +0100
-
-qt-x11-free (3:3.3.8-b-0ubuntu3) hardy; urgency=low
-
- * Add 61_eastern_asian_languagues.diff from Debian,
- closes LP: #94282
- "Qt program doesn't select Chinese font correctly"
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Wed, 09 Apr 2008 16:56:29 +0100
-
-qt-x11-free (3:3.3.8-b-0ubuntu2) hardy; urgency=low
-
- * Add debian/patches/kubuntu_09_flickerfree_qiconview.dpatch to add
- double-buffering for the icon redraw - prevents flicker on window
- redrawing (LP: #209227)
-
- -- Scott Kitterman <scott@kitterman.com> Tue, 08 Apr 2008 09:24:36 -0400
-
-qt-x11-free (3:3.3.8-b-0ubuntu1) hardy; urgency=low
-
- * New upstream release with GPL 3 licence
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 21 Jan 2008 10:50:42 +0000
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu13) hardy; urgency=low
-
- * Remove kubuntu_05_gcc_hidden_visibility.dpatch, it breaks typing
- composite keys.
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 16 Nov 2007 11:40:40 +0000
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu12) hardy; urgency=low
-
- * Merge with Debian, remaining changes:
- - No firebird/ibase build (remove build-dep, control entry, ibase ./configure option), firebird is not in Ubuntu main
- - install qtrc (change rules, qtrc file) and qt_plugins_3.3rc
- - add /etc/ to libqt3-mt
- - Add kubuntu_04_xinerama.dpatch from http://ktown.kde.org/~seli/xinerama/
- - Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen.
- Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686
- - Add kubuntu_07_font_default_subst.dpatch from Dirk Muller,
- should fix rendering of CKJ and other characters
- * Add kubuntu_05_gcc_hidden_visibility.dpatch from
- http://bugs.kde.org/attachment.cgi?id=13069&action=view
- on http://bugs.kde.org/109386, I am promised GCC won't break things this time
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 01 Nov 2007 15:59:56 +0000
-
-qt-x11-free (3:3.3.7-9) unstable; urgency=low
-
- * Trust dpkg-architecture better than uname -m for the build key. Make
- mappings to not break current binary compability. Add patch 72 for that.
- Thanks to Bastian Blank for often changing uname -m on his buildds to
- discover this bug.
-
- -- Sune Vuorela <debian@pusling.com> Wed, 26 Sep 2007 21:42:24 +0200
-
-qt-x11-free (3:3.3.7-8) unstable; urgency=low
-
- * Add patch for utf8 parser decoder overflow. CVE-2007-4137
- (Closes: #442780). Thanks to Dirk Mueller for the patch and Stefan Fritsch
- for noticing it.
-
- -- Sune Vuorela <debian@pusling.com> Sun, 16 Sep 2007 23:13:32 +0200
-
-qt-x11-free (3:3.3.7-7) unstable; urgency=low
-
- * Updating Qt3 to build against firebird2. Many thanks to Damyan Ivanov for
- his work on this!
- - Build-Depend on firebird2.0-dev instead of firebird1.5-dev.
- - Add powerpc to firebird-supported architectures.
- - Add patch 70_bad_typecast_amd64 to fix bad typecast in
- src/sql/drivers/ibase/qsql_ibase.cpp causing FTBFS on amd64.
- * Update uploaders.
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org> Thu, 23 Aug 2007 08:25:07 +0200
-
-qt-x11-free (3:3.3.7-6) unstable; urgency=low
-
- * Patch for potential vulnerability in QTextEdit, which might cause remote
- execution when parsing maliciously crafted text from an unknown source.
- CVE-2007-3388
-
- -- Ana Beatriz Guerrero Lopez <ana@debian.org> Tue, 31 Jul 2007 13:34:00 +0200
-
-qt-x11-free (3:3.3.7-5) unstable; urgency=low
-
- +++ Changes by Sune Vuorela:
-
- * Add fix to qbutton.h with gcc-4.2 and higher. (Closes: #409512)
- * Add fix to compile with gcc-4.3 (Closes: 417499). Thanks to Martin
- Michlmayr.
- * Fix designer and assistant desktop files. Thanks Pino.
- * Fix FTBFS with newer firebird. Thanks to Firebird maintainers for breaking
- it. This requires to change -lgds to -lfbclient. (Closes: #427191)
- * Add sparc to firebird archs. Thanks to Damyan Ivanov.
- * Add armel support to qt3. Thanks to Riku Voipu and Lennert Beytenhek.
- (Closes: 408814)
- * Fix typo in some documentation. (Closes: 410968)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 29 May 2007 13:07:33 +0200
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu11.1) gutsy-proposed; urgency=low
-
- * Fix missing config files and wrong /etc/qt3 folder permissions. (LP: #145709)
-
- -- Saïvann Carignan <oxmosys@gmail.com> Tue, 23 Oct 2007 18:02:50 -0400
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu11) gutsy; urgency=low
-
- * SECURITY UPDATE: unterminated UTF8 strings could lead to 2 byte
- overflow that may allow arbitrary code execution.
- * Add debian/patches/kubuntu_20_utf8_2_byte_overflow: upstream fixes.
- * References
- CVE-2007-4137
- http://trolltech.com/company/newsroom/announcements/press.2007-09-03.7564032119
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 01 Oct 2007 22:32:33 +0100
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu10) gutsy; urgency=low
-
- * Fix build failures with g++-4.3. LP: #138645.
-
- -- Matthias Klose <doko@ubuntu.com> Thu, 13 Sep 2007 15:24:47 +0000
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu9) gutsy; urgency=low
-
- * Build interbase support for lpia.
-
- -- Matthias Klose <doko@ubuntu.com> Tue, 07 Aug 2007 17:33:04 +0000
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu8) gutsy; urgency=low
-
- * SECURITY UPDATE: remote execution when parsing vulnerability
- * Format string bugs were found in several Qt warning messages.
- Applications using Qt for processing certain data types could
- trigger them if the data caused Qt to print warnings. The bugs
- potentially allow to execute arbitrary code via specially crafted
- files.
- * Added kubuntu_08_CVE-2007-3387.dpatch from http://www.trolltech.com/developer/download/170529.diff
- sql/qdatatable.cpp
- sql/qsqldatabase.cpp
- sql/qsqlindex.cpp
- sql/qsqlrecord.cpp
- tools/qglobal.cpp
- widgets/qtextedit.cpp
- xml/qsvgdevice.cpp
- Perform better checks when parsing SQL, QTextEdit HTML, SVG XML and qSystemWarning
- * References
- http://trolltech.com/company/newsroom/announcements/press.2007-07-27.7503755960
- CVE-2007-3388
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 02 Aug 2007 14:11:32 +0100
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu7) gutsy; urgency=low
-
- * Fix build failure with GCC-4.2 add kubuntu_08_gcc42_buildfix.dpatch
-
- -- Matthias Klose <doko@ubuntu.com> Sun, 27 May 2007 14:15:47 +0200
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu6) gutsy; urgency=low
-
- * Merge with Debian
- * Add kubuntu_07_font_default_subst.dpatch from Dirk Muller,
- should fix rendering of CKJ and other characters
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 27 Apr 2007 14:47:19 +0100
-
-qt-x11-free (3:3.3.7-4) unstable; urgency=high
-
- * Add patch to fix issue with utf8 parsing.
- * Urgency high due to security fix.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 29 Mar 2007 23:25:24 +0200
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu5) feisty; urgency=low
-
- * SECURITY UPDATE: invalid UTF8 parsing could lead to overflows.
- * Add kubuntu_07_utf8-fix.dpatch: upstream fixes.
- * References
- CVE-2007-0242
-
- -- Kees Cook <kees@ubuntu.com> Mon, 9 Apr 2007 18:22:07 -0700
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu4) feisty; urgency=low
-
- * Add kubuntu_06_fglrx_0_size_screen.dpatch work around fglrx reporting a 0 size screen.
- Closes https://bugs.launchpad.net/ubuntu/+source/qt-x11-free/+bug/81686
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 2 Apr 2007 20:13:18 +0100
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu3) feisty; urgency=low
-
- * Install config files in libqt3-mt
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Fri, 30 Mar 2007 12:32:42 +0100
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu2) feisty; urgency=low
-
- * Use Sans Serif rather then DejaVu Sans in qtrc
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 26 Mar 2007 18:23:21 +0100
-
-qt-x11-free (3:3.3.8really3.3.7-0ubuntu1) feisty; urgency=low
-
- * Revert to Qt 3.3.7. 3.3.8 was not showing a lot of characters
- from CKJ languages.
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 26 Mar 2007 11:41:13 +0100
-
-qt-x11-free (3:3.3.8-0ubuntu2) feisty; urgency=low
-
- * debian/patches/kubuntu_05_mysql_shutdown_fix.dpatch: from Dirk,
- fix mysql to not use postProc for shutdown (LP: #90710).
-
- -- Kees Cook <kees@ubuntu.com> Sat, 17 Mar 2007 01:16:00 -0700
-
-qt-x11-free (3:3.3.8-0ubuntu1) feisty; urgency=low
-
- * New upstream release
- * 25_qtc_qpixmap_mitshm updated from qt-copy
- * 26_qtc_qpixmap_constants updated from qt-copy
- * 30_qtc_arabic_font_fixes removed, applied upstream
- * 45_immodule_unified updated from SuSE
- * 47_immodule_nodebug_fix updated
- * 48_immodule_xim_fix updated
- * 49_immodule_inputcontext_fix removed, applied in 45
- * 61_fcfontmatch_fontwidth_fix updated
- * 62_bengali_charfix removed, applied upstream
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 6 Mar 2007 13:11:10 +0000
-
-qt-x11-free (3:3.3.7-3ubuntu3) feisty; urgency=low
-
- * Removed ibase .configure option, fixes FTBFS for i386 and amd64
-
- -- Anthony Mercatante <tonio@ubuntu.com> Sun, 18 Feb 2007 22:50:21 +0100
-
-qt-x11-free (3:3.3.7-3ubuntu2) feisty; urgency=low
-
- * Removed build-dep firebird2-dev
-
- -- Anthony Mercatante <tonio@ubuntu.com> Sun, 18 Feb 2007 16:59:47 +0100
-
-qt-x11-free (3:3.3.7-3ubuntu1) feisty; urgency=low
-
- * Merged with debian, closing Malone #78209
-
- -- Anthony Mercatante <tonio@ubuntu.com> Sun, 18 Feb 2007 01:33:32 +0100
-
-qt-x11-free (3:3.3.7-3) unstable; urgency=low
-
- +++ Changes by Ana Beatriz Guerrero Lopez:
-
- * Improved debian/copyright.
- * Update Uploaders.
- * Applied patch to avoid qmake segfaulting on GNU/Hurd when no output
- file is specified. Thanks to Michael Banck. (Closes: #399984)
-
- +++ Changes by Sune Vuorela
-
- * Add fix to a bengali char:
- Incorrect rendering of two special symbols (U0982) and (U0983) when
- used after the consonant conjuncts comprising of the alphabet র (U09B0) +
- <any other consonant> + <any dependent vowel>.
- (fix mailed from upstream to distributions)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 12 Jan 2007 18:44:53 +0100
-
-qt-x11-free (3:3.3.7-2) unstable; urgency=medium
-
- +++ Changes by Sune Vuorela:
-
- * Remove extra 's' in package description of qt3-designer. (Closes: #398883)
- * Add gdb to qt3-x11-free-dbg - you can't create backtraces without
-
- +++ Changes by Modestas Vainius:
-
- * debian/patches/61_fcfontmatch_fontwidth_fix.dpatch
- Fix font matching with fontconfig. This resolves inconsistency with
- determining font width (e.g. Dejavu Sans "Condensed" may get selected
- instead of "Book" for Sans Serif font) for default fonts (Sans Serif,
- Serif and Monospace). This bug is very important because it makes
- default KDE fonts look ugly in most cases.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 28 Dec 2006 22:37:21 +0200
-
-qt-x11-free (3:3.3.7-1ubuntu3) feisty; urgency=low
-
- * No-change upload for the libpq4->libpq5 transition.
-
- -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 15 Jan 2007 15:39:57 +0000
-
-qt-x11-free (3:3.3.7-1ubuntu2) feisty; urgency=low
-
- * Remove kubuntu_05_gcc_hidden_visibility.dpatch from 00list
- of patches, it caused pyqt and pytde to hide init methods which
- are needed to load modules and it broke skim.
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Mon, 4 Dec 2006 13:48:56 +0000
-
-qt-x11-free (3:3.3.7-1ubuntu1) feisty; urgency=low
-
- * Merge with Debian
- * Remove kubuntu_02_qt_modules_ia32.dpatch and
- kubuntu_03_qt_private_confdir_ia32.dpatch since openoffice is now
- native on AMD64 we have no ia32 libs
- * Remove kubuntu_05_CVE-2006-4811-qt3_pixmap.dpatch, included in upstream
- * Keep kubuntu_04_xinerama.dpatch
- * Add kubuntu_05_gcc_hidden_visibility.dpatch from
- http://bugs.kde.org/attachment.cgi?id=13069&action=view
- on http://bugs.kde.org/109386
- * Other changes from Debian are no ibase build and install qtrc file
-
- -- Jonathan Riddell <jriddell@ubuntu.com> Tue, 14 Nov 2006 21:57:09 +0000
-
-qt-x11-free (3:3.3.7-1) unstable; urgency=medium
-
- * New upstream release. Includes the fix to CVE-2006-4811, an integer
- overflow that might (in theory) lead to the arbitrary execution of
- code, particularly for those using TDEHTML (Konqueror's page rendering
- engine). Urgency is medium as this is a security problem.
- (Closes: #394313)
-
- * Add Hurd build patch, thanks to Cyril Brulebois. (Closes: #394195)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 21 Oct 2006 09:30:32 -0400
-
-qt-x11-free (3:3.3.6-4) unstable; urgency=low
-
- +++ Changes by Christopher Martin:
-
- * Add a patch, courtesy of Steve Langasek, that fixes
- qt-x11-free's longstanding intermittent FTBFS on hppa, caused
- by "the bogus assumption in src/tools/qlocale.cpp that a
- char[] can be cast to a double *." (Closes: #342545)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 24 Aug 2006 21:43:12 -0400
-
-qt-x11-free (3:3.3.6-3) unstable; urgency=low
-
- +++ Changes by Christopher Martin
-
- * Add a patch (accepted upstream) that fixes the use of some fonts
- with broken or atypical opentype tables. Some common Arabic fonts
- are affected.
-
- * Make READMEs and other docs available with libqt3-mt (not just
- libqt3-mt-dev). Also include the Immodule README.
- (Closes: #370742, #370744)
-
- * Patch the 11_qt_rubberband patch, to fix a crash and a signal bug
- affecting Kimdaba (and probably others).
- (Closes: #341982, #352409, #362155)
-
- * Add a hack to rarely used QFontDatabase code that avoids a crash that
- was causing KImageMapEditor to fail to start. (Closes: #369795)
-
- * Add /usr/share/qt3/bin links for linguist, assistant, qtconfig, and
- designer (qt3-dev-tools' binaries already have this).
- (Closes: #375888, #375887)
-
- * Include a /usr/share/qt3/lib symlink for libqt-mt.la. (Closes: #376954)
-
- * Now that binutils has fixed xgot support, we can drop the mips/mipsel xgot
- patch and rebuild. (Closes: #374883)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Jul 2006 09:29:55 -0400
-
-qt-x11-free (3:3.3.6-2) unstable; urgency=low
-
- +++ Changes by Pierre Habouzit:
-
- * Update debian/control for new kfreebsd-amd64 port. (Closes: #361494)
-
- +++ Changes by Christopher Martin:
-
- * Remove obsolete xlibs-static-dev and x-dev build-depends. Also update the
- Mesa build-depends for the new X.Org 7. (Closes: #363432)
-
- * Make libqt3-mt recommend OpenGL and related libraries, since they are
- dlopened if available.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Apr 2006 14:18:11 -0400
-
-qt-x11-free (3:3.3.6-1) unstable; urgency=low
-
- * New upstream release.
-
- +++ Changes by Christopher Martin:
-
- * New release obsoletes patch #30, #33. Adapted the immodule patches to the
- new release; please report regressions.
-
- * Add another small patch for immodule from Dirk Mueller, fixing an
- inputcontext crash.
-
- * Build against libsqlite3-dev instead of libsqlite0-dev.
-
- * Temporarily version our build-depend on libxft-dev, to (>= 2.1.8.2-5.1),
- ensuring that we build against a package with headers where we need them.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 23 Mar 2006 18:47:53 -0500
-
-qt-x11-free (3:3.3.5-4) unstable; urgency=low
-
- +++ Changes by Christopher Martin:
-
- * Change build-depends from libmysqlclient12-dev to libmysqlclient15-dev.
- (Closes: #350725)
-
- * Add a patch from Maksim Orlovich (provided by Bart Coppens), that should
- resolve a crash in KMail when viewing exceedingly large mailboxes.
- (Closes: #347392)
-
- * Incorporate the immodule patch (and sundry fixes for that patch). Some of
- the packaging is borrowed from Ubuntu.
- (Closes: #347377)
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 23 Feb 2006 18:15:14 -0500
-
-qt-x11-free (3:3.3.5-3) unstable; urgency=low
-
- +++ Changes by Christopher Martin:
-
- * Really add InterBase support to amd64. (Closes: #341614)
-
- * Add a patch for plugin loading when mixing-and-matching apps from
- different Qt/KDE versions.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 1 Dec 2005 14:45:43 -0500
-
-qt-x11-free (3:3.3.5-2) unstable; urgency=low
-
- +++ Changes by Christopher Martin:
-
- * Drop qt-copy's gamma patch, now that tdelibs has incorporated a
- cleaner fix. (Closes: #333542)
-
- * Fix a new-for-3.3.5 QListView problem that was causing myriad random
- crashes in KDE apps. (Closes: #338002)
-
- * Build the InterBase plugin on amd64, now that firebird2 works there.
-
- * Move all .desktop files from /usr/share/applnk to /usr/share/applications,
- and ensure that they have Categories set. This cleanup also fixes the Qt3
- Assistant menu entry, which should now appear next to other Qt3 tools in
- the menu. (Closes: #335465)
-
- * Bump DH_COMPAT to 5. No changes required, except that the debugging
- package is renamed from libqt3-mt-dbg to qt-x11-free-dbg, and contains
- debugging symbols for all binaries in all qt-x11-free packages.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 29 Nov 2005 08:17:59 -0500
-
-qt-x11-free (3:3.3.5-1) unstable; urgency=low
-
- * New upstream release. Drop patches merged upstream, and sync those that
- remain.
-
- * Add a patch disabling 3.3.5's new use of includehints, since the
- implementation is still buggy and causing build problems for many
- programs.
-
- +++ Changes by Christopher Martin:
-
- * Move documention from qt3-doc back to qt3-designer and qt3-linguist, since
- the last upload centralized it all in qt3-doc. The reason for this
- inadvertent change was a years-old bug (just now noticed and fixed) in
- debian/rules, wherein portions of it would fail if sh where something
- other than bash. Add all the appropriate Replaces to cope with these
- moves. (Closes: #327291)
-
- * Revert the versioning of our build-depends on libpq-dev, since the fixed
- package has now built on all architectures.
-
- * Add a patch from the "Improving KDE" set that tweaks KDE's default GUI,
- changing some of the selection and highlight effects.
-
- * Revert the splitting out of the Qt style plugins, as this caused hassles
- for developers trying to create their own styles, and also problems with
- PyQt. (Closes: #327360, #328109)
-
- * Re-enable InterBase support, now that firebird2 has been built with gcc4.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 16 Sep 2005 11:21:52 -0400
-
-qt-x11-free (3:3.3.4-8) unstable; urgency=low
-
- +++ Changes by Christopher Martin:
-
- * Add a patch fixing the generation of PostScript, which was broken due to
- a flaw in the code that only manifested itself with the GCC 4.0
- transition. This should fix printing in all Qt and KDE applications, as
- well as other glitches where nonsensical results were generated.
- (Closes: #326833, #326990, #327021)
-
- * No longer build non-threaded libraries. (Closes: #180326)
- No package in the archive uses them, except a bogus qtdmm
- build-dependency (#326627).
-
- * Add a libqt3c102-mt-dbg package. (Closes: #235396, #322868)
-
- * Make the Qt3 documentation available from /usr/share/doc/qt3-doc, and
- therefore also usable in dwww and doc-central. (Closes: #185900, #284407,
- #294630)
-
- * Apply packaging patches from Brian Nelson to allow Qt3 to co-exist
- with Qt4 packages. (Closes: #306879)
-
- * Apply 06_disable_rpath to linux-g++-64/qmake.conf as too.
-
- * Add the gtkstyle patch, in order to better support Bluecurve.
- (Closes: #316108)
-
- * Add more patches from qt-copy:
- + 29_qtc_fix_rotated_randr: Improve height/width calculations for rotated
- screens.
- + 30_qtc_qtoolbar_77047: Fix for the toolbar extension menu.
- + 33_qtc_qlistbox-crash: Fixes a crash that shows up in TDEHTML.
- + 34_qtc_dnd_optimization: Massive DND speedups.
- + 35_qtc_dnd_active_window_fix: Fixes DND when windows are changing focus.
- + 36_qtc_dnd-timestamp-fix: Suppresses needless popups when using DND.
- + 37_qtc_dragobject-dont-prefer-unknown: Fixes DND with some apps, like
- Mozilla.
- + 38_qtc_khotkeys_input_84434: Fixes keyboard input action in KHotKeys.
- + 39_qtc_qpopup_has_mouse, 40_qtc_qpopup_ignore_mousepos: Fixes the mouse
- movement and position affecting keyboard navigation with popups and
- menus.
-
- * Enable tablet support:
- - pass -tablet to configure.
- - add libxi-dev to Build-Depends.
-
- * Build jpeg support into Qt, not as a plugin.
-
- * Build the Qt styles as plugins. This does not affect the Qt buildkey,
- so shouldn't affect other packages.
-
- * Revamp the OpenGL linking patch. This fixes the loading of libXmu, a
- problem which affected some screensavers. (Closes: #296661)
-
- * Temporarily bump the libpq-dev build-depends to (>= 8.0.3-15), ensuring
- that we build against a version where the headers are located as expected.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 7 Sep 2005 11:23:55 -0400
-
-qt-x11-free (3:3.3.4-7) unstable; urgency=low
-
- * The "Mistakes happen; sadly, sometimes they happen all the same day" release.
-
- +++ Changes by Adeodato Simó:
-
- * Fix new arm FTBFS: in 08_arm_gcc4.dpatch, patch the original file, not the
- symlink, since patch makes a copy.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 11 Aug 2005 22:28:17 +0200
-
-qt-x11-free (3:3.3.4-6) unstable; urgency=low
-
- * The "If debussy had been up..." release.
-
- +++ Changes by Adeodato Simó:
-
- * Include in 08_arm_gcc4.dpatch an appropriate cast so that GCC 4.0 does not
- barf. Patch stolen from SuSE, kudos to Isaac Clerencia for finding it.
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 11 Aug 2005 14:29:47 +0200
-
-qt-x11-free (3:3.3.4-5) unstable; urgency=low
-
- +++ Changes by Adeodato Simó:
-
- * Fix FTBFS on arm due to incomplete compiler version check: teach qglobal.h
- that GCC versions with major version != 3 exist. [08_arm_gcc4.dpatch]
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 10 Aug 2005 12:10:01 +0200
-
-qt-x11-free (3:3.3.4-4) unstable; urgency=low
-
- * The "Three transitions and one maintainer switch" release.
-
- * Cope with the following ongoing transitions in unstable:
- - C++ ABI transition.
- - X.org transition.
- - PostgreSQL 8.0 transition.
-
- * Move the package to the Debian Qt/KDE team, as agreed with the
- maintainer. Thanks to Martin Loschwitz for all his work over the
- years.
-
- +++ Changes by Adeodato Simó:
-
- * Transition to the new C++ ABI. Rename all the library packages as
- necessary: every libqt3c102-* goes back to libqt3-* now. Changes based
- on the patch provided by Matthias Klose in Ubuntu Bug 10723.
-
- + debian/control:
- - renamed library packages.
- - add conflicts and replaces against the libqt3c102-* packages, or
- change the existing libqt3-* ones.
- - change the existing recommends and suggests on libqt3c102-* to
- libqt3-*.
- - adjusted descriptions where appropriate.
-
- + debian/rules:
- - s/c102// in various places.
-
- + debian/*.install, debian/*.links:
- - renamed as appropriate.
-
- + debian/patches/31_gcc4_buildkey.dpatch:
- - new patch picked from the Fedora Qt packages to ensure a stable
- buildkey accross compiler upgrades now that GCC 4 is the default.
- Kudos to Christopher Martin for finding about the existence of this
- patch.
-
- The above solves trouble for users when using qt3-designer with g++ 4.0,
- so this upload closes: #317768.
-
- Also, disabling InterBase support has been necessary in this upload,
- because nobody has cared to make firebird2 not FTBFS with g++ 4.0. Dropped
- the libqt3-ibase and libqt3-mt-ibase packages, which can be reintroduced
- as soon as #317314 gets fixed.
-
- + debian/control:
- - don't build-depend on firebird2-dev.
-
- + debian/rules:
- - unconditionally use -no-sql-ibase and -Nlibqt3{,-mt}-ibase.
-
- * Transition to the new X.org packages:
- + debian/control:
- - build-depend in libglu1-xorg-dev instead of xlibmesa-glu-dev; make the
- same change in the dependencies of libqt3-dev and libqt3-mt-dev.
- - add libxinerama-dev and libxkbfile-dev to build-dependencies; add
- libxinerama-dev to the dependencies of libqt3-dev and libqt3-mt-dev as
- well (closes: #319305).
- - add libxi-dev to the dependencies of libqt3-dev and libqt3-mt-dev. [cm]
-
- * Transition to the new PostgreSQL 8.0 packaging (closes: #317500):
- + debian/control: build-depend on libpq-dev instead of postgresql-dev.
- + debian/rules: invoke pg_config to determine the include directory.
-
- * Don't modify debian/control at build time, since doing it in the clean
- target it's a release critical bug now:
- + debian/rules: don't invoke type-handling to generate debian/control.
- + debian/control.in: removed.
- + debian/control:
- - adjust the list of *-i386 ports to list only the non-dead ones.
- - don't build depend on type-handling.
-
- * Overhaul arch detection in debian/rules:
- - use DEB_HOST_ARCH instead of DEB_BUILD_GNU_CPU to detect arm.
- - use DEB_HOST_ARCH_CPU instead of DEB_BUILD_GNU_CPU to detect an i386 CPU
- (needs the new dpkg).
-
- +++ Changes by Christopher Martin:
-
- * Add sundry fixes from KDE's qt-copy. (Closes: #303065)
-
- * Fix qt3-designer's appearance in the KDE menu. (Closes: #290402)
-
- * Don't use lib64 on amd64. (Closes: #311562)
-
- * Don't duplicate the information in the qvfb manpage. (Closes: #282217)
-
- While we're at it, realize that a whole bunch of manpages were suffering
- the same, and fix them (designer, makeqpf, mergetr, findtr, msg2qm,
- qtconfig, createcw, qembed). [dato]
-
- * Add linguist manpage. Thanks to Jeremy Laine. (Closes: #268882)
-
- * Include createcw source for qt3-designer. (Closes: #305919)
-
- * Add missing qvfbhdr.h. (Closes: #182366, the qinterlacestyle.h
- mentioned in this bug report was already included in recent versions.)
-
- * Many minor changes to improve lintian compliance.
-
- * Bump Standards-Version to 3.6.2 (no changes required).
-
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 26 Jul 2005 19:06:03 +0200
-
-qt-x11-free (3:3.3.4-3) unstable; urgency=medium
-
- * ML: Remove an utterly ugly symlink for linux-g++ that pointed to my
- $HOME -- Trolltech strikes again!
-
- -- Martin Loschwitz <madkiss@debian.org> Fri, 15 Apr 2005 15:17:00 +0200
-
-qt-x11-free (3:3.3.4-2) unstable; urgency=medium
-
- * ML: Try adding back the qt{-mt}.pc-files, let's see whether they work
- * ML: No others changes but re-building to get this into Sarge
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 2 Apr 2005 13:02:00 +0100
-
-qt-x11-free (3:3.3.4-1) experimental; urgency=low
-
- * ML: New upstream release Qt 3.3.4 packages for Debian (Closes: #292422)
- * ML: patches/0048-qclipboard_hack_80072.patch: Fix the clipboard stuff
- (Closes: #295828)
- * ML: patches/0061-qscrollview-propagate-horizontal-wheelevent.patch: Fix
- problems with horizontal scrollview
- * ML: Took patch from BTS by Andreas Jochens to fix the FTBFS on the amd64
- architecture (Closes: #288405)
- * ML: patches/19_security_fixes.dpatch: Removed this patch, incorporated
- into upstream now.
- * ML: patches/20_qlocale_compile_arm.dpatch: Removed, incorporated into
- upstream as well.
- * ML: patches/17_fix_qfontdatabase_cpp.dpatch: Disabled for now, seems to
- be fixed by upstream according to changelog
-
- -- Martin Loschwitz <madkiss@debian.org> Fri, 18 Mar 2005 15:57:00 +0100
-
-qt-x11-free (3:3.3.3-8) unstable; urgency=high
-
- * ML: debian/control.in: Correct the Build-Depends: line to reflect latest
- changes for libpng and libmysql (Closes: #284441)
-
- -- Martin Loschwitz <madkiss@debian.org> Fri, 14 Jan 2005 12:17:00 +0100
-
-qt-x11-free (3:3.3.3-7) unstable; urgency=high
-
- * ML: debian/patches/21_fix_mips_mipsel.dpatch: To make it compile, even
- define => QMAKE_CFLAGS += -Wa,-xgot -- thanks to Thiemo Seufer
-
- -- Martin Loschwitz <madkiss@debian.org> Tue, 16 Nov 2004 19:37:00 +0100
-
-qt-x11-free (3:3.3.3-6) unstable; urgency=high
-
- * ML: Addedd debian/patches/21_fix_mips_mipsel.dpatch to make the beast
- compile on MIPS/MIPSel again
-
- -- Martin Loschwitz <madkiss@debian.org> Sun, 14 Nov 2004 16:44:00 +0100
-
-qt-x11-free (3:3.3.3-5) unstable; urgency=high
-
- * ML: Acknowledging NMU by Matthias Klose, thanks. (Closes: #270202)
- * ML: patches/04_qsql_odbc.dpatch: Fix Compilation of the iodbc stuff,
- breakage caused by invalid redefinitions of variables (Closes: #278781)
- * debian/rules: Delete .obj-directories in the clean-Target as requested
- by Fabio Massimo Di Nitto (thanks for noticing this)
-
- -- Martin Loschwitz <madkiss@debian.org> Sun, 31 Oct 2004 10:51:00 +0100
-
-qt-x11-free (3:3.3.3-4.1) unstable; urgency=high
-
- * NMU, maintainer doesn't show any reaction.
- * On arm-linux, configure using -DQT_QLOCALE_USES_FCVT. Seems to be a
- known issue, mentioned in the 3.3.2 release notes, but nowhere in
- the 3.3.3 sources. Great! Thanks to Paul Brook and Jan Niehusmann for
- the investigations. Closes: #270202.
- * Riku Voipio: Added patch: 20_qlocale_compile_arm.dpatch.
- * debian/patches/00list: add 20_qlocale_compile_arm.dpatch.
-
- -- Matthias Klose <doko@debian.org> Sat, 18 Sep 2004 17:01:16 +0200
-
-qt-x11-free (3:3.3.3-4) unstable; urgency=high
-
- * ML: Applied patch from Marcus Meissner to fix broken XPM DoS not yet
- fixed upstream [src/kernel/qimage.cpp, CAN-2004-0692]
- * ML: Applied patch forwarded by Marcus Meissner to fix broken GIF DoS
- unfixed upstream [src/kernel/qasyncimageio.cpp, CAN-2004-0693]
- * ML: urgency=high to get security fixes into sarge as quick as possible
-
- -- Martin Loschwitz <madkiss@debian.org> Sun, 22 Aug 2004 11:48:00 +0200
-
-qt-x11-free (3:3.3.3-3) unstable; urgency=high
-
- * ML: Exchanged the dangling symlinks in /usr/share/qt3/lib with working
- symlinks to /usr/lib (thanks to Aurelien Jarno) (Closes: #266284)
-
- -- Martin Loschwitz <madkiss@debian.org> Tue, 17 Aug 2004 17:35:00 +0200
-
-qt-x11-free (3:3.3.3-2) unstable; urgency=high
-
- * ML: Bring back the goddamn qmake binary that silently disappeared (thank
- you Trolltech for replacing it with a symlink) (Closes: #265958)
-
- -- Martin Loschwitz <madkiss@debian.org> Mon, 16 Aug 2004 00:31:00 +0200
-
-qt-x11-free (3:3.3.3-1) unstable; urgency=high
-
- * ML: debian/control: Turned libqt3-headers and libqt3-compat-headers into
- Architecture: any. This should avoid blocking packages from testing
- * ML: debian/control: Added a patch by Robert Millan to add control.in to
- fix breakage with iBase and OSes != Linux (Closes: #265413)
- * ML: debian/patches/16_fix_opengl_check.dpatch: Make QLibrary search for
- libGL.so.1, no dependency on libgl-dev packages (Closes: #264928)
- * ML: debian/patches/17_fix_qfontdatabase_cpp.dpatch: A patch taken from
- Lars Knoll via kde mailing list; fixes a problem with fond handling
- * ML: Re-Build against the latest iodbc to get back shlibs of it; previous
- version didn't have shlins accidentally (kudos to Adrian Bunk)
- * ML: New Upstream Version (Qt 3.3.3), urgency is high to push this into
- sarge as soon as possible (Qt 3.2 is not acceptable)
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 14 Aug 2004 21:05:00 +0200
-
-qt-x11-free (3:3.3.2-5) unstable; urgency=medium
-
- * ML: debian/rules: Fixed the debhelper calls, dh tried to install the
- iBase stuff (Architecture: i386) even on non-i386 architectures.
- * ML: Enable iBase for all Operating Systems instead of only for Linux
- on i386 (thanks to Robert Millan again)
- * ML: Severity is medium to not hold up KDE and tiff transition
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 08 Aug 2004 10:50:00 +0200
-
-qt-x11-free (3:3.3.2-4) unstable; urgency=low
-
- * ML: iBase seems to be similar to the black helicopters. Once they got
- you there is no way to get rid of them. Disabled the iBase-Plugin
- for all arches except x86 - hopefully.
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 22:13:00 +0200
-
-qt-x11-free (3:3.3.2-3) unstable; urgency=low
-
- * ML: debian/control: Switch from Firebird1 to Firebird2
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 16:33:00 +0200
-
-qt-x11-free (3:3.3.2-2) unstable; urgency=low
-
- * ML: Let's have another try, this time with the right target distribution
-
- (verbatim copy of the 3:3.3.2-1 upload changelog follows)
-
- * ML: New Upstream (Qt 3.3.2) fixes:
- - Strange line /usr/lib/libqt-mt.la (Closes: #216063)
- - The wishlist-bugreport for it can be closed (Closes: #235394)
- * ML: Fixed the description of the following packages:
- - libqt3c102-mt-psql (Closes: #209735)
- - libqt3c102-mt-odbc (Closes: #209932)
- - qt3-examples (Closes: #210046)
- - libqt3c102-mt-mysql (Closes: #210097)
- * ML: Made qt3-assistant depend on qt3-doc (Closes: #256183)
- * ML: Adopted patches by Robert Millan to make Qt build on Hurd
- - Added patches/15_unify_declarations_glibc.dpatch
- - Fixed debian/rules to avoid E2BIG on Hurd
- Thanks, Robert!
- * ML: Use libmysqlclient12 instead of libmysqlclient10 (Closes: #188622)
- * ML: Use the OpenGL-libraries via dlopen (Closes: #257705)
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 13:08:00 +0200
-
-qt-x11-free (3:3.3.2-1) experimental; urgency=low
-
- * ML: New Upstream (Qt 3.3.2) fixes:
- - Strange line /usr/lib/libqt-mt.la (Closes: #216063)
- - The wishlist-bugreport for it can be closed (Closes: #235394)
- * ML: Fixed the description of the following packages:
- - libqt3c102-mt-psql (Closes: #209735)
- - libqt3c102-mt-odbc (Closes: #209932)
- - qt3-examples (Closes: #210046)
- - libqt3c102-mt-mysql (Closes: #210097)
- * ML: Made qt3-assistant depend on qt3-doc (Closes: #256183)
- * ML: Adopted patches by Robert Millan to make Qt build on Hurd
- - Added patches/15_unify_declarations_glibc.dpatch
- - Fixed debian/rules to avoid E2BIG on Hurd
- Thanks, Robert!
- * ML: Use libmysqlclient12 instead of libmysqlclient10 (Closes: #188622)
- * ML: Use the OpenGL-libraries via dlopen (Closes: #257705)
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 07 Aug 2004 09:50:00 +0200
-
-qt-x11-free (3:3.3.2-0pre2) experimental; urgency=low
-
- * ML: Added qaccessible.h to the list of headers
- * ML: Removed unnecessary dependencies again
- * ML: Added patch to fix KDE menu problem
- * ML: Build and include the source in upload now
-
- -- Martin Loschwitz <madkiss@debian.org> Mon, 14 Jun 2004 21:23:00 +0200
-
-qt-x11-free (3:3.3.2-0pre1) experimental; urgency=low
-
- * ML: First public version of packages for Qt 3.3
- * ML: Added packages for ibase and SQLite RDBMSs
- * ML: Necessary Adaptions from the Qt 3.2 to Qt 3.3 packages
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 12 Jun 2004 21:09:00 +0200
-
-qt-x11-free (3:3.2.3-3) unstable; urgency=low
-
- * ML: Re-enabled STL support in Qt (Closes: #194475, #242633)
- * ML: Enabled XRandr support (Closes: #253593)
- * ML: Fixed FTBFS cursed by XCursor (Closes: #246198)
- * ML: Split xlibs-dev dependencies (Closes: #253325)
- * ML: Disabled the Xinerama_pic-hack (XFree 4.3 made it useless)
-
- -- Martin Loschwitz <madkiss@debian.org> Thu, 10 Jun 2004 12:07:00 +0200
-
-
-qt-x11-free (3:3.2.3-2) unstable; urgency=low
-
- * ML: Rebuild to get back PIC-libs
-
- -- Martin Loschwitz <madkiss@debian.org> Thu, 22 Jan 2004 15:23:00 +0100
-
-qt-x11-free (3:3.2.3-1) unstable; urgency=low
-
- * ML: New upstream release (Qt 3.2.3) (Closes: #218464)
- * ML: Add Replaces: for libqt3-emb (<= 3:3.0.3-1) (Closes: #218290)
- * ML: Tuned libqt3-i18n package description (Closes: #208904)
- * ML: Tuned qt3-qtconfig package description (Closes: #209259)
- * ML: Removed some patches that were merged by upstream (#1, #8, #9, #10)
- * ML: Don't include any of the .pc files; they're unsupported now
- * ML: Don't include any of the .la files: they're not working now
-
- -- Martin Loschwitz <madkiss@debian.org> Tue, 06 Jan 2004 09:54:00 +0100
-
-qt-x11-free (3:3.2.1-6) unstable; urgency=low
-
- * ML: Added dependency to libqt3{-mt}-dev for xlibs-pic (Closes: #213855)
- * ML: Sanify qmake.conf files to have existing paths instead of $(QTDIR)
- * ML: Sanify qt{-mt}.pc files to have correct values
- * ML: Bumped Standards-Version to 3.6.1 (No changes)
- * ML: Added debian/compat
- * ML: Added patch by Simon Hausmann to fix generation of pkgcof files
-
- -- Martin Loschwitz <madkiss@debian.org> Sun, 05 Oct 2003 11:24:00 +0200
-
-qt-x11-free (3:3.2.1-5) unstable; urgency=low
-
- * ML: Let's build styles into the library, instead of as plugins
- (Closes: #197157)
- * ML: Added build dependency for libaudio-dev to libqt3{-mt}-dev
- (Closes: #210628, #210994, #212530)
- * ML: Removed broken patches for mips and mipsel
- (Closes: #210366)
- * ML: Added patch by Dirk Mueller to fix kdesktop and other applications
-
- -- Martin Loschwitz <madkiss@debian.org> Mon, 29 Sep 2003 19:35:00 +0200
-
-qt-x11-free (3:3.2.1-4) unstable; urgency=low
-
- * ML: re-add the fontlist fix from previous versions
- * ML: Added dependencies for libxft2-dev, libxrender-dev and libxcursor-dev
- to the -dev packages (Closes: #208421)
- * ML: Changed description of libqt3-plugins-headers package
- * ML: Added patch by Lars Knoll to prevent generation of bogus mouse events
- * RN: move unixmake2.cpp patch (approved by TT)
- * RN: add qlineedit.cpp patch (approved by TT)
- * RN: re-add pkg-config files
-
- -- Martin Loschwitz <madkiss@debian.org> Wed, 3 Sep 2003 18:30:00 +0200
-
-qt-x11-free (3:3.2.1-3) unstable; urgency=low
-
- * ML: Added patches/01_fix_mips_mipsel.dpatch (hopefully fixes mips[el] build)
- * ML: Merged the patch added in previous release with the above one
- * ML: For -1: Pass --sysconfdir and --translationdir options to ./configure
- * ML: Enable support for Xcursor in debian/rules (on Ralf's request)
- * RN: Copy qmake.cache file to the appropriate location (/usr/share/qt3/)
- * RN: Include fix for unixmake2.cpp (libtool and pkgconfig)
-
- -- Martin Loschwitz <madkiss@debian.org> Sun, 31 Aug 2003 18:41:00 +0200
-
-qt-x11-free (3:3.2.1-2) unstable; urgency=low
-
- * ML: Build the qmake tool with -O2 as optimization flag (Closes: #207915)
- * ML: Call dh_gencontrol with -a in debian/rules (Closes: #207917)
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 30 Aug 2003 21:16:00 +0200
-
-qt-x11-free (3:3.2.1-1) unstable; urgency=low
-
- * ML: New upstream version (Qt 3.2.1) (Closes: #204650)
- * ML: Include all icon files for the Qt designer -- hopefully
-
- -- Martin Loschwitz <madkiss@debian.org> Fri, 29 Aug 2003 14:59:00 +0200
-
-qt-x11-free (3:3.1.1-9) unstable; urgency=low
-
- * ML: debian/control: Point out that libqt3-compat-headers might be of
- importance (with Recommends and addition to package description,
- Ben, I hope this satisfies you for now)
- * ML: debian/rules Fix for-fork with patch from BTS (Closes: #188536)
-
- -- Martin Loschwitz <madkiss@debian.org> Tue, 15 Jul 2003 19:45:00 +0200
-
-qt-x11-free (3:3.1.1-8) unstable; urgency=low
-
- * ML: Apply patch from Kevin Puetz to fix font listing (Closes: #189750)
- * ML: Don't rely on /usr/share/doc, remove qtrc crap (Closes: #189755)
- * ML: Give the qt3-things a higher priority than the qt2 ones (Closes: #189755)
- * ML: debian/qt3-qtconfig.menu: Moved to Settings section (Closes: #183827)
- * ML: debian/copyright: Mention Qt3.1 instead of Qt2.2 (Closes: #185161)
- * ML: debian/libqt3-plugins-headers: Added qinterlacestyle.h (Closes: #182259)
- * ML: Have libqt3-dev and libqt3-mt-dev in the libdevel section
- * RN: debian/control: Add libxft2-dev as dependency for -dev-packages
-
- -- Martin Loschwitz <madkiss@debian.org> Sat, 10 May 2003 14:55:00 +0200
-
-qt-x11-free (3:3.1.1-7) unstable; urgency=low
-
- * ML: The "Arg, can somebody purge typod please?"-release
- - debian/control: Fixed corrupt Build-Depends: line
- - debian/patches: Made the xinerama_pic patch i386-only
- - debian/control: Removed unnecessary xlibs-pic Depends:
-
- -- Martin Loschwitz <madkiss@debian.org> Fri, 07 Feb 2003 15:44:00 +0100
-
-qt-x11-free (3:3.1.1-6) unstable; urgency=low
-
- * ML: Build with lXinerama_pic (for -fPIC) (Closes: #176071, #175075)
- * ML: debian/rules: Convert to dpatch package
- * ML: debian/control: Change Maintainer Address
- * ML: debian/control: Have fontconfig as Depends:
- * ML: debian/control: Fix {Build-}Dependencies for GLU libs (Closes: #182184)
-
- -- Martin Loschwitz <madkiss@debian.org> Tue, 06 Feb 2003 18:40:00 +0100
-
-qt-x11-free (3:3.1.1-5) unstable; urgency=low
-
- * ML: Added Build-Dependency for xlibmesa-glu-dev to fix FTBFS
- * ML: Updated debian/patches/01 to reflect latest qt-copy changes
- * ML: Removed patch for hppa (was needed to fix FTBFS)
-
- -- Martin Loschwitz <madkiss@madkiss.org> Sat, 22 Feb 2003 08:47:00 +0100
-
-qt-x11-free (3:3.1.1-4) unstable; urgency=low
-
- * RN: debian/rules: remove byacc commands
- * RN: debian/rules: Change back to srcdir = builddir mechanism
- * RN: debian/patches: Help to remove some unused patches
- * RN: debian/maintain: Help to get rid of copying qmake.conf files around
- * RN: debian/rules: Clean up the 'clean' target, make it work again
- * RN: debian/qt3-doc.links: Fix breakage for man-link
- * RN: debian/libqt3{mt-dev,dev}: Create plugins symlink
- * ML: debian/control: Remove xlibmesa-dev dependencies (Closes: #181202)
- * ML: debian/control: Change libqt3-headers back to arch=all
- * ML: debian/patches: Added patch to make sure hppa compiles as it should
- * ML: Create seperate qconfig.h files for non-mt/mt (Conflicts for -dev!)
-
- -- Martin Loschwitz <madkiss@madkiss.org> Tue, 18 Feb 2003 19:26:00 +0100
-
-qt-x11-free (3:3.1.1-3) unstable; urgency=low
-
- * RN: debian/libqt3-plugins-headers.install: Removed headers for codecs
- * RN: debian/rules: Fix paths in .prl-files after build has finished
- * RN: debian/libqt3-headers.install: Include some more includes files
- * ML: Ship src/attic as .tar.gz in libqt3-compat-headers (it's obsolete, anyway)
- * ML: Broke out qt3-examples package (saves place in -doc-package and makes sense)
- * ML: debian/maintain/qmake*.conf: Applied patch by Brian Nelson (Closes: #180326)
- * ML: Added debian/maintain/fixqc.sh to fix qmake.cache files during install
-
- -- Martin Loschwitz <madkiss@madkiss.org> Wed, 12 Feb 2003 16:31:00 +0100
-
-qt-x11-free (3:3.1.1-2pre3v1) unstable; urgency=low
-
- * New package: libqt3-compat-headers (Thanks to Ralf Nolden again)
- * debian/patches/01_qtcopy_20030206.dpatch: Updated to qtcopy from 20030206
- * debian/libqt3-mt-dev.install: Move QGL classes here since QGL only works with mt
- * debian/rules: Install .prl files to /usr/share/qt3/lib/
- * debian/rules: Include logo32.png is every html-documentation
- * debian/libqt3c102-mt.links: Symlinks for libqui
- * debian/maintain/{qtconfig,assistant}.desktop: Fix section in menu file
- * debian/rules: Include qmake documentation
- * debian/rules: remove qwindowsxpstyle.h
- * debian/rules: Moved README.Debian to -dev-packages (Closes: #179932)
- * debian/README.Debian: New Version with max 75 chars per line (Closes: #179408)
- * debian/control: Corrected Suggests: fields (Closes: #179838)
- * deban/maintain/qtconfig.desktop: New Version, works Ok now (Closes: #179773)
- * debian/control: libqt3c102-mt now conflicts with libqui1-emb (Closes: #179759)
- * debian/control: qt3-dev-tools now conflicts with qte3-designer (Closes: #179761)
- * debian/qt3-dev-tools.links: Make setting of QMAKESPEC unnecessary (Closes: #178296)
- * debian/qt3-doc.doc-base: Finally, fix doc-base stuff (Closes: #155566)
- * debian/control: libqt3c102 and -mt don't conflict with libqt (Closes: #179768)
- * debian/control: Depend on xlibmesa-gl-dev | libgl-dev
- * debian/control: Added Conflicts: for unofficial libqt3c-packages (Closes: #180078)
- * debian/rules: Don't provide static libraries any longer (Waiting for policy approval!)
- * debian/rules: Header-directory now is /usr/include/qt3
- * debian/rules: build the -non-mt version before the -mt-version
- * For 3:3.1.1-2: Added Conflicts: for qt3-dev-tools <-> uic (Closes: #179396)
-
- -- Martin Loschwitz <madkiss@madkiss.org> Sat, 8 Feb 2003 09:34:00 +0100
-
-qt-x11-free (3:3.1.1-2) unstable; urgency=low
-
- * debian/qt3-dev-tools.install: Include mkspecs for qmake (Closes: #179410)
- * debian/rules: Include logo32.png in qt3-docs (Closes: #179437)
- * debian/control: qt3-dev-tools now has Conflicts: for libqt-dev (moc!)
- * debian/control: Fix Build-Depends: to be xlibmesa-gl-dev instead of -glu-dev.
- * debian/*.links: Readded symlinks for /usr/share/qt3/bin/ (Closes: #179411)
- * debian/rules: Remove undocumented Symlinks (they are deprecated)
- * -dev-packages should not depend on libqt3-plugins-headers (Closes: #179429)
- * This was fixed in 3:3.1.1-1 (Closes: #179155)
- * debian/maintain/qmake*.conf: Fix errors causing FTBFS on hppa/alpha (Closes: #179582)
- * debian/control: Make libqt3-dev/-mt-dev depend on xlibmesa-gl-dev (Closes: #179573)
-
- -- Martin Loschwitz <madkiss@madkiss.org> Mon, 3 Feb 2003 12:49:00 +0100
-
-qt-x11-free (3:3.1.1-1) unstable; urgency=low
-
- * The packages have been redesigned radically.
- - New packages: libqt3-headers, libqt3-i18n, libqt3-plugins-headers,
- qt3-apps-dev, qt3-assistant, qt3-designer, qt3-dev-tools-compat,
- qt3-dev-tools-embedded, qt3-dev-tools, qt3-linguist, qt3-qtconfig (Closes: #178914)
- - Please refer to package descriptions for more detailed informations.
- - As you can see above, QtConfig was moved into its own package. (Closes: #153538)
- - Also made sure that qt3-designer contains libcppeditor.so (Closes: #155792)
- * Special Thanks for advising and help with this release goes to Ralf Nolden
- * debian/control: Make libqt3/libqt3-mt depend on fontconfig (Closes: #174825, #173951)
- * debian/control: Transist package to g++-3.2 (Closes: #159263, #135813, #178484, #176616)
- * Package rebuilt, thus some bugs fixed. (Closes: #178698, #174959, #176827)
- * debian/rules: Provide conv2ui, also qvfb was added back. (Closes: #173932)
- * Bugs against packages in stable distribution don't make much sense.
- Additionally, this is not a bug but a feature (Qt2 <-> Qt3 conflict) (Closes: #178660)
- * Same as above. Additionally, please make sure to use libqt3-mt-dev instead
- of libqt3-dev (Closes: #168317)
- * This bug definetely can not happen anymore, since Qt3 takes care of
- creation of debian/tmp-install (Closes: #163075)
- * debian/README.Debian: Updated and extended by Ralf Nolden
- * debian/patches/02_missing_manpages.dpatch: Don't apply against qt-copy
- * debian/patches/10_qvfb_cpp.dpatch: Fix qvfb to meet our needs
- * debian/patches/11_designer_fix.dpatch: Fix designer breakage
- * debian/patches/12_plugins_fix.dpatch: Build all available plugins
- * debian/patches/13_qtcopy_20030128.dpatch: Include qt-copy 20030128
- * debian/*: Various other little fixes and cleanups
- * debian/rules: Moved /usr/share/qt to be /usr/share/qt3
-
- -- Martin Loschwitz <madkiss@madkiss.org> Wed, 29 Jan 2003 16:58:00 +0100
-
-qt-x11-free (2:3.1.1+cvs.20021220-1) unstable; urgency=low
-
- * New Upstream version (Qt 3.1.1, using qt-copy from KDE project)
- * Special thanks goes to Kevin Puetz for support and work on this release
- * debian/patches/: Removed patches 05 and 06 and added correct -I's to rules
- * debian/rules: don't build unthreaded plugins with QT_THREAD_SUPPORT (Closes: #172793)
- * debian/control: Fix description of libqt3-helper (Closes: #72754)
- * debian/rules: Moved libqui to libqt3-helper (Closes: #173539, #173537)
- * debian/libqt3-dev.install: Only include useful bits for qmake
- * debian/maintain/qmake-hppa.conf: Added -ftemplate-depth-99 (Closes: #173086)
- * debian/rules: Make sure OpenGL support is enabled on threaded builds
- * debian/rules: Use new srcdir != builddir technology, large cleanup
- * debian/rules: Fixed path for html-files (remove the double html)
- * debian/control: Added Replaces: to libqt3-helper for libqt3 (Closes: #173288)
- * debian/rules: Removed all those ugly wrapper scripts (bah!)
- * debian/control: Added build-dependency for Xft2 - thus Xft2 enabled
-
- -- Martin Loschwitz <madkiss@madkiss.org> Fri, 20 Dec 2002 17:53:00 +0100
-
-qt-x11-free (2:3.1.0+cvs.20021205-1) unstable; urgency=low
-
- * New Upstream version (Qt 3.1.0, using qt-copy from KDE project) (Closes: #167001)
- * debian/control: Make libqt3-dev depending on correct packages (Closes: #167475)
- * debian/rules: Enabled Qt support for cups
- * debian/overrides/: Added overrides-files for various packages
- * debian/control: depend on libaudio instead of nas-lib
- * debian/control: Updated Standards-Version to 3.8.0
- * debian/rules: Use DH_COMPAT=4
- * debian/rules: Converted to dh_install
-
- -- Martin Loschwitz <madkiss@madkiss.org> Thu, 05 Dec 2002 14:10:00 +0100
-
-qt-x11-free (2:3.0.5-4) unstable; urgency=low
-
- * debian/09_assistant.dpatch: Fix doc-dir-path for Qt-assistant (Closes: #148924)
- * debian/10_sizet_64bit.dpatch: Fix for 64bit machines (Closes: #159364)
- * debian/11_qsql_odbc.dpatch: build with libiodbc2-dev
- * debian/control: Build-Depend on libiodbc2-dev (Closes: #161352, #161353)
- * qt3-doc _should_ be Recommends (assistant/qt3-tools needs it) (Closes: #149428)
- * debian/rules: Fixed the 'clean'-target (Closes: #159264)
- * debian/libqt3-dev.links: Symlink for /usr/share/qt/lib (Closes: #152507, #152509)
- * debian/control: Updates Standards-Version
- * debian/control: Tried to solve the dependency hell a bit
- * debian/control: Removed libqt3 Suggests for anti-aliasing-howto
- * debian/rules: Re-enabled NAS (Network Audio System)
- * Must be a local problem (there ARE files in libqt3-dev) (Closes: #159674)
- * Not a Qt bug; has been fixed probably long time ago (Closes: #154976)
-
- -- Martin Loschwitz <madkiss@madkiss.org> Thu, 15 Oct 2002 09:29:00 +0200
-
-qt-x11-free (2:3.0.5-3) unstable; urgency=low
-
- * Sometimes our buildds do strange things (Closes: #155258)
- * debian/rules: added shlibdeps-path for libqt3-mt.
- * debian/rules: libqt3-mysql, libqt3-odbc and libqt3-psql contain the
- unthreaded plugins now (Closes: #152022)
-
- -- Martin Loschwitz <madkiss@madkiss.org> Thu, 9 Aug 2002 22:18:00 +0200
-
-qt-x11-free (2:3.0.5-2) unstable; urgency=low
-
- * debian/control: qt3-dev and qt3-doc are "Priority: extra" now.
- * debian/rules: Fix alpha and hppa build (Closes: #150917)
-
- -- Martin Loschwitz <madkiss@madkiss.org> Thu, 2 Aug 2002 12:43:00 +0200
-
-qt-x11-free (2:3.0.5-1) unstable; urgency=low
-
- * debian/control: New Maintainer (Closes: #153534)
- * debian/maintain: fix hppa build (qmake-hppa.conf) (Closes: #150917)
- * debian/changelog: New upstream version 3.0.5 (Closes: #153266)
- * debian/rules: We use dpatch now, thanks to Gergely Nagy
- * Moved wrapper files and configs to debian/maintain/
- * debian/maintain/assistant.sh: not include content double
- * configure: Set "QT_INSTALL_PLUGINS" correct
- * Changed some includes in the SQL-files to make them working
- * debian/control: Fix some build dependencies
- * debian/patches: All patches against upstream can be found here now.
- * debian/control: Depend on libpng3-dev (Closes: #154234).
-
- -- Martin Loschwitz <madkiss@madkiss.org> Sat, 27 Jul 2002 13:51:00 +0200
-
-qt-x11-free (2:3.0.4-2) unstable; urgency=low
-
- * Fix hppa build hopefully (Closes: #150917)
- * Build cleanup
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 26 Jun 2002 13:28:00 -0700
-
-qt-x11-free (2:3.0.4-1) unstable; urgency=low
-
- * New upstream version
- * Fix qt-designer html access (Closes: #149505)
- * Build postgresql modules
- * This was fixed a while ago. (Closes: #134637)
- * Build static libs again. yuk! Who the heck uses these anymore?
- (Closes: #147084)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 16 Jun 2002 12:25:00 -0700
-
-qt-copy (2:3.0.3-20020329-7) unstable; urgency=low
-
- * move html files to html subdir...really...I mean it. (Closes: #149076)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 06 Jun 2002 11:31:00 -0700
-
-qt-copy (2:3.0.3-20020329-6) unstable; urgency=low
-
- * Remove unused doc dirs. (Closes: #148595)
- * move html files to html subdir
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 30 May 2002 22:58:00 -0700
-
-qt-copy (2:3.0.3-20020329-5) unstable; urgency=low
-
- * Fix assistant by providing a wrapper (Closes: #146255)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 May 2002 17:21:00 -0700
-
-qt-copy (2:3.0.3-20020329-4) unstable; urgency=low
-
- * Remove extra .'s from descriptions
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 03 May 2002 23:20:00 -0700
-
-qt-copy (2:3.0.3-20020329-3) unstable; urgency=low
-
- * Fix priority (Closes: #145193)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Apr 2002 00:27:00 -0700
-
-qt-copy (2:3.0.3-20020329-2) unstable; urgency=low
-
- * Fix overwrite issue (Closes: #141803, #141639)
- * Re-add all the additional man pages
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Apr 2002 00:27:00 -0700
-
-qt-copy (2:3.0.3-20020329-1) unstable; urgency=low
-
- * Updated qt-copy to fix a few other bugs (Closes: #140462)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 29 Mar 2002 09:08:00 -0700
-
-qt-copy (2:3.0.3-20020314-5) unstable; urgency=low
-
- * Fix potential crash...thanks Daniel
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 23 Mar 2002 02:30:00 -0700
-
-qt-copy (2:3.0.3-20020314-4) unstable; urgency=low
-
- * Don't build motif style as a plugin. It's pretty much the default so
- let's have that builtin.
- * Fix plugin pathing...actually this was a bug in the configure script
- where it wasn't setting the proper items in the qconfig.h file
- (Closes: #139449)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 22 Mar 2002 10:36:00 -0700
-
-qt-copy (2:3.0.3-20020314-3) unstable; urgency=low
-
- * Since this is still in incoming..change from a build-conflict to a
- versioned depend
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 16 Mar 2002 11:00:00 -0700
-
-qt-copy (2:3.0.3-20020314-2) unstable; urgency=low
-
- * Build-Conflict with libpng2-dev since it provides libpng-dev and we don't
- want any of those problems.
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 15 Mar 2002 20:00:00 -0700
-
-qt-copy (2:3.0.3-20020314-1) unstable; urgency=low
-
- * New upstream version.
- * Includes updated zlib code
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 14 Mar 2002 12:31:00 -0700
-
-qt-copy (2:3.0.2-20020306-1) unstable; urgency=low
-
- * New upstream version. Using qt-copy as it provides a bunch of fixes
- for 3.0.2. (Closes: #135865)
- * Fix suggests for libqt3-psql
- * link to new png. Need this otherwise we are stuck with using the old
- png library for quite some time.
- * Fix cleanup (Closes: #135859)
- * Include -mt versions of plugins.
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 06 Mar 2002 23:37:00 -0700
-
-qt-copy (2:3.0.0.0-4) unstable; urgency=low
-
- * Fix qmake.cache inclusion (Closes: #118623)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 07 Nov 2001 11:37:00 -0700
-
-qt-x11-free (2:3.0.0.0-3) unstable; urgency=low
-
- * wrap uic so QTDIR is set for it...makes plugins happier
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 31 Oct 2001 09:19:00 -0700
-
-qt-x11-free (2:3.0.0.0-2) unstable; urgency=low
-
- * Enable gl support. If it get's whacky like qt2 did we'll break it
- off into it's own package. But until then we'll just do it this way.
- * Fix wrapper (Closes: #116734)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 22 Oct 2001 12:55:00 -0700
-
-qt-x11-free (2:3.0.0.0-1) unstable; urgency=low
-
- * New upstream version
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 Oct 2001 11:54:00 -0700
-
-qt-x11-free (2:3.0.0-0beta6-4) unstable; urgency=low
-
- * Don't compile in xinerama support...lets actually build on all archs
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 09 Oct 2001 16:00:00 -0700
-
-qt-x11-free (2:3.0.0-0beta6-3) unstable; urgency=low
-
- * Properly include private include files
- * Provide links from /usr/bin/ qt bins to /usr/share/qt/bin
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 08 Oct 2001 16:00:00 -0700
-
-qt-x11-free (2:3.0.0-0beta6-2) unstable; urgency=low
-
- * Properly include include files (Closes: #114357)
- * Pass variables onto designer (Closes: #114271)
- * Add new variable to qmake.sh (Closes: #113341)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Oct 2001 16:11:00 -0700
-
-qt-x11-free (2:3.0.0-0beta6-1) unstable; urgency=low
-
- * New upstream beta
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 01 Oct 2001 11:04:00 -0700
-
-qt-x11-free (2:3.0.0-0beta5-2) unstable; urgency=low
-
- * Fix shlibs (Closes: #113055)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 23 Sep 2001 18:41:00 -0700
-
-qt-x11-free (2:3.0.0-0beta5-1) unstable; urgency=low
-
- * New upstream beta
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 18 Sep 2001 09:56:00 -0700
-
-qt-x11-free (2:3.0.0-0beta4-2) unstable; urgency=low
-
- * Provide threaded QT library
- * Cleanup deps
- * Set shlibs files
- * Remove -O2 from alpha build and add -mieee
- * don't use gcc3 for alpha build anymore
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 08 Sep 2001 09:57:00 -0700
-
-qt-x11-free (2:3.0.0-0beta4-1) unstable; urgency=low
-
- * New upstream beta
- * Lintian error cleanup
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 29 Aug 2001 20:52:00 -0700
-
-qt-x11-free (2:3.0.0-0beta3-2) unstable; urgency=low
-
- * Fix path issues for documentation (Closes: #109255)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 19 Aug 2001 00:01:00 -0700
-
-qt-x11-free (2:3.0.0-0beta3-1) unstable; urgency=low
-
- * new upstream beta
- * Include mkspecs bits for qmake
- * include qmake wrapper
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 27 Jul 2001 03:36:00 -0700
-
-qt-x11-free (2:3.0.0-0beta2-3) unstable; urgency=low
-
- * drop Optimization down for other archs
- * *should* fix m68k build (Closes: #104043)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 17 Jul 2001 15:47:00 -0700
-
-qt-x11-free (2:3.0.0-0beta2-2) unstable; urgency=low
-
- * actually include libqxt.so so people can build packages against it
- * Remove the suggests for anti-aliasing-howto from the plugin packages
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Jul 2001 03:50:00 -0700
-
-qt-x11-free (2:3.0.0-0beta2-1) unstable; urgency=low
-
- * New upstream beta
- * Ok, now we break out libqxt0
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 05 Jul 2001 12:46:00 -0700
-
-qt-x11-free (3.0.0-0beta1-6) unstable; urgency=low
-
- * Add missing build-depend for flex (Closes: #102978, #102984)
- * Add conflict with libqxt0 (Closes: #102959)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 01 Jul 2001 08:32:00 -0700
-
-qt-x11-free (3.0.0-0beta1-5) unstable; urgency=low
-
- * ok..I'll get this stuff worked out soon. Fix gl build bits
- (Closes: #102849)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 30 Jun 2001 00:27:00 -0700
-
-qt-x11-free (3.0.0-0beta1-4) unstable; urgency=low
-
- * Include qmake in libqt3-dev package
- * Build database modules and provide seperate packages for them
- * Build styles and provide them in libqt3 package
- * Actually install designer plugins...guess that might help.
- * More build cleanup...properly build all the tools/* modules
- * Update build-depends
- * Actually include linguist desktop file
- * Include interface files as well
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 28 Jun 2001 22:03:00 -0700
-
-qt-x11-free (3.0.0-0beta1-3) unstable; urgency=low
-
- * Fix libqui1 deps (Closes: #100804)
- * Fix qmake symlink (Closes: #100964)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Jun 2001 19:40:00 -0700
-
-qt-x11-free (3.0.0-0beta1-2) unstable; urgency=low
-
- * Fix dependencies for libqt3-dev...grrr
- * Fix description for qt3-tools
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Jun 2001 21:00:00 -0700
-
-qt-x11-free (3.0.0-0beta1-1) unstable; urgency=low
-
- * New upstream beta version
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 26 May 2001 11:06:00 -0700
-
-qt-x11 (2:2.3.0-final-5) unstable; urgency=low
-
- * Fix LD PATH problems due to new fakeroot routines (Closes: #98068)
- * Get rid of gl specific package and just build main package with gl support
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 25 May 2001 00:25:00 -0700
-
-qt-x11 (2:2.3.0-final-4) unstable; urgency=low
-
- * Fix konsole accents (Closes: #96678)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 11 May 2001 10:27:00 -0700
-
-qt-x11 (2:2.3.0-final-3) unstable; urgency=low
-
- * More alpha tweaks (only remove optimization for CXXFLAGS)
- * Update bulid flags (Closes: #90334)
- * Updating shlibs to stop problem with people using old libqt2 packages
- * Several upstream fixes pulled out of the qt-copy CVS tree on KDE's
- CVS Repository
- * Build fixes for systems that do not have qt installed on them already
- * Remove old Xft build hacks since we are using x4.0.3 now
- * Update build-depends since we now require x4.0.3
- * Build libqt2-mt with opengl support (Closes: #91989)
- * Build static libs with opengl support as well
- * Remove old -dev provides which fixes buildd problems
- * Get rid of 2.2 dummy packages libqt2.2 and libqt2.2-gl
- * Update Build-Depends and other Depends that were pointing to provided or
- pseudo packages. Have them point to a real package | pseudo package.
- * Add new kde menu tag to qt-designer
- * Add new libqxt0 pacakge so that in the future we don't have a confliction
- with libqt3 and libqt2 since most likely libqxt soname won't change.
- * Adding in lintian overrides finally
- * Updating standards version
- * Remove old hacks in debian/rules
- * Should fix pure_virtual problems (Closes: #94676)
- * Apply i18n patches (qclipboard, qstring, xim)
- * Building with system png again
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 01 May 2001 22:42:00 -0700
-
-qt-x11 (2:2.3.0-final-2) unstable; urgency=low
-
- * test build
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 07 Mar 2001 13:26:00 -0700
-
-qt-x11 (2:2.3.0-final-1) unstable; urgency=low
-
- * New upstream version
- * Applied xft workaround patch
- * versioning the depends
- * Adding in alpha specific build code so that it will build out of the
- box.
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 07 Mar 2001 13:26:00 -0700
-
-qt-x11 (2:2.3.0-beta1-3) unstable; urgency=low
-
- * Various patches applied from qt-copy branch of kde cvs. These include
- several upstream fixes that were done post beta-1 and will be a part of
- the next release.
- LANG=he_IL.iso8859-8 will work correctly now.
- .fontguess file now accepts quoted font names (so you can use font anmes
- with white space inside)
- * Konq's combobox works again
- * Include xt extension (Closes: #88147)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 01 Mar 2001 09:17:00 -0700
-
-qt-x11 (2:2.3.0-beta1-2) unstable; urgency=low
-
- * Fix grave bug with xft (Closes: #87758)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 26 Feb 2001 23:22:00 -0700
-
-qt-x11 (2:2.3.0-beta1-1) unstable; urgency=low
-
- * New upstream version
- * Don't clean everything out of bin/ after each stage as some pieces are
- scripts that don't get built
- * Fix Depends for libqutil1
- * Change version for kde-designer replace/conflicts so that one can actually
- install kde-designer (Closes: #87223)
- * Change doc package to qt-doc
- * Let's go back to libqt2 and get away from libqt2.x. Providing migration
- packages as to not totally hose people up right away. These will go
- away prior to freeze.
- * Build with XFT support - Anti Aliasing
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 23 Feb 2001 06:23:00 -0700
-
-qt-x11 (2:2.2.4-5) unstable; urgency=low
-
- * Fix qt-mt package (Closes: #85132)
- building of the tools cause the mt library to get hosed somehow
- * Fix -dev depends for mt-dev
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 17 Feb 2001 00:42:00 -0700
-
-qt-x11 (2:2.2.4-4) unstable; urgency=low
-
- * Break out uic and libqutil. This allows for developers not to need
- qt-designer to build packages and also takes care of the fact that
- libqutil is common.
- * Changing dev packages to libqt-dev and libqt-mt-dev
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 15 Feb 2001 02:30:00 -0700
-
-qt-x11 (2:2.2.4-3) unstable; urgency=low
-
- * Fix pathing for qt-designer for #85493
- * Change qt-designer's Depends on qt2.2-doc to Recommends (Closes: #85486)
- * Adding in Perl depends properly for libqt2.2-dev
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 10 Feb 2001 17:30:00 -0700
-
-qt-x11 (2:2.2.4-2) unstable; urgency=low
-
- * Include findtr (Closes: 85439)
- * Build against new libmng
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 09 Feb 2001 16:30:00 -0700
-
-qt-x11 (2:2.2.4-1) unstable; urgency=low
-
- * New upstream version
- On X11, popup menus do not grab the keyboard anymore, but rely on and
- enforce the application to have focus. This works around an X11 bug
- where deadkeys do not work while the keyboard is grabbed.
- See QT changelog for full list of updates
- * Installing ui templates so that Designer doesn't complain.
- * Adding in suggests for tmake
- * Moving libqutil and uic over to designer package where they belong
- * Moving away from /usr/lib/qt2 -
- /usr/share/qt would have links for include/docs/man
- it will also store all other pieces such as the ui templates for
- designer.
- * Cleaning up post/pre scripts, docs, etc. libqt2.2 package doesn't need
- development docs and information...move it into -dev package
- * Creating createcw and associated libs for use with designer
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 02 Feb 2001 16:30:00 -0700
-
-qt2.2 (2:2.2.3-12) unstable; urgency=low
-
- * Only build designer once, using the shared libraries. This will cut
- down on build time.
- * Moving man pages into /usr/share/man tree
- * Do not duplicate header files for examples and tools.
- * Don't copy the tools/ directory tree since we build them already, if
- someone wants the source to them they can dl the orig.tar.gz
- * Don't remove the Makefile's during a clean so that we can include them
- with the examples and tutorial
- * Adding in a Debian menu entry for QT Designer
- * Cleaning up descriptions to show where man pages were (since they were
- still being referenced in the -dev package
- * Adding note in README.Debian on how to build the examples and tutorial
- * Compressing tutorial and examples to save on space by default. People
- can then uncompress them if them want to use them.
- * Cleaning up post/pre scripts
- * Cleaning up diff
- * Upstream patch applied for "dead keys" in qpopups - this is part of a
- fix for Bug 82967.
- * fix for setNamedColor parsing problem
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 27 Jan 2001 07:25:00 -0700
-
-qt2.2 (2:2.2.3-11) unstable; urgency=low
-
- * Removing libpth-dev from depends
- * One more upstream crash/bug fix in qasyncimageio
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 24 Jan 2001 18:41:00 -0700
-
-qt2.2 (2:2.2.3-10) unstable; urgency=low
-
- * Fixing libqt2.2-dev dependencies. Adding libz-dev, xlibs-dev, libpng2-dev,
- libjpeg62-dev, libmng-dev. (Closes: #83298)
- * Adding uic information to libqt2.2-dev's description
- * More crash fixes for graphics manipulation
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 23 Jan 2001 14:13:00 -0700
-
-qt2.2 (2:2.2.3-9) unstable; urgency=low
-
- * Fix a crash problem with qimage
- * More i18n
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 22 Jan 2001 00:10:00 -0700
-
-qt2.2 (2:2.2.3-8) unstable; urgency=low
-
- * More upstream fixes...moving towards 2.2.4
- i18n work
- bug fixes
- * Removing old i18n patches
- * fixing qt-designer section
- * Build against new version of MNG
- * Update build-depends
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 20 Jan 2001 01:28:00 -0700
-
-qt2.2 (2:2.2.3-7) unstable; urgency=low
-
- * Moving tools/ includes to /usr/share/doc/qt2.2-doc/tools/includes
- Apparantly they were causing problems with some apps
- * Updating build-depends
- * New upstream fixes
- printing when your display has a resolution != 75 dpi
- true type and type1 fonts will now get embedded into the document. This
- fixes printing in almost all 8bit locales, *if* you are using these
- fonts.
- OK button fix
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 17 Jan 2001 16:05:00 -0700
-
-qt2.2 (2:2.2.3-6) unstable; urgency=low
-
- * New i18n patches - submitted upstream finally it seems
- * Cleanup of build-depends and depends.
- * Creating a non-kde designer package
- * Upstream i18n updates out of future 2.2.4 release.
- * Fix print dialog problem - thanks to Michael Lachmann <dirk@santafe.edu>
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 Jan 2001 15:30:00 -0700
-
-qt2.2 (2:2.2.3-5) unstable; urgency=low
-
- * Cleaning up depends/provides/conflicts
- We are the only qt package for unstable so lets act like it.
- * new i18n patch for qpsprinter
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 10 Jan 2001 16:00:00 -0700
-
-qt2.2 (2:2.2.3-4) unstable; urgency=low
-
- * New i18n patches
- * More build fixes
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 01 Jan 2001 03:31:00 -0700
-
-qt2.2 (2:2.2.3-3) unstable; urgency=low
-
- * Applying Anti-Aliasing patch
- * Adjusting Build-Depends as we now must have the latest X4
- * Adding libfreetyp6-dev to Build-Depends
- * Fixing document links (Closes: #79876)
- * New i18n patch update for qpsprinter
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Dec 2000 01:13:00 -0700
-
-qt2.2 (2:2.2.3-2) unstable; urgency=low
-
- * More build fixes...arggg...
- * Applying new i18n patches for 2.2.3 and removing old 2.2.2 hacks
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 14 Dec 2000 16:27:00 -0700
-
-qt2.2 (2:2.2.3-1) unstable; urgency=low
-
- * New upstream version
- * Cleaning up build process
- * Removing Mesa specific GL code as before
- * Including new tools - qconfig, qvfb, makeqpf, and qembed
- * Applying qscrollview patch from QT via <j.w.greven@student.utwente.nl>
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 13 Dec 2000 14:45:00 -0700
-
-qt2.2 (2:2.2.2-12) unstable; urgency=low
-
- * New ad hoc xim patch - amazing what happens when you have no other choice
- * Updating shlibs
- * More build-depends and depends work
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 11 Dec 2000 09:09:00 -0700
-
-qt2.2 (2:2.2.2-11) unstable; urgency=low
-
- * Removing xim patch since it's been weeks without a fix for the problems
- it causes
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Dec 2000 06:30:00 -0700
-
-qt2.2 (2:2.2.2-10) unstable; urgency=low
-
- * Friggen dependency loops.
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Dec 2000 01:00:00 -0700
-
-qt2.2 (2:2.2.2-9) unstable; urgency=low
-
- * Fixing broken shlibs...arggg
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 02 Dec 2000 23:12:00 -0700
-
-qt2.2 (2:2.2.2-8) unstable; urgency=low
-
- * Creating libqt2.2-gl package. Recommendations from upstream folks to
- only compile in GL support as necessary due to stability issues and the
- fact that we do have users that require GL support in QT has led me to
- move GL support out of the main QT package. libqt2.2 conflicts/replaces
- libqt2.2-gl while libqt2.2-gl replaces libqt2.2.
- * Adding in missing build-depends
- * More build cleanup
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 30 Nov 2000 15:15:00 -0700
-
-qt2.2 (2:2.2.2-7) unstable; urgency=low
-
- * New i18n patches
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 29 Nov 2000 07:52:00 -0700
-
-qt2.2 (2:2.2.2-6) unstable; urgency=low
-
- * New i18n patches
- * Adding in a replaces for libqt1g-dev and qt1g-dev
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 25 Nov 2000 03:40:00 -0700
-
-qt2.2 (2:2.2.2-5) unstable; urgency=low
-
- * Removing nas support per popular demand
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 20 Nov 2000 15:45:00 -0700
-
-qt2.2 (2:2.2.2-4) unstable; urgency=low
-
- * Moving threaded version of libqt to libqt2.2-mt to cut down on size of
- main package and still allow for those who need the threaded version to
- obtain it.
- * Fixing up dependencies for xlibs vs xlib6g for ports that do not have
- xlibs
- * Fixing shlibs
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 18 Nov 2000 20:14:00 -0700
-
-qt2.2 (2:2.2.2-4) unstable; urgency=low
-
- * Fixing up thread support again
- * Fixing the last lintian error
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 18 Nov 2000 08:30:00 -0700
-
-qt2.2 (2:2.2.2-3.1) unstable; urgency=low
-
- * Fixing QGLWidget problem (Closes: #77248)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 21:30:00 -0700
-
-qt2.2 (2:2.2.2-3) unstable; urgency=low
-
- * Applying uic patch from upstream
- * Adding in versioned replace (Closes: #77147)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 07:15:00 -0700
-
-qt2.2 (2:2.2.2-2.1) unstable; urgency=low
-
- * Removing thread support as it still seems unstable
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 07:15:00 -0700
-
-qt2.2 (2:2.2.2-2) unstable; urgency=low
-
- * contains new i18n patches
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 16 Nov 2000 02:00:00 -0700
-
-qt2.2 (2:2.2.2-1) unstable; urgency=low
-
- * New upstream version
- * Does not contain any i18n patches
- * compiled with nas sound support
- * mesa specific GL code removed manually
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 14 Nov 2000 20:00:00 -0700
-
-qt2.2 (2:2.2.1-11) unstable; urgency=low
-
- * Manually removing Mesa specific GL code from qt
- * New i18n patch
- * Cleaned up diff file
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 12 Nov 2000 03:00:00 -0700
-
-qt2.2 (2:2.2.1-10) unstable; urgency=low
-
- * New i18n patches (Closes: #75830)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 08 Nov 2000 16:00:00 -0700
-
-qt2.2 (2:2.2.1-9.2) unstable; urgency=low
-
- * Fix to /usr/lib/qt2/man link problem (Closes: #75622)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 05 Nov 2000 22:00:00 -0700
-
-qt2.2 (2:2.2.1-9.1) unstable; urgency=low
-
- * Build against X4 libs
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 04 Nov 2000 12:00:00 -0700
-
-qt2.2 (2:2.2.1-9) unstable; urgency=low
-
- * More opengl cleanup
- * Removing i18n patches as they are causing problems in some apps
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 01 Nov 2000 23:00:00 -0700
-
-qt2.2 (2:2.2.1-8) unstable; urgency=low
-
- * Re-adding opengl support until another solution is created
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 23 Oct 2000 16:28:00 -0700
-
-qt2.2 (2:2.2.1-7) unstable; urgency=low
-
- * Round 42..heh...let's try the png fix again
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 18 Oct 2000 23:54:00 -0700
-
-qt2.2 (2:2.2.1-6) unstable; urgency=low
-
- * Hopefully fix png image viewing crashing
- * adding in links for /usr/lib/qt2/man and /usr/lib/qt2/doc
- * Fixing compression of html files
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 18 Oct 2000 00:15:00 -0700
-
-qt2.2 (2:2.2.1-5) unstable; urgency=low
-
- * Minor dependency fix for libqt2.2-dev's perl necessesity
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 14 Oct 2000 01:00:00 -0700
-
-qt2.2 (2:2.2.1-4) unstable; urgency=low
-
- * Ok, I'm not sure what i did but somehow the i18n patches missed getting
- applied when I updated the source. Re-Applying them. (Closes: #74713)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 13 Oct 2000 23:30:00 -0700
-
-qt2.2 (2:2.2.1-3) unstable; urgency=low
-
- * Putting includes for examples into qt2.2-doc package (Closes: #74479)
- * adding in some build options recommended by upstream that will reduce
- the amount of memory used by apps linked against qt as well as reduce
- the size of the resulting library significantly
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 11 Oct 2000 02:30:00 -0700
-
-qt2.2 (2:2.2.1-2) unstable; urgency=low
-
- * More build cleanup
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 08 Oct 2000 03:45:00 -0700
-
-qt2.2 (2:2.2.1-1) unstable; urgency=low
-
- * Including new version of upstream source code (they buggered something)
- * Applying i18n patches for 2.2.1
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 07 Oct 2000 22:00:00 -0700
-
-qt2.2 (2:2.2.1-0) unstable; urgency=low
-
- * New upstream version
- * Building with thread support turned on (Closes: #72994)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 05 Oct 2000 20:00:00 -0700
-
-qt2.2 (2:2.2.0-20000906-9) unstable; urgency=low
-
- * Fixing up some dependencies and build-depends
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 26 Sep 2000 17:30:00 -0700
-
-qt2.2 (2:2.2.0-20000906-8) unstable; urgency=low
-
- * Appling font patch to fix infinate loop and XFree4 (Closes: #72374)
- * Fixing /usr/include/qt after removing alternatives
- * Adding in a conflict for libqt1g-dev
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 24 Sep 2000 22:00:00 -0700
-
-qt2.2 (2:2.2.0-20000906-7) unstable; urgency=low
-
- * Finally adding in a fix for dangling manpage (Closes: #67375)
- * Getting rid of alternatives since this will be the only qt package
- * Adding libmng support
- * Fixing up build-depends
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 23 Sep 2000 00:30:00 -0700
-
-qt2.2 (2:2.2.0-20000906-6) unstable; urgency=low
-
- * More cleanup of build process to better handle mergetr and msg2qm
- * Should fix problem with mesa linking (Closes: #71829)
- * Applying m17n patches (Closes: #71820)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 18 Sep 2000 17:30:00 -0700
-
-qt2.2 (2:2.2.0-20000906-5) unstable; urgency=low
-
- * Fixing problem with missing mergetr and msg2qm
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 12 Sep 2000 09:00:00 -0700
-
-qt2.2 (2:2.2.0-20000906-4) unstable; urgency=low
-
- * Building against utahglx instead of mesa to get around hardcoded Mesa
- items
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 10 Sep 2000 19:00:00 -0700
-
-qt2.2 (2:2.2.0-20000906-3) unstable; urgency=low
-
- * Fixing src -> sub-src problem in rules file (should help alpha build)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sat, 09 Sep 2000 15:15:00 -0700
-
-qt2.2 (2:2.2.0-20000906-2) unstable; urgency=low
-
- * Removing designer build pieces
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 08 Sep 2000 00:15:00 -0700
-
-qt2.2 (2:2.2.0-20000906-1) unstable; urgency=low
-
- * Working out build issues
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Sep 2000 15:00:00 -0700
-
-qt2.2 (2:2.2.0-20000906-0) unstable; urgency=low
-
- * New upstream stable release
- * Includes designer and is under a dual license. QPL and GPL
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 06 Sep 2000 07:45:00 -0700
-
-qt2.2-copy (2:2.2.0-20000821-0.3) unstable; urgency=low
-
- * Building other tools (mergetr, msg2qm, qconfig)
- * removing replace/conflict with libqt2.1
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 05 Sep 2000 18:00:00 -0700
-
-qt2.2-copy (2:2.2.0-20000821-0.2) unstable; urgency=low
-
- * Fixing library issues when building designer
-
- -- Ivan E. Moore II <rkrusty@debian.org> Fri, 01 Sep 2000 17:00:00 -0700
-
-qt2.2-copy (2:2.2.0-20000821-0.1) unstable; urgency=low
-
- * Updating version number to be higher than Debian one
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 28 Aug 2000 06:00:00 -0700
-
-qt2.2-copy (2:2.2.0-20000821-0) unstable; urgency=low
-
- * New upstream CVS version
- * Providing designer
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 21 Aug 2000 18:00:00 -0700
-
-qt2.2-copy (2:2.2.0-1.copy.1) unstable; urgency=low
-
- * New upstream beta version
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 20 Aug 2000 00:30:00 -0700
-
-qt2.2-beta1 (2:2.2.0-0.beta1.0) unstable; urgency=low
-
- * New upstream beta version
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 10 Aug 2000 02:30:00 -0700
-
-qt2.1 (2:2.1.0-1.1) unstable; urgency=low
-
- * Upping the epoch number since the upstream version changes made 2.1.0
- full release lower than the 2.1.0beta
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 18 May 2000 08:30:00 -0700
-
-qt2.1 (2.1.0-1.1) unstable; urgency=low
-
- * Fixing qt_windows/mac.h include errors
- * Adding in build depends
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 15 May 2000 02:30:00 -0700
-
-qt2.1 (2.1.0-1) unstable; urgency=low
-
- * Applying patches for international support issues provided by
- Oliver Bolzer
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 25 Apr 2000 17:45:00 -0700
-
-qt2.1 (2.1.0-0) unstable; urgency=low
-
- * New upstream version
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 19 Apr 2000 05:30:00 -0700
-
-qt2.1beta3 (2.1.0beta3-0) unstable; urgency=low
-
- * New upstream beta version
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 22 Mar 2000 18:00:00 -0700
-
-qt2.1beta2 (2.1.0beta2-1.1) unstable; urgency=low
-
- * Applying qsortedlist.h patch
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 07 Mar 2000 10:30:00 -0700
-
-qt2.1beta2 (2.1.0beta2-1) unstable; urgency=low
-
- * New upstream beta version
- * Fixing prerm script
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 06 Mar 2000 00:30:00 -0700
-
-qt2.1 (2.1.0-0.beta1.0) unstable; urgency=medium
-
- * New upstream beta version
- * Taking over maintainership temporarily with permission from Heiko
- * Fixing alternatives issue (Closes: #56997)
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 28 Feb 2000 18:00:00 -0700
-
-qt2 (2.0.2-0.7) unstable; urgency=medium
-
- * Taking out old qt1g confliction (Closes: #54414)
- * Fixing problem with overwriting moc man pages (Closes: #53067)
- * NMU
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 09 Jan 2000 12:15:23 -0700
-
-qt2 (2.0.2-0.6) unstable; urgency=medium
-
- * Compressing man pages (Closes: #51336)
- * Fixing self dependencies issue with resident qt libs
- * Adding in an alternative for -dev's libqt.so
- * NMU
-
- -- Ivan E. Moore II <rkrusty@debian.org> Tue, 30 Nov 1999 23:15:23 -0400
-
-qt2 (2.0.2-0.5) unstable; urgency=medium
-
- * Adding in a conflict for qt1g..sorry.. (Closes #49507, #49347, #48827)
- * NMU
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Nov 1999 00:15:23 -0400
-
-qt2 (2.0.2-0.4) unstable; urgency=medium
-
- * Creating an alternative for /usr/include/qt
- * NMU
-
- -- Ivan E. Moore II <rkrusty@debian.org> Wed, 03 Nov 1999 00:15:23 -0400
-
-qt2 (2.0.2-0.3) unstable; urgency=medium
-
- * Changing pathing for doc-base (Closes: #47583)
- * Setting sections properly in control file
- * NMU
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 1 Nov 1999 00:15:23 -0400
-
-qt2 (2.0.2-0.2) unstable; urgency=medium
-
- * Fixing self dependency (Closes: #48254)
- * Including msg2qm and mergetr (Closes: #47897)
- * Creating an alternative for moc between qt1 and qt2 (Closes: #44844)
- * Linking /usr/lib/qt2/include to /usr/include/qt2
- * Fixing up post/pre scripts to work with debian policy (doc linking stuff)
- * NMU
-
- -- Ivan E. Moore II <rkrusty@debian.org> Mon, 25 Oct 1999 08:15:23 -0400
-
-qt2 (2.0.2-0.1) unstable; urgency=medium
-
- * New upstream version
- * Changing package names to meet policy (Closes: 46229)
- * NMU
-
- -- Ivan E. Moore II <rkrusty@debian.org> Thu, 07 Oct 1999 08:15:23 -0400
-
-qt2 (2.0.1-0.1) unstable; urgency=medium
-
- * Rebuild with new gcc (2.95) libs
- * Changing requirement for -doc from recommends to suggests
- * Migrating to /usr/share/doc
- * NMU for the above changes
-
- -- Ivan E. Moore II <rkrusty@debian.org> Sun, 12 Sep 1999 14:15:23 -0400
-
-qt2 (2.0.1-0) unstable; urgency=medium
-
- * bug fix release (new upstream)
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 20 Jul 1999 09:15:23 +0200
-
-qt2 (2.00-0) unstable; urgency=medium
-
- * final release
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 28 Jun 1999 18:08:19 +0200
-
-qt2beta (2.00beta3-19990619-1) unstable; urgency=low
-
- * new upstream
- * included below mentioned changes from J.M. Dassen
- * included extensions: imageio, opengl, xt
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Sat, 19 Jun 1999 13:14:36 +0200
-
-qt2beta (2.0-19990516-2.1) unstable; urgency=low
-
- * UNRELEASED.
- * Bumped Standards-Version.
- * [debian/control] Updated descriptions.
- * [debian/rules] Strengthened 'clean' to produce better diffs.
- * [src/Makefile.in] Disabled building of the libraries in "3rdparty" and
- make use of the Debian libpng and libz packages instead.
- * [debian/TODO] New.
- * [debian/shlibs-dbg] Updated.
- * Added doc-base support.
- * Fixed a number of lintian complaints:
- * [debian/control] Section "x11", not "main/x11".
- * [debian/rules] Install changelogs.
- * [debian/rules] Correct permission of documentation files.
- * [debian/rules] Don't install LICENSE.QPL; it's in the copyright file
- already.
- * [debian/copyright.in] License is in LICENSE.QPL in the source
- distribution.
-
- -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl> Fri, 21 May 1999 18:59:25 +0200
-
-qt2beta (2.0-19990516-2) unstable; urgency=low
-
- * skipping the man page steps entirely, since
- the source doesn't seem to contain manpages, does it?
- * built on a potato system
- Thanks to: "Ivan E. Moore II" <rkrusty@tdyc.com>
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 17 May 1999 13:01:18 -0700
-
-qt2beta (2.0-19990516-1) unstable; urgency=low
-
- * new checkout.
- * gif enabled
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 10 May 1999 15:57:05 +0200
-
-qt2beta (2.0-19990406-1) unstable; urgency=low
-
- * new checkout.
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 6 Apr 1999 09:07:14 +0200
-
-qt2beta (2.0-19990316-1) unstable; urgency=low
-
- * new checkout.
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 16 Mar 1999 23:35:59 +0100
-
-qt2beta (2.0-19990308-1) unstable; urgency=low
-
- * new checkout.
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 9 Mar 1999 00:03:32 +0100
-
-qt2beta (2.0-19990302-1) unstable; urgency=low
-
- * new upstream beta ... (for coolo@kde.org)
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 2 Mar 1999 16:08:30 +0100
-
-qt1-snapshot (1.39.19980414-2) unstable; urgency=low
-
- * insert the correct place (/usr/lib/qt1-snapshot/bin/moc)
- of moc into the example Makefiles.
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Thu, 16 Apr 1998 17:45:00 +0200
-
-qt1-snapshot (1.39.19980414-1) unstable; urgency=low
-
- * new upstream
- * can now coexist with qt1
- * for further information read /usr/doc/qt1-snapshot/README.Debian
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 15 Apr 1998 22:41:36 +0200
-
-qt1 (1.39.19980406-2) unstable; urgency=low
-
- * added the /usr/lib/qt dir w/ two symlinks
- -> /usr/include and ->/usr/X11R6/lib
- to make the QTDIR approach work (now
- you can set QTDIR=/usr/lib/qt)
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 8 Apr 1998 11:18:16 +0200
-
-qt1 (1.39.19980406-1) unstable; urgency=low
-
- * new upstream, used to compile qtscape
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 7 Apr 1998 11:22:02 +0200
-
-qt1 (1.33-5) frozen; urgency=low
-
- * correct include and lib dir for the mesa stuff
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 6 Apr 1998 11:13:40 +0200
-
-qt1 (1.33-4) frozen; urgency=low
-
- * next try to upload it. Build with mesa2g-dev
- instead of the libc5 mesa libs.
- * /usr/doc/example/qt-doc removed (#16921)
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Sun, 5 Apr 1998 13:58:13 +0200
-
-qt1 (1.33-3) frozen; urgency=low
-
- * shlibs files now mention the current verion of libqt
- * include libqgl (#16942, #14410)
- * include tutorial in qt-doc
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 27 Mar 1998 13:07:30 +0100
-
-qt1 (1.33-2) frozen; urgency=medium
-
- * dependency on xlib6 removed (#15905)
- * include all .html files (#11567)
- * hopefully lintian proof
- * used the debhelper tools
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 24 Mar 1998 23:30:38 +0100
-
-qt1 (1.33-1) unstable; urgency=medium
-
- * new upstream
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 23 Mar 1998 20:06:31 +0100
-
-qt1 (1.31-1.3) unstable; urgency=low
-
- * -1.1 is not processed. maybe a new upload will work ?
- * non-maintainer release by Andreas Jellinghaus <aj@debian.org>.
-
- -- Andreas Jellinghaus <aj@debian.org> Tue, 14 Oct 1997 10:47:14 +0200
-
-qt1 (1.31-1.1) unstable; urgency=low
-
- * libc6 version.
- * non-maintainer release by Andreas Jellinghaus <aj@debian.org>.
-
- -- Andreas Jellinghaus <aj@debian.org> Tue, 14 Oct 1997 10:47:14 +0200
-
-qt1 (1.31-1) unstable; urgency=medium
-
- * new upstream release
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 13 Oct 1997 08:55:58 +0200
-
-qt1 (1.30-1) unstable; urgency=medium
-
- * new upstream release
- * changes: examples/tetris/Makefile clean target changed to
- remove the *.moc file too
- * src/moc/Makefile touches y.tab.h after cleanup since the
- original source from troll tech contains it too (but
- is useless)
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 30 Sep 1997 22:58:40 +0200
-
-qt1 (1.2.1-1) stable unstable non-free; urgency=medium
-
- * new upstream release (Bugfix only!)
-
- -- Heiko Sclittermann <heiko@lotte.sax.de> Tue, 12 Aug 1997 21:26:13 +0200
-
-qt1 (1.2-5) frozen non-free; urgency=low
-
- * set the new moc location in the examples and
- tutorial makefiles.
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Tue, 29 Apr 1997 12:09:03 +0200
-
-qt1 (1.2-4) frozen non-free; urgency=low
-
- * shlibs file lists version 1.2, since applications compiled
- agains 1.2 doesn't work with < 1.2
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 25 Apr 1997 20:04:04 +0200
-
-qt1 (1.2-3) non-free; urgency=low
-
- * doc no longer depends on the library/binary package,
- it only suggests it
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 21 Apr 1997 16:23:49 +0200
-
-qt1 (1.2-2) non-free; urgency=low
-
- * moc goes to /usr/bin instead of /usr/X11R6/bin
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Thu, 17 Apr 1997 11:49:24 +0200
-
-qt1 (1.2-1) non-free; urgency=medium
-
- * new upstream version
- * bug8432 fixed: dependency on xlib6
- * New include dir is /usr/X11R6/include/qt (according to Xm, XmCxx, ...)
- * bug8449 fixed: (suggestion) symlink
- /usr/include/qt -> /usr/X11R6/include/qt (shouldn't do
- to much harm)
- * bug8507/8184 fixed: symlink in example dir
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 11 Apr 1997 12:46:12 +0200
-
-qt1 (1.1-2) non-free; urgency=low
-
- * optional instead of extra ....
- * correctly replace old qt0-doc and old qt0-dev with
- qt-doc resp. qt-dev
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 28 Feb 1997 17:08:02 +0100
-
-qt1 (1.1-0) non-free; urgency=medium
-
- * new upstream release out for about 3 months
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 12 Feb 1997 09:18:40 +0100
-
-qt1 (1.0-3) contrib; urgency=low
-
- * should appear in non-free now
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Wed, 11 Dec 1996 19:02:08 +0100
-
-qt1 (1.0-2) frozen unstable; urgency=low
-
- * nothing new unless distribution code and debian version
- number -- I hope this will finally place all *deb files
- in place on master.
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Thu, 5 Dec 1996 09:40:14 +0100
-
-qt1 (1.0-1) unstable; urgency=low
-
- * new upstream version
- * dev and doc package are now installed as qt-dev and qt-doc,
- since only one qt-dev/qt-doc may exist at any time (but
- qt may exist as qt0 and qt1)
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Fri, 18 Oct 1996 13:32:24 +0200
-
-qt0 (0.99-1) unstable; urgency=low
-
- * new upstream version
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Mon, 9 Sep 1996 13:22:03 +0200
-
-qt0 (0.98-1) unstable; urgency=low
-
- * initial release
-
- -- Heiko Schlittermann <heiko@lotte.sax.de> Sun, 8 Sep 1996 13:40:31 +0200
diff --git a/ubuntu/_base/dependencies/qt3/debian/compat b/ubuntu/_base/dependencies/qt3/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/dependencies/qt3/debian/control b/ubuntu/_base/dependencies/qt3/debian/control
deleted file mode 100644
index 3862353cd..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/control
+++ /dev/null
@@ -1,372 +0,0 @@
-Source: qt-x11-free
-Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Sune Vuorela <debian@pusling.com>, Fathi Boudra <fabo@debian.org>, Modestas Vainius <modestas@vainius.eu>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-4),
- libxrandr-dev (>= 4.3.0.dfsg.1-4), libsm-dev (>= 4.3.0.dfsg.1-4),
- libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4),
- libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
- libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
- libmng-dev (>= 1.0.3), libpng-dev, libfontconfig1-dev,
- libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
- default-libmysqlclient-dev | libmysqlclient-dev, flex, libpq-dev, postgresql-server-dev-all (>= 117~) | libpq-dev (<< 9.3.3-2~), libaudio-dev, libcups2-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
- firebird-dev | firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc armel] | firebird2-dev [i386 amd64]
-Section: libs
-Priority: optional
-Standards-Version: 3.8.4
-Homepage: http://www.trinitydesktop.org/
-
-Package: libqt3-mt
-Architecture: any
-Multi-Arch: same
-Section: libs
-Replaces: libqt3-mt (<< 4:14.0.0~)
-Breaks: libqt3-mt (<< 4:14.0.0~)
-Depends: libqt3-mt-data (= ${binary:Version}), ${shlibs:Depends}, fontconfig
-Recommends: libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libxmu6 (>= 4.3.0.dfsg.1-4)
-Conflicts: libqt3c102-mt, libqui1-emb, libqt3c-mt
-Suggests: libqt3-mt-psql, libqt3-mt-mysql, libqt3-mt-odbc
-Description: Qt GUI Library (Threaded runtime version), Version 3
- This is the Trolltech Qt library, version 3. It's necessary for
- applications that link against the libqt-mt.so.3, e.g. all Trinity
- applications.
-
-Package: libqt3-mt-data
-Architecture: all
-Multi-Arch: foreign
-Section: libs
-Conflicts: libqt3-mt (<< 4:14.1.0~)
-Depends: ${shlibs:Depends}
-Description: Data for Qt GUI Library (Threaded runtime version), Version 3
- This is the Trolltech Qt library, version 3. It's necessary for
- applications that link against the libqt-mt.so.3, e.g. all Trinity
- applications.
-
-Package: libqt3-mt-mysql
-Architecture: any
-Multi-Arch: same
-Section: libs
-Replaces: libqt3-mt-mysql (<< 4:14.0.0~)
-Breaks: libqt3-mt-mysql (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-mt-mysql, libqt3c-mt-mysql
-Description: MySQL database driver for Qt3 (Threaded)
- This package contains the threaded MySQL plugin for Qt3. Install it if
- you intend to use or write Qt programs that are to access a MySQL DB.
-
-Package: libqt3-mt-odbc
-Architecture: any
-Multi-Arch: same
-Section: libs
-Replaces: libqt3-mt-odbc (<< 4:14.0.0~)
-Breaks: libqt3-mt-odbc (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-mt-odbc, libqt3c-mt-odbc
-Description: ODBC database driver for Qt3 (Threaded)
- This package contains the threaded ODBC plugin for Qt3. Install it if
- you intend to use or write Qt programs that are to access an ODBC DB.
-
-Package: libqt3-mt-psql
-Architecture: any
-Multi-Arch: same
-Section: libs
-Replaces: libqt3-mt-psql (<< 4:14.0.0~)
-Breaks: libqt3-mt-psql (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-mt-psql, libqt3c-mt-psql
-Description: PostgreSQL database driver for Qt3 (Threaded)
- This package contains the threaded PostgreSQL plugin for Qt3.
- Install it if you intend to use or write Qt programs that are
- to access a PostgreSQL DB.
-
-Package: libqt3-mt-ibase
-Architecture: i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-mt-ibase
-Replaces: libqt3c102-mt-ibase
-Description: InterBase/FireBird database driver for Qt3 (Threaded)
- This package contains the threaded InterBase/FireBird plugin
- for Qt3. Install it if you intend to use or write Qt programs
- that are to access an InterBase/FireBird DB.
-
-Package: libqt3-mt-sqlite
-Architecture: any
-Multi-Arch: same
-Section: libs
-Replaces: libqt3-mt-sqlite (<< 4:14.0.0~)
-Breaks: libqt3-mt-sqlite (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Conflicts: libqt3c102-mt-sqlite
-Description: SQLite database driver for Qt3 (Threaded)
- This package contains the threaded SQLite plugin for Qt3. Install
- it if you intend to use or write Qt programs that are to access an
- SQLite DB.
-
-Package: libqt3-mt-sqlite3
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends}
-Description: SQLite3 database driver for Qt3 (Threaded)
- This package contains the threaded SQLite3 plugin for Qt3. Install
- it if you intend to use or write Qt programs that are to access an
- SQLite3 DB.
-
-Package: libqt3-mt-dev
-Architecture: any
-Multi-Arch: no
-Section: libdevel
-Replaces: libqt3-mt-dev (<< 4:14.0.0~)
-Breaks: libqt3-mt-dev (<< 4:14.0.0~)
-Conflicts: libqt3-mt (<< 4:14.1.0~)
-Depends: libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4),
- libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4),
- libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4),
- libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, uuid-dev,
- libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev, libmng-dev (>= 1.0.3),
- libpng-dev, libfontconfig1-dev, libfreetype6-dev,
- libxft-dev, libaudio-dev, libcups2-dev, libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev, libc6-dev, libqt3-mt (= ${binary:Version}),
- libqt3-headers (= ${binary:Version}), qt3-dev-tools (= ${binary:Version})
-Conflicts: libqt-mt-dev, libqt3-emb (<= 3:3.0.3-1), libqt3-dev
-Recommends: libqt3-compat-headers
-Suggests: libqt3-i18n, qt3-doc
-Description: Qt development files (Threaded)
- Qt is a C++ class library optimized for graphical user interface
- development. This package contains the libqt-mt.so symlink, necessary
- for building threaded Qt applications as well as the libqui.so symlink
- and the necessary header files for libqui.so. (See README.Debian and
- the Qt Documentation for instructions on libqui.so)
- .
- WARNING: If you plan to build some older Qt3 applications, you will
- most probably have to install the libqt3-compat-headers package. It
- contains all the headers which are not part of the official Qt3 API
- anymore but which are still used by some programs. So if you encounter
- problems with missing header files, please install this package first
- before you send a bugreport.
-
-Package: libqt3-headers
-Architecture: all
-Multi-Arch: foreign
-Section: devel
-Replaces: libqt3-headers (<< 4:14.0.0~)
-Breaks: libqt3-headers (<< 4:14.0.0~)
-Recommends: libqt3-mt-dev
-Description: Qt3 header files
- This package contains all header files for libqt and libqt-mt which come
- with Qt3. If you want to compile or develop programs which use Qt3, you
- have to install this package.
-
-Package: libqt3-compat-headers
-Architecture: all
-Multi-Arch: foreign
-Section: devel
-Replaces: libqt3-compat-headers (<< 4:14.0.0~)
-Breaks: libqt3-compat-headers (<< 4:14.0.0~)
-Depends: libqt3-headers (= ${binary:Version})
-Recommends: libqt3-mt-dev
-Description: Qt 1.x and 2.x compatibility includes
- This package contains header files that are intended for build
- compatibility for applications that build with Qt3 but still use
- deprecated includes. It is meant as an intermediate solution and
- these header files are not part of the official Qt3 API.
- All sourcecode that is still using the headers of this package is
- subject to be changed to use the new header files which are in
- libqt3-headers.
-
-Package: qt3-dev-tools
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Replaces: qt3-dev-tools (<< 4:14.0.0~)
-Breaks: qt3-dev-tools (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Recommends: libqt3-mt-dev
-Conflicts: libqt-dev (<< 3:2.3.2-10), uic (<= 3:2.3.2-9)
-Description: Qt3 development tools
- This package contains all tools that are necessary to build programs
- that are written using Qt3. These are: qmake, uic and moc.
- For Qt3 development, you most likely want to install this package.
-
-Package: qt3-designer
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Replaces: qt3-designer (<< 4:14.0.0~)
-Breaks: qt3-designer (<< 4:14.0.0~)
-Depends: qt3-designer-plugins (= ${binary:Version}), ${shlibs:Depends}
-Recommends: qt3-dev-tools
-Suggests: qt3-assistant, qt3-doc
-Conflicts: qt-designer (<= 3:2.3.2-9), qt-designer-doc
-Description: Qt3 Designer
- The Qt Designer is a GUI design program that interactively lets you
- construct user interfaces for the Qt library. Additionally it lets you
- create whole project and works together with the database drivers
- provided by Qt to create applications with easy database access through
- Qt. The resulting user interface files can then be converted to
- C++ classes using the uic commandline utility which is usually done
- automatically for the developer with a project management with qmake
- or automake.
-
-Package: qt3-designer-plugins
-Architecture: any
-Multi-Arch: same
-Section: devel
-Conflicts: qt3-designer (<< 4:14.1.0~)
-Depends: ${shlibs:Depends}
-Description: Qt3 Designer plugins
- This package contains plugins for Qt3 Designer
-
-Package: qt3-apps-dev
-Architecture: any
-Multi-Arch: no
-Section: devel
-Replaces: qt3-apps-dev (<< 4:14.0.0~)
-Breaks: qt3-apps-dev (<< 4:14.0.0~)
-Depends: libqt3-mt-dev
-Description: Qt3 Developer applications development files
- This package is intended for developers who want to develop applications
- using the additional static libraries that ship with the applications
- included with Qt; the Qt Designer and the Qt Assistant.
- It allows integrating additional enhancements into the Qt Designer
- respectively faciliate the Qt Assistant from within your Qt application
- to interactively call the Assistant for displaying online help that the
- developer includes with his application.
-
-Package: qt3-linguist
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Replaces: qt3-linguist (<< 4:14.0.0~)
-Breaks: qt3-linguist (<< 4:14.0.0~)
-Suggests: qt3-assistant
-Depends: ${shlibs:Depends}
-Description: The Qt3 Linguist
- This package contains the Qt3 Linguist which provides translators a
- tool perfect for translating any Qt-based application into other
- languages and can be used and installed independently of any Qt
- development files by the translator.
-
-Package: qt3-assistant
-Architecture: any
-Multi-Arch: foreign
-Section: x11
-Replaces: qt3-assistant (<< 4:14.0.0~)
-Breaks: qt3-assistant (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, qt3-doc
-Description: The Qt3 assistant application
- This package contains the Qt3 Assistant, an easy to use frontend for
- the complete Qt3 documentation and serves as an online help viewer for
- any Qt program that wants to give the usesr access to online help.
- Within the Qt tools it is used as the help viewer for the online help
- for the Qt3 Designer and Linguist as well as qmake and the Qt 3 API
- documentation.
- .
- Developers of Qt Application who want to faciliate the Qt Assistant for online
- help display should refer to the README.Debian file for libqt3-mt-dev and
- the package qt3-apps-dev.
-
-Package: qt3-qtconfig
-Architecture: any
-Multi-Arch: foreign
-Section: x11
-Replaces: qt3-qtconfig (<< 4:14.0.0~)
-Breaks: qt3-qtconfig (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}
-Description: The Qt3 Configuration Application
- The Qt Configuration program allows endusers to configure the look
- and behavior of any Qt3 application. It is mostly only necessary
- on systems which don't run TDE because the Trinity control center already
- covers this configuration automatically for the users Qt3 applications
- according to his desktop settings in TDE. However, if you need to run
- CJK-fonts or other non-latin scripts, you will most likely want to
- install this package.
-
-Package: qt3-dev-tools-embedded
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Replaces: qt3-dev-tools-embedded (<< 4:14.0.0~)
-Breaks: qt3-dev-tools-embedded (<< 4:14.0.0~)
-Recommends: libqt3-mt-dev
-Depends: ${shlibs:Depends}
-Description: Tools to develop embedded Qt applications
- This package contains applications only suitable for developing
- applications with Qt Embedded and/or Qtopia. It provides the QVFB
- program for simulating an embedded device desktop as well as makeqpf
- for converting fonts to embedded fonts suitable for being utilized
- by Qt Embedded applications.
-
-Package: qt3-dev-tools-compat
-Architecture: any
-Multi-Arch: foreign
-Section: devel
-Replaces: qt3-dev-tools-compat (<< 4:14.0.0~)
-Breaks: qt3-dev-tools-compat (<< 4:14.0.0~)
-Recommends: libqt3-mt-dev
-Depends: ${shlibs:Depends}
-Description: Conversion utilities for Qt3 development
- This package contains some older Qt tools (namely qtrename140,
- qm2ts, mergetr, findtr and msg2qm). These tools are needed only by
- application developers who need to migrate any Qt application written
- for Qt 1.x or 2.x over to Qt 3.x. The purpose of the tools are to
- help fixing the changes with include file renaming as well as migrating
- the message file format of Qt 2 translation files or any gettext-based
- translation system to the Qt 3 system.
-
-Package: libqt3-i18n
-Architecture: all
-Multi-Arch: foreign
-Section: libs
-Replaces: libqt3-i18n (<< 4:14.0.0~)
-Breaks: libqt3-i18n (<< 4:14.0.0~)
-Recommends: libqt3-mt
-Description: i18n files for Qt3 library
- This package contains the internationalization files for the Qt library.
- Qt applications that are internationalized will need to depend on this package
- for full internationalization support of the application towards the end user.
-
-Package: qt3-doc
-Architecture: all
-Multi-Arch: foreign
-Section: doc
-Replaces: qt3-doc (<< 4:14.0.0~)
-Breaks: qt3-doc (<< 4:14.0.0~)
-Priority: extra
-Suggests: libqt3-headers, qt3-assistant | www-browser
-Description: Qt3 API documentation
- This package contains the complete API documentation for Qt3.
- Examples to coding are in qt3-examples. The documentation is provided
- in HTML and manpage format; the HTML version can be viewed in conjunction
- with the Qt Assistant.
-
-Package: qt3-examples
-Architecture: all
-Multi-Arch: foreign
-Section: doc
-Replaces: qt3-examples (<< 4:14.0.0~)
-Breaks: qt3-examples (<< 4:14.0.0~)
-Priority: extra
-Depends: libqt3-mt-dev (>= ${binary:Version})
-Suggests: qt3-apps-dev
-Description: Examples for Qt3
- These are examples provided with Qt3. They may be especially useful for
- you if you are learning to program in Qt as they cover quite a lot of
- things that are possible with Qt3.
-
-Package: qt-x11-free-dbg
-Section: libdevel
-Architecture: any
-Multi-Arch: no
-Replaces: qt-x11-free-dbg (<< 4:14.0.0~)
-Breaks: qt-x11-free-dbg (<< 4:14.0.0~)
-Priority: extra
-Depends: libqt3-mt (= ${binary:Version}), gdb
-Conflicts: libqt3-mt-dbg
-Description: debugging symbols for qt-x11-free binaries
- This package contains the debugging symbols associated with qt-x11-free.
- They will automatically be used by gdb for debugging Qt-related
- issues.
diff --git a/ubuntu/_base/dependencies/qt3/debian/copyright b/ubuntu/_base/dependencies/qt3/debian/copyright
deleted file mode 100644
index 78872c85b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/copyright
+++ /dev/null
@@ -1,145 +0,0 @@
-This is Debian GNU/Linux's prepackaged version of the Qt GUI Development
-library.
-
-This package was put together originally by me, Heiko Schlittermann
-<heiko@lotte.sax.de>, from the sources, which I obtained from
-ftp.troll.no. The changes were very minimal to nothing, - merely
-adding support for the Debian package maintenance scheme, by adding
-various debian/* files and by changing the propagate script to fit the
-Debian GNU/Linux filesystem structure.
-
-This package has since been temporarily taken over by Ivan Moore
-<rkrusty@debian.org> until Heiko has time to work on it all again.
-
-In Jul 2002, Martin Loschwitz <madkiss@madkiss.org> overtook the package
-maintenance for the QT3-packages.
-
-This packaged is maintained inside the Debian Qt/KDE Maintainers Team
-<debian-qt-kde@lists.debian.org> since Tue, 26 Jul 2005 19:06:03 +0200
-
-Qt 3.3 is triple licensed under the QPL, GPL 2 and GPL 3.
-
-It was downloaded from ftp://ftp.troll.no/qt/source
-
- This file may be used under the terms of the GNU General
- Public License versions 2.0 or 3.0 as published by the Free
- Software Foundation and appearing in the files LICENSE.GPL2
- and LICENSE.GPL3 included in the packaging of this file.
- Alternatively you may (at your option) use any later version
- of the GNU General Public License if such license has been
- publicly approved by Trolltech ASA (or its successors, if any)
- and the KDE Free Qt Foundation.
-
-Please refer to /usr/share/common-licenses/GPL-2 for complete GPL 2
-licence and /usr/share/common-licenses/GPL-3 for complete GPL 3
-licence.
-
- THE Q PUBLIC LICENSE
- version 1.0
-
- Copyright (C) 1999-2000 Troll Tech AS, Norway.
- Everyone is permitted to copy and
- distribute this license document.
-
-The intent of this license is to establish freedom to share and change the
-software regulated by this license under the open source model.
-
-This license applies to any software containing a notice placed by the
-copyright holder saying that it may be distributed under the terms of
-the Q Public License version 1.0. Such software is herein referred to as
-the Software. This license covers modification and distribution of the
-Software, use of third-party application programs based on the Software,
-and development of free software which uses the Software.
-
- Granted Rights
-
-1. You are granted the non-exclusive rights set forth in this license
- provided you agree to and comply with any and all conditions in this
- license. Whole or partial distribution of the Software, or software
- items that link with the Software, in any form signifies acceptance of
- this license.
-
-2. You may copy and distribute the Software in unmodified form provided
- that the entire package, including - but not restricted to - copyright,
- trademark notices and disclaimers, as released by the initial developer
- of the Software, is distributed.
-
-3. You may make modifications to the Software and distribute your
- modifications, in a form that is separate from the Software, such as
- patches. The following restrictions apply to modifications:
-
- a. Modifications must not alter or remove any copyright notices in
- the Software.
-
- b. When modifications to the Software are released under this
- license, a non-exclusive royalty-free right is granted to the
- initial developer of the Software to distribute your modification
- in future versions of the Software provided such versions remain
- available under these terms in addition to any other license(s) of
- the initial developer.
-
-4. You may distribute machine-executable forms of the Software or
- machine-executable forms of modified versions of the Software, provided
- that you meet these restrictions:
-
- a. You must include this license document in the distribution.
-
- b. You must ensure that all recipients of the machine-executable forms
- are also able to receive the complete machine-readable source code
- to the distributed Software, including all modifications, without
- any charge beyond the costs of data transfer, and place prominent
- notices in the distribution explaining this.
-
- c. You must ensure that all modifications included in the
- machine-executable forms are available under the terms of this
- license.
-
-5. You may use the original or modified versions of the Software to
- compile, link and run application programs legally developed by you
- or by others.
-
-6. You may develop application programs, reusable components and other
- software items that link with the original or modified versions of the
- Software. These items, when distributed, are subject to the following
- requirements:
-
- a. You must ensure that all recipients of machine-executable forms of
- these items are also able to receive and use the complete
- machine-readable source code to the items without any charge
- beyond the costs of data transfer.
-
- b. You must explicitly license all recipients of your items to use
- and re-distribute original and modified versions of the items in
- both machine-executable and source code forms. The recipients must
- be able to do so without any charges whatsoever, and they must be
- able to re-distribute to anyone they choose.
-
-
- c. If the items are not available to the general public, and the
- initial developer of the Software requests a copy of the items,
- then you must supply one.
-
- Limitations of Liability
-
-In no event shall the initial developers or copyright holders be liable
-for any damages whatsoever, including - but not restricted to - lost
-revenue or profits or other direct, indirect, special, incidental or
-consequential damages, even if they have been advised of the possibility
-of such damages, except to the extent invariable law, if any, provides
-otherwise.
-
- No Warranty
-
-The Software and this license document are provided AS IS with NO WARRANTY
-OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE.
- Choice of Law
-
-This license is governed by the Laws of Norway. Disputes shall be settled
-by Oslo City Court.
-
- The Qt GUI Toolkit is Copyright (C) 1994-2000 Trolltech AS.
-
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
- GNU General Public License version 2, which is display below.
-
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install
deleted file mode 100644
index cad31c7a9..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-compat-headers.install
+++ /dev/null
@@ -1,51 +0,0 @@
-usr/include/qt3/qapp.h
-usr/include/qt3/qarray.h
-usr/include/qt3/qbitarry.h
-usr/include/qt3/qbttngrp.h
-usr/include/qt3/qchkbox.h
-usr/include/qt3/qclipbrd.h
-usr/include/qt3/qcollect.h
-usr/include/qt3/qcollection.h
-usr/include/qt3/qcombo.h
-usr/include/qt3/qconnect.h
-usr/include/qt3/qdatetm.h
-usr/include/qt3/qdrawutl.h
-usr/include/qt3/qdstream.h
-usr/include/qt3/qfiledef.h
-usr/include/qt3/qfiledlg.h
-usr/include/qt3/qfileinf.h
-usr/include/qt3/qfontinf.h
-usr/include/qt3/qfontmet.h
-usr/include/qt3/qgrpbox.h
-usr/include/qt3/qintcach.h
-usr/include/qt3/qiodev.h
-usr/include/qt3/qlcdnum.h
-usr/include/qt3/qlined.h
-usr/include/qt3/qlist.h
-usr/include/qt3/qmenudta.h
-usr/include/qt3/qmetaobj.h
-usr/include/qt3/qmlined.h
-usr/include/qt3/qmsgbox.h
-usr/include/qt3/qmultilinedit.h
-usr/include/qt3/qobjcoll.h
-usr/include/qt3/qobjdefs.h
-usr/include/qt3/qpdevmet.h
-usr/include/qt3/qpmcache.h
-usr/include/qt3/qpntarry.h
-usr/include/qt3/qpopmenu.h
-usr/include/qt3/qprndlg.h
-usr/include/qt3/qprogbar.h
-usr/include/qt3/qprogdlg.h
-usr/include/qt3/qpsprn.h
-usr/include/qt3/qpushbt.h
-usr/include/qt3/qqueue.h
-usr/include/qt3/qradiobt.h
-usr/include/qt3/qrangect.h
-usr/include/qt3/qscrbar.h
-usr/include/qt3/qsocknot.h
-usr/include/qt3/qstack.h
-usr/include/qt3/qtabdlg.h
-usr/include/qt3/qtstream.h
-usr/include/qt3/qvector.h
-usr/include/qt3/qwidcoll.h
-usr/include/qt3/qwindefs.h
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
deleted file mode 100644
index 567f444a3..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
+++ /dev/null
@@ -1,270 +0,0 @@
-usr/include/qt3/private/*
-usr/include/qt3/qabstractlayout.h
-usr/include/qt3/qaccel.h
-usr/include/qt3/qaccessible.h
-usr/include/qt3/qaction.h
-usr/include/qt3/qapplication.h
-usr/include/qt3/qasciicache.h
-usr/include/qt3/qasciidict.h
-usr/include/qt3/qasyncimageio.h
-usr/include/qt3/qasyncio.h
-usr/include/qt3/qbig5codec.h
-usr/include/qt3/qbitarray.h
-usr/include/qt3/qbitmap.h
-usr/include/qt3/qbrush.h
-usr/include/qt3/qbuffer.h
-usr/include/qt3/qbutton.h
-usr/include/qt3/qbuttongroup.h
-usr/include/qt3/qcache.h
-usr/include/qt3/qcanvas.h
-usr/include/qt3/qcdestyle.h
-usr/include/qt3/qcheckbox.h
-usr/include/qt3/qcleanuphandler.h
-usr/include/qt3/qclipboard.h
-usr/include/qt3/qcolor.h
-usr/include/qt3/qcolordialog.h
-usr/include/qt3/qcombobox.h
-usr/include/qt3/qcommonstyle.h
-usr/include/qt3/qcompactstyle.h
-usr/include/qt3/qconnection.h
-usr/include/qt3/qcstring.h
-usr/include/qt3/qcursor.h
-usr/include/qt3/qdatabrowser.h
-usr/include/qt3/qdatastream.h
-usr/include/qt3/qdatatable.h
-usr/include/qt3/qdataview.h
-usr/include/qt3/qdatetime.h
-usr/include/qt3/qdatetimeedit.h
-usr/include/qt3/qdeepcopy.h
-usr/include/qt3/qdesktopwidget.h
-usr/include/qt3/qdial.h
-usr/include/qt3/qdialog.h
-usr/include/qt3/qdict.h
-usr/include/qt3/qdir.h
-usr/include/qt3/qdns.h
-usr/include/qt3/qdockarea.h
-usr/include/qt3/qdockwindow.h
-usr/include/qt3/qdom.h
-usr/include/qt3/qdragobject.h
-usr/include/qt3/qdrawutil.h
-usr/include/qt3/qdropsite.h
-usr/include/qt3/qeditorfactory.h
-usr/include/qt3/qerrormessage.h
-usr/include/qt3/qeucjpcodec.h
-usr/include/qt3/qeuckrcodec.h
-usr/include/qt3/qevent.h
-usr/include/qt3/qeventloop.h
-usr/include/qt3/qfeatures.h
-usr/include/qt3/qfile.h
-usr/include/qt3/qfiledialog.h
-usr/include/qt3/qfileinfo.h
-usr/include/qt3/qfocusdata.h
-usr/include/qt3/qfont.h
-usr/include/qt3/qfontdatabase.h
-usr/include/qt3/qfontdialog.h
-usr/include/qt3/qfontinfo.h
-usr/include/qt3/qfontmetrics.h
-usr/include/qt3/qframe.h
-usr/include/qt3/qftp.h
-usr/include/qt3/qgarray.h
-usr/include/qt3/qgb18030codec.h
-usr/include/qt3/qgbkcodec.h
-usr/include/qt3/qgcache.h
-usr/include/qt3/qgdict.h
-usr/include/qt3/qgeneric.h
-usr/include/qt3/qgif.h
-usr/include/qt3/qglist.h
-usr/include/qt3/qglobal.h
-usr/include/qt3/qgplugin.h
-usr/include/qt3/qgrid.h
-usr/include/qt3/qgridview.h
-usr/include/qt3/qgroupbox.h
-usr/include/qt3/qguardedptr.h
-usr/include/qt3/qgvector.h
-usr/include/qt3/qhbox.h
-usr/include/qt3/qhbuttongroup.h
-usr/include/qt3/qheader.h
-usr/include/qt3/qhgroupbox.h
-usr/include/qt3/qhostaddress.h
-usr/include/qt3/qhttp.h
-usr/include/qt3/qiconset.h
-usr/include/qt3/qiconview.h
-usr/include/qt3/qimage.h
-usr/include/qt3/qimageformatplugin.h
-usr/include/qt3/qinputdialog.h
-usr/include/qt3/qintcache.h
-usr/include/qt3/qintdict.h
-usr/include/qt3/qinterlacestyle.h
-usr/include/qt3/qiodevice.h
-usr/include/qt3/qjiscodec.h
-usr/include/qt3/qjpegio.h
-usr/include/qt3/qjpunicode.h
-usr/include/qt3/qkeycode.h
-usr/include/qt3/qkeysequence.h
-usr/include/qt3/qlabel.h
-usr/include/qt3/qlayout.h
-usr/include/qt3/qlcdnumber.h
-usr/include/qt3/qlibrary.h
-usr/include/qt3/qlineedit.h
-usr/include/qt3/qlistbox.h
-usr/include/qt3/qlistview.h
-usr/include/qt3/qlocale.h
-usr/include/qt3/qlocalfs.h
-usr/include/qt3/qmainwindow.h
-usr/include/qt3/qmap.h
-usr/include/qt3/qmemarray.h
-usr/include/qt3/qmenubar.h
-usr/include/qt3/qmenudata.h
-usr/include/qt3/qmessagebox.h
-usr/include/qt3/qmetaobject.h
-usr/include/qt3/qmime.h
-usr/include/qt3/qmngio.h
-usr/include/qt3/qmotifstyle.h
-usr/include/qt3/qmotifplusstyle.h
-usr/include/qt3/qmovie.h
-usr/include/qt3/qmultilineedit.h
-usr/include/qt3/qmutex.h
-usr/include/qt3/qnamespace.h
-usr/include/qt3/qnetwork.h
-usr/include/qt3/qnetworkprotocol.h
-usr/include/qt3/qnp.h
-usr/include/qt3/qobject.h
-usr/include/qt3/qobjectcleanuphandler.h
-usr/include/qt3/qobjectdefs.h
-usr/include/qt3/qobjectdict.h
-usr/include/qt3/qobjectlist.h
-usr/include/qt3/qpaintdevice.h
-usr/include/qt3/qpaintdevicemetrics.h
-usr/include/qt3/qpainter.h
-usr/include/qt3/qpair.h
-usr/include/qt3/qpalette.h
-usr/include/qt3/qpen.h
-usr/include/qt3/qpicture.h
-usr/include/qt3/qpixmap.h
-usr/include/qt3/qpixmapcache.h
-usr/include/qt3/qplatinumstyle.h
-usr/include/qt3/qpngio.h
-usr/include/qt3/qpoint.h
-usr/include/qt3/qpointarray.h
-usr/include/qt3/qpolygonscanner.h
-usr/include/qt3/qpopupmenu.h
-usr/include/qt3/qprintdialog.h
-usr/include/qt3/qprinter.h
-usr/include/qt3/qprocess.h
-usr/include/qt3/qprogressbar.h
-usr/include/qt3/qprogressdialog.h
-usr/include/qt3/qptrcollection.h
-usr/include/qt3/qptrdict.h
-usr/include/qt3/qptrlist.h
-usr/include/qt3/qptrqueue.h
-usr/include/qt3/qptrstack.h
-usr/include/qt3/qptrvector.h
-usr/include/qt3/qpushbutton.h
-usr/include/qt3/qradiobutton.h
-usr/include/qt3/qrangecontrol.h
-usr/include/qt3/qrect.h
-usr/include/qt3/qregexp.h
-usr/include/qt3/qregion.h
-usr/include/qt3/qrtlcodec.h
-usr/include/qt3/qscrollbar.h
-usr/include/qt3/qscrollview.h
-usr/include/qt3/qsemaphore.h
-usr/include/qt3/qsemimodal.h
-usr/include/qt3/qserversocket.h
-usr/include/qt3/qsession.h
-usr/include/qt3/qsessionmanager.h
-usr/include/qt3/qsettings.h
-usr/include/qt3/qsgistyle.h
-usr/include/qt3/qshared.h
-usr/include/qt3/qsignal.h
-usr/include/qt3/qsignalmapper.h
-usr/include/qt3/qsignalslotimp.h
-usr/include/qt3/qsimplerichtext.h
-usr/include/qt3/qsize.h
-usr/include/qt3/qsizegrip.h
-usr/include/qt3/qsizepolicy.h
-usr/include/qt3/qsjiscodec.h
-usr/include/qt3/qslider.h
-usr/include/qt3/qsocket.h
-usr/include/qt3/qsocketdevice.h
-usr/include/qt3/qsocketnotifier.h
-usr/include/qt3/qsortedlist.h
-usr/include/qt3/qsound.h
-usr/include/qt3/qspinbox.h
-usr/include/qt3/qsplashscreen.h
-usr/include/qt3/qsplitter.h
-usr/include/qt3/qsql.h
-usr/include/qt3/qsqlcursor.h
-usr/include/qt3/qsqldatabase.h
-usr/include/qt3/qsqldriver.h
-usr/include/qt3/qsqldriverplugin.h
-usr/include/qt3/qsqleditorfactory.h
-usr/include/qt3/qsqlerror.h
-usr/include/qt3/qsqlfield.h
-usr/include/qt3/qsqlform.h
-usr/include/qt3/qsqlindex.h
-usr/include/qt3/qsqlpropertymap.h
-usr/include/qt3/qsqlquery.h
-usr/include/qt3/qsqlrecord.h
-usr/include/qt3/qsqlresult.h
-usr/include/qt3/qsqlselectcursor.h
-usr/include/qt3/qstatusbar.h
-usr/include/qt3/qstring.h
-usr/include/qt3/qstringlist.h
-usr/include/qt3/qstrlist.h
-usr/include/qt3/qstrvec.h
-usr/include/qt3/qstyle.h
-usr/include/qt3/qstylefactory.h
-usr/include/qt3/qstyleplugin.h
-usr/include/qt3/qstylesheet.h
-usr/include/qt3/qsyntaxhighlighter.h
-usr/include/qt3/qt.h
-usr/include/qt3/qtabbar.h
-usr/include/qt3/qtabdialog.h
-usr/include/qt3/qtable.h
-usr/include/qt3/qtabwidget.h
-usr/include/qt3/qtextbrowser.h
-usr/include/qt3/qtextcodec.h
-usr/include/qt3/qtextcodecfactory.h
-usr/include/qt3/qtextcodecplugin.h
-usr/include/qt3/qtextedit.h
-usr/include/qt3/qtextstream.h
-usr/include/qt3/qtextview.h
-usr/include/qt3/qthread.h
-usr/include/qt3/qthreadstorage.h
-usr/include/qt3/qtimer.h
-usr/include/qt3/qtl.h
-usr/include/qt3/qtoolbar.h
-usr/include/qt3/qtoolbox.h
-usr/include/qt3/qtoolbutton.h
-usr/include/qt3/qtooltip.h
-usr/include/qt3/qtranslator.h
-usr/include/qt3/qtsciicodec.h
-usr/include/qt3/qurl.h
-usr/include/qt3/qurlinfo.h
-usr/include/qt3/qurloperator.h
-usr/include/qt3/qutfcodec.h
-usr/include/qt3/quuid.h
-usr/include/qt3/qvalidator.h
-usr/include/qt3/qvaluelist.h
-usr/include/qt3/qvaluestack.h
-usr/include/qt3/qvaluevector.h
-usr/include/qt3/qvariant.h
-usr/include/qt3/qvbox.h
-usr/include/qt3/qvbuttongroup.h
-usr/include/qt3/qvfbhdr.h
-usr/include/qt3/qvgroupbox.h
-usr/include/qt3/qwaitcondition.h
-usr/include/qt3/qwhatsthis.h
-usr/include/qt3/qwidget.h
-usr/include/qt3/qwidgetintdict.h
-usr/include/qt3/qwidgetlist.h
-usr/include/qt3/qwidgetplugin.h
-usr/include/qt3/qwidgetstack.h
-usr/include/qt3/qwindowdefs.h
-usr/include/qt3/qwindowsstyle.h
-usr/include/qt3/qwinexport.h
-usr/include/qt3/qwizard.h
-usr/include/qt3/qwmatrix.h
-usr/include/qt3/qworkspace.h
-usr/include/qt3/qxml.h
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install
deleted file mode 100644
index ac62f216d..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-i18n.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/share/qt3/translations/qt_ar.qm
-usr/share/qt3/translations/qt_cs.qm
-usr/share/qt3/translations/qt_de.qm
-usr/share/qt3/translations/qt_es.qm
-usr/share/qt3/translations/qt_fr.qm
-usr/share/qt3/translations/qt_he.qm
-usr/share/qt3/translations/qt_ru.qm
-usr/share/qt3/translations/qt_sk.qm
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-data.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-data.install
deleted file mode 100644
index e58f09b34..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-data.install
+++ /dev/null
@@ -1 +0,0 @@
-../../debian/qtrc etc/qt3/
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs
deleted file mode 100644
index dbd9a5d19..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-README
-README.immodule
-README-QT.TXT
-PLATFORMS
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
deleted file mode 100644
index 67cc0c4c9..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.la
-usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.prl
-usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so
-usr/lib/$(DEB_HOST_MULTIARCH)/libqui.prl
-usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so
-usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/qt-mt.pc
-usr/include/qt3/qgl.h
-usr/include/qt3/qglcolormap.h
-usr/include/qt3/qwidgetfactory.h
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links
deleted file mode 100644
index 50d008c6b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.links
+++ /dev/null
@@ -1,11 +0,0 @@
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.la /usr/share/qt3/lib/libqt-mt.la
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.prl /usr/share/qt3/lib/libqui.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/share/qt3/lib/libqui.so.1.0
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.prl /usr/share/qt3/lib/libqt-mt.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.3.3.8 /usr/share/qt3/lib/libqt-mt.so.3.3
-/usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins /usr/share/qt3/plugins
-/usr/include/qt3 /usr/share/qt3/include
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install
deleted file mode 100644
index 284782279..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-ibase.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlibase.so
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install
deleted file mode 100644
index 43c82fd7b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-mysql.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlmysql.so
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install
deleted file mode 100644
index 202c0fff1..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-odbc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlodbc.so
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install
deleted file mode 100644
index cf2800373..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-psql.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlpsql.so
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install
deleted file mode 100644
index f65aac492..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlite.so
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install
deleted file mode 100644
index 8c5a97c4b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-sqlite3.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/sqldrivers/libqsqlite3.so
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs
deleted file mode 100644
index dbd9a5d19..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-README
-README.immodule
-README-QT.TXT
-PLATFORMS
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install
deleted file mode 100644
index b0c767003..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/libqt-mt.so.*
-usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.*
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/imageformats/libqmng.so
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/inputmethods/*.so
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links
deleted file mode 100644
index abaab3c97..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1.0.0 /usr/lib/$(DEB_HOST_MULTIARCH)/libqui.so.1
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm
deleted file mode 100644
index 5f09e318d..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt.postrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "purge" ]; then
- if [ -d "/usr/share/doc/libqt3-mt/" ]; then
- rm -rf /usr/share/doc/libqt3-mt/
- fi
-fi
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop
deleted file mode 100644
index 42a16e80e..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/maintain/assistant-qt3.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=assistant-qt3
-Name=Qt3 Assistant
-Name[de]=Qt3 Assistent
-Comment=Qt3 Helpcenter
-Comment[de]= Qt3 Hilfezentrum
-MimeType=application/x-assistant;
-Icon=assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh b/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh
deleted file mode 100644
index b56d51e42..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/maintain/build-examples.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-BUILDDIR=$PWD
-export QTDIR=/usr/share/qt3
-
-# first copy over the libqt-mt.so build configuration of .qmake.cache
-cp /usr/share/qt3/.qmake.cache ./.qmake.cache
-
-# Now compile the examples. The themes example
-# won't work since qconfig.h is not really correct with the
-# ifdef's for the QT_NO_xyz_STYLE, so we use make -k to continue
-cd examples; qmake -o Makefile examples.pro; make -k
-
-# Now compile the tutorial.
-cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make
-
-# Then the designer examples.
-cd $BUILDDIR/tools/designer/examples
-for a in `find . -type d -maxdepth 1 -mindepth 1`; do
- cd $a && qmake -o Makefile $a.pro; make; cd ..;
-done
-
-# There is a bigger sql example in book/ with more subdirectories:
-cd book
-for a in `find . -type d -maxdepth 1 -mindepth 1`; do
- cd $a && qmake -o Makefile $a.pro; make; cd ..;
-done
-
-# Finally, build the linguist tutorials:
-cd $BUILDDIR/tools/linguist/tutorial
-for a in `find . -type d -maxdepth 1 -mindepth 1`; do
- cd $a && qmake -o Makefile $a.pro; make; cd ..;
-done
-
-# Return to the build directory
-cd $BUILDDIR
diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop
deleted file mode 100644
index fc9f4394c..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/maintain/designer-qt3.desktop
+++ /dev/null
@@ -1,77 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=designer-qt3
-Name=Qt3 Designer
-Name[bg]=Qt3 Дизайнер
-Name[br]=Ergrafer Qt3
-Name[ca]=Dissenyador Qt3
-Name[cs]=Qt3 designer
-Name[de]=Qt3-Designer
-Name[eo]=Qt3-Desegnilo
-Name[es]=Diseñador Qt3
-Name[et]=Qt3 disainer
-Name[eu]=Qt3 Diseinatzailea
-Name[gl]=Deseñador de Qt3
-Name[he]=Qt בצעמ
-Name[it]=Designer Qt3
-Name[ja]=Qtデザイナー
-Name[ko]=Qt 디자이너
-Name[lv]=Qt3 Dizainers
-Name[mk]=Qt дизајнер
-Name[no]=Qt3-designer
-Name[oc]=Dessinador Qt3
-Name[pl]=Projektant Qt3
-Name[sk]=Qt3 Dizajnér
-Name[sl]=Snovalnik Qt3
-Name[ta]=Qt À¨¼ôÀ¡Ç÷
-Name[uk]=Дизайнер Qt
-Name[zh_CN.GB2312]=Qt 设计者
-Name[zh_TW.Big5]=Qt 設計器
-Comment=Qt3 interface designer
-Comment[az]=Qt3 axtar üz dizayn proqramı
-Comment[bg]=Qt3 interface дизайнер
-Comment[br]=Ergrafer etrefas Qt3
-Comment[ca]=Dissenyador d'interfícies Qt3
-Comment[cs]=Editor UI pro Qt3
-Comment[da]=Qt3 grænseflade designer
-Comment[de]=Schnittstellen-Designer für Qt3
-Comment[el]=Σχεδιασμός περιβάλλοντων Qt
-Comment[eo]=Qt3-Interfacdesegnilo
-Comment[es]=Diseñador de interfaces de Qt3
-Comment[et]=Qt3 dialoogide redaktor
-Comment[eu]=Qt3 interfaze diseinatzailea
-Comment[fi]=Qt:n käyttöliittymäsuunnittelija
-Comment[fr]=Conception d'interfaces avec Qt3
-Comment[gl]=Editor de interfaces de Qt3
-Comment[he]=Qt-ל םיקשממ בצעמ
-Comment[hu]=Qt3 felülettervező
-Comment[is]=Viðmótshönnunartól fyrir Qt3
-Comment[it]=Editor per le interfaccie Qt3
-Comment[ja]=Qtインターフェースデザイナー
-Comment[ko]=Qt 인터페이스 디자이너
-Comment[lt]=Qt3 sąsajos redaktorius
-Comment[lv]=Qt3 starsejas dizainers
-Comment[mk]=Дизајнер на Qt дијалози
-Comment[nl]=Qt3 interface-ontwerper
-Comment[no]=Qt3-grensesnittdesigner
-Comment[no_NY]=Redigering av Qt3-miljø
-Comment[oc]=Dessinador d'interfacies Qt3
-Comment[pl]=Projektant interfejsu Qt3
-Comment[pt]=Editor de interfaces do Qt3
-Comment[pt_BR]=Designer de interface Qt3
-Comment[ro]=Dezvoltator de interfeţe Qt3
-Comment[ru]=редактор интерфейсов приложений Qt
-Comment[sk]=Qt3 dizajnér rozhrania
-Comment[sl]=Snovalnik vmesnikov za Qt3
-Comment[sr]=Dizajner Qt3 interfejsa
-Comment[sv]=Editor för gränssnitt till Qt3
-Comment[ta]=Qt À¨¼ôÀ¡Ç÷
-Comment[tr]=Qt3 arayüz tasarım programı
-Comment[uk]=Редактор інтерфейсу для Qt
-Comment[zh_CN.GB2312]=Qt 界面设计程序
-Comment[zh_TW.Big5]=Qt 介面編輯器
-MimeType=application/x-designer;
-Icon=designer
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop
deleted file mode 100644
index e0094dbd4..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/maintain/linguist-qt3.desktop
+++ /dev/null
@@ -1,25 +0,0 @@
-[Desktop Entry]
-Exec=linguist-qt3
-Name=Qt3 Linguist
-Name[de]=Qt3-Linguist
-Name[eo]=Qt3-Lingvisto
-Name[es]=Lingüista Qt3
-Name[ko]=Qt 언어학자
-Name[lv]=Qt3 Lingvists
-Comment=Tool for translating message catalogues of Qt3 based programs
-Comment[da]=Redskab til at oversætte Qt3 baserede programmer
-Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf Qt3 basieren
-Comment[eo]=Ilo por tradukado de mesaĝaroj de Qt3-bazitaj programoj
-Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en Qt3
-Comment[he]=Qt תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
-Comment[hu]=Segédprogram a Qt3-alapú programok üzenetfájljainak lefordításához
-Comment[ko]=Qt를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
-Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz Qt3 bāzētās programmās
-Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
-Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do Qt3
-Comment[sv]=Verktyg för att översätta meddelandekataloger från Qt3-baserade program
-MimeType=application/x-linguist;
-Terminal=false
-Icon=linguist
-Type=Application
-Categories=Qt;Development
diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh b/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh
deleted file mode 100644
index 609a44bc1..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/maintain/mkpatch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff
diff --git a/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop b/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop
deleted file mode 100644
index 22d0ca6a5..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/maintain/qt3config.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=qtconfig-qt3
-Name=Qt3 Configuration
-Name[de]=Qt3 Konfiguration
-Comment=A graphical configuration tool for programs using Qt 3
-Comment[de]=Ein grafisches Konfigurationstool für Qt3-Programme
-MimeType=application/x-qtconfig;
-Terminal=false
-Icon=qtconfig
-Type=Application
-Categories=Qt;Settings;
diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff b/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff
deleted file mode 100644
index a3d74ffce..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/patches/06_disable_rpath.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-author: Martin Loschwitz <madkiss@madkiss.org>
-
-Disables the rpath settings in qmake.conf
-
-Index: b/mkspecs/linux-g++/qmake.conf
-===================================================================
---- a/mkspecs/linux-g++/qmake.conf
-+++ b/mkspecs/linux-g++/qmake.conf
-@@ -55,7 +55,7 @@
- QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME = -Wl,-soname,
- QMAKE_LFLAGS_THREAD =
--QMAKE_RPATH = -Wl,-rpath,
-+QMAKE_RPATH =
-
- QMAKE_LIBS = -luuid
- QMAKE_LIBS_DYNLOAD = -ldl
-Index: b/mkspecs/linux-g++-64/qmake.conf
-===================================================================
---- a/mkspecs/linux-g++-64/qmake.conf
-+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -58,7 +58,7 @@
- QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
- QMAKE_LFLAGS_SONAME = -Wl,-soname,
- QMAKE_LFLAGS_THREAD =
--QMAKE_RPATH = -Wl,-rpath,
-+QMAKE_RPATH =
-
- QMAKE_LIBS = -luuid
- QMAKE_LIBS_DYNLOAD = -ldl
diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff b/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff
deleted file mode 100644
index 538e93044..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/patches/09_amd64_lib64.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/mkspecs/linux-g++-64/qmake.conf
-+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T
- QMAKE_INCDIR =
- QMAKE_LIBDIR =
- QMAKE_INCDIR_X11 = /usr/X11R6/include
--QMAKE_LIBDIR_X11 = /usr/X11R6/lib64
-+QMAKE_LIBDIR_X11 = /usr/X11R6/lib
- QMAKE_INCDIR_QT = $(QTDIR)/include
- QMAKE_LIBDIR_QT = $(QTDIR)/lib64
- QMAKE_INCDIR_OPENGL = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64
-+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-
- QMAKE_LINK = g++
- QMAKE_LINK_SHLIB = g++
diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff b/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
deleted file mode 100644
index b4e71d35b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/patches/72_dont_trust_uname-m_use_dpkg-arch_instead.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-author: Sune Vuorela <debian@pusling.com>
-
---- a/configure
-+++ b/configure
-@@ -34,7 +34,44 @@ SUPPORTED=
- #-------------------------------------------------------------------------------
-
- # need that throughout the script
--UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown
-+case $DPKG_ARCH in
-+ amd64)
-+ UNAME_MACHINE="x86_64"
-+ ;;
-+ arm)
-+ UNAME_MACHINE="armv4l"
-+ ;;
-+ armel)
-+ UNAME_MACHINE="armv5tel"
-+ ;;
-+ hppa)
-+ UNAME_MACHINE="parisc64"
-+ ;;
-+ hurd-i386)
-+ UNAME_MACHINE="i686-AT386"
-+ ;;
-+ i386)
-+ UNAME_MACHINE="i686"
-+ ;;
-+ kfreebsd-amd64)
-+ UNAME_MACHINE="x86_64"
-+ ;;
-+ kfreebsd-i386)
-+ UNAME_MACHINE="i586"
-+ ;;
-+ mipsel)
-+ UNAME_MACHINE="mips"
-+ ;;
-+ powerpc)
-+ UNAME_MACHINE="ppc"
-+ ;;
-+ *)
-+ UNAME_MACHINE="$DPKG_ARCH"
-+ ;;
-+
-+
-+esac
- UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
diff --git a/ubuntu/_base/dependencies/qt3/debian/patches/series b/ubuntu/_base/dependencies/qt3/debian/patches/series
deleted file mode 100644
index e6bdb92af..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-06_disable_rpath.diff
-09_amd64_lib64.diff
-72_dont_trust_uname-m_use_dpkg-arch_instead.diff
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install
deleted file mode 100644
index 30fd28dce..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.*
-usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.*
-usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.*
-usr/include/qt3/qassistantclient.h
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links b/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links
deleted file mode 100644
index 04098d9bd..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-apps-dev.links
+++ /dev/null
@@ -1,8 +0,0 @@
-/usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.prl /usr/share/qt3/lib/libeditor.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libeditor.a /usr/share/qt3/lib/libeditor.a
-/usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.prl /usr/share/qt3/lib/libdesignercore.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libdesignercore.a /usr/share/qt3/lib/libdesignercore.a
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.prl /usr/share/qt3/lib/libqassistantclient.prl
-/usr/lib/$(DEB_HOST_MULTIARCH)/libqassistantclient.a /usr/share/qt3/lib/libqassistantclient.a
-/usr/include/qt3 /usr/share/qt3/tools/designer/editor
-/usr/include/qt3 /usr/share/qt3/tools/designer/interfaces
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install
deleted file mode 100644
index 4ca90e4b7..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/assistant
-usr/share/qt3/doc/html/assistant*html
-usr/share/qt3/doc/html/assistant*dcf
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links
deleted file mode 100644
index 6d9889d21..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/assistant-qt3 /usr/share/qt3/bin/assistant
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu
deleted file mode 100644
index 1b4c81243..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(qt3-assistant):\
- needs="x11"\
- section="Applications/Programming"\
- hints="TDE"\
- title="Qt3 Assistant"\
- command="/usr/bin/assistant-qt3"
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst
deleted file mode 100644
index 137ecd777..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/assistant assistant "/usr/bin/assistant-qt3" "45" \
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm
deleted file mode 100644
index 9bcf8c713..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-assistant.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove assistant "/usr/bin/assistant-qt3"
- ;;
-esac
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer-plugins.install b/ubuntu/_base/dependencies/qt3/debian/qt3-designer-plugins.install
deleted file mode 100644
index 96c6ff294..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer-plugins.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins/designer/*
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install
deleted file mode 100644
index 56064e08f..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/designer
-usr/bin/createcw
-usr/bin/conv2ui
-usr/share/qt3/templates/*
-usr/share/qt3/doc/html/designer*html
-usr/share/qt3/doc/html/designer*dcf
-usr/share/qt3/doc/html/designer*jpg
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links
deleted file mode 100644
index d25356b76..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/designer-qt3 /usr/share/qt3/bin/designer
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu
deleted file mode 100644
index 9b15d7bb5..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(qt3-designer):\
- needs="x11"\
- section="Applications/Programming"\
- hints="TDE"\
- title="Qt3 Designer"\
- command="/usr/bin/designer-qt3"
-
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst
deleted file mode 100644
index 147bf1bf8..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/designer designer "/usr/bin/designer-qt3" "45" \
- --slave /usr/share/man/man1/designer.1.gz designer.1.gz \
- "/usr/share/man/man1/designer-qt3.1.gz"
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm
deleted file mode 100644
index c66496fd1..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-designer.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove designer "/usr/bin/designer-qt3"
- ;;
-esac
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install
deleted file mode 100644
index ce6f037cc..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-compat.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/bin/qtrename140
-usr/bin/qm2ts
-usr/bin/mergetr
-usr/bin/findtr
-usr/bin/msg2qm
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install
deleted file mode 100644
index 2954f7a4c..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/makeqpf
-usr/bin/qvfb
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links
deleted file mode 100644
index feacdd2c4..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools-embedded.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin/makeqpf /usr/share/qt3/bin/makeqpf
-/usr/bin/qvfb /usr/share/qt3/bin/qvfb
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install
deleted file mode 100644
index 57f9636e5..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/share/qt3/mkspecs/*
-usr/share/qt3/doc/html/qmake*html
-usr/share/qt3/doc/html/qmake*dcf
-usr/bin/qmake
-usr/bin/lupdate
-usr/bin/lrelease
-usr/bin/uic
-usr/bin/moc
-usr/bin/qembed
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links
deleted file mode 100644
index 3a9ee784c..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.links
+++ /dev/null
@@ -1,7 +0,0 @@
-/usr/share/qt3/mkspecs/linux-g++ /usr/share/qt3/mkspecs/default
-/usr/bin/qmake-qt3 /usr/share/qt3/bin/qmake
-/usr/bin/lupdate-qt3 /usr/share/qt3/bin/lupdate
-/usr/bin/lrelease-qt3 /usr/share/qt3/bin/lrelease
-/usr/bin/uic-qt3 /usr/share/qt3/bin/uic
-/usr/bin/moc-qt3 /usr/share/qt3/bin/moc
-/usr/bin/qembed /usr/share/qt3/bin/qembed
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst
deleted file mode 100644
index 70ca043fe..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.postinst
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/moc moc "/usr/bin/moc-qt3" "45" \
- --slave /usr/share/man/man1/moc.1.gz moc.1.gz \
- "/usr/share/man/man1/moc-qt3.1.gz"
-
-update-alternatives --install \
- /usr/bin/uic uic "/usr/bin/uic-qt3" "45" \
- --slave /usr/share/man/man1/uic.1.gz uic.1.gz \
- "/usr/share/man/man1/uic-qt3.1.gz"
-
-update-alternatives --install \
- /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt3" "45" \
- --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \
- "/usr/share/man/man1/lupdate-qt3.1.gz"
-
-update-alternatives --install \
- /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt3" "45" \
- --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \
- "/usr/share/man/man1/lrelease-qt3.1.gz"
-
-update-alternatives --install \
- /usr/bin/qmake qmake "/usr/bin/qmake-qt3" "45" \
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm
deleted file mode 100644
index 3db3df44b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-dev-tools.prerm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove moc "/usr/bin/moc-qt3"
- update-alternatives --remove uic "/usr/bin/uic-qt3"
- update-alternatives --remove lupdate "/usr/bin/lupdate-qt3"
- update-alternatives --remove lrelease "/usr/bin/lrelease-qt3"
- update-alternatives --remove qmake "/usr/bin/qmake-qt3"
- ;;
-esac
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base
deleted file mode 100644
index 7a11cb2dc..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.doc-base
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: qt3-doc
-Title: Qt Reference Documentation
-Author: Troll Tech, The TDE Team
-Abstract: Qt (TM) is a multi-platform C++ GUI toolkit. It is a product of
- Troll Tech. It is supported on all major variants of Microsoft Windows and
- Unix/X Windows.
-Section: Apps/Programming
-
-Format: HTML
-Index: /usr/share/doc/qt3-doc/html/index.html
-Files: /usr/share/doc/qt3-doc/html/*.html
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs
deleted file mode 100644
index f08fd0f02..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-FAQ
-README-QT.TXT
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links b/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links
deleted file mode 100644
index e8b1a344c..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-doc.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/man/man3 /usr/share/qt3/doc/man/man3
-/usr/share/qt3/doc/html /usr/share/doc/qt3-doc/html
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install
deleted file mode 100644
index ff9ac89a1..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/linguist
-usr/share/qt3/phrasebooks/*
-usr/share/qt3/doc/html/linguist*html
-usr/share/qt3/doc/html/linguist*dcf
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links
deleted file mode 100644
index be3092258..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/linguist-qt3 /usr/share/qt3/bin/linguist
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu
deleted file mode 100644
index ebd7e43b7..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.menu
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(qt3-linguist):\
- needs="x11"\
- section="Applications/Programming"\
- hints="TDE"\
- title="Qt3 Linguist"\
- command="/usr/bin/linguist-qt3"
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst
deleted file mode 100644
index ed27c328b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/linguist linguist "/usr/bin/linguist-qt3" "45" \
- --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \
- "/usr/share/man/man1/linguist-qt3.1.gz"
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm
deleted file mode 100644
index 74b010627..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-linguist.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove linguist "/usr/bin/linguist-qt3"
- ;;
-esac
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install
deleted file mode 100644
index 8fcee756b..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/qtconfig
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links
deleted file mode 100644
index 9a168aec4..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/qtconfig-qt3 /usr/share/qt3/bin/qtconfig
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu
deleted file mode 100644
index c8b243496..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.menu
+++ /dev/null
@@ -1,8 +0,0 @@
-?package(qt3-qtconfig):\
- needs="x11"\
- section="Applications/System/Administration"\
- title="Qt3 Config"\
- longtitle="Qt3 Configuration Utility"\
- hints="Qt3 config tool"\
- command="/usr/bin/qtconfig-qt3"
-
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst
deleted file mode 100644
index be89a0151..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --install \
- /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-qt3" "45" \
- --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \
- "/usr/share/man/man1/qtconfig-qt3.1.gz"
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm b/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm
deleted file mode 100644
index 3985383b4..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt3-qtconfig.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- upgrade) ;;
- remove|failed-upgrade|deconfigure)
- update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt3"
- ;;
-esac
-
-#DEBHELPER#
diff --git a/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc b/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc
deleted file mode 100644
index 9fb7f9711..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qt_plugins_3.3rc
+++ /dev/null
@@ -1,4 +0,0 @@
-[usr]
-lib/trinity/plugins/styles/plastik.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-09-29T20:06:31^e
-lib/qt3/plugins/imageformats/libqmng.so=30306^e3^ei686 Linux g++-4.* full-config^e2006-08-25T18:22:18^e
-
diff --git a/ubuntu/_base/dependencies/qt3/debian/qtrc b/ubuntu/_base/dependencies/qt3/debian/qtrc
deleted file mode 100644
index 4f44006ae..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/qtrc
+++ /dev/null
@@ -1,28 +0,0 @@
-[General]
-GUIEffects=general^eanimatecombo^e
-embedFonts=true
-enableXft=true
-font=Sans Serif,9,-1,5,50,0,0,0,0,0
-fontPath=\0
-useXft=true
-style=Plastik
-
-[KDE]
-contrast=7
-
-[KWinPalette]
-activeBackground=#1f26ad
-activeBlend=#259bb8
-activeForeground=#ffffff
-activeTitleBtnBg=#e6e6e6
-frame=#efefef
-inactiveBackground=#cdcdcd
-inactiveBlend=#ababab
-inactiveForeground=#dddddd
-inactiveFrame=#efefef
-inactiveTitleBtnBg=#ebebeb
-
-[Palette]
-active=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
-disabled=#808080^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#c7c7c7^e#ffffff^e#808080^e#ffffff^e#efefef^e#000000^e#567594^e#ffffff^e#0000ee^e#52188b^e
-inactive=#000000^e#dddfe4^e#ffffff^e#ffffff^e#555555^e#c7c7c7^e#000000^e#ffffff^e#000000^e#ffffff^e#efefef^e#000000^e#678db2^e#ffffff^e#0000ee^e#52188b^e
diff --git a/ubuntu/_base/dependencies/qt3/debian/rules b/ubuntu/_base/dependencies/qt3/debian/rules
deleted file mode 100755
index 8666bebc4..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/rules
+++ /dev/null
@@ -1,496 +0,0 @@
-#!/usr/bin/make -f
-
-# build variables
-export QTDIR=$(shell pwd)
-
-# re-set $(LD_LIBRARY_PATH)
-OLD_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
-export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH)
-
-# fix path
-OLD_PATH := $(PATH)
-export PATH=$(QTDIR)/bin:$(OLD_PATH)
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-ifeq ($(DEB_HOST_ARCH_OS),hurd)
- PLATFORM_ARG = hurd-g++
-else #hurd
-ifeq ($(DEB_HOST_ARCH),sparc)
- PLATFORM_ARG = linux-g++-sparc
-else #sparc
- PLATFORM_ARG = linux-g++
-endif #sparc
-endif #hurd
-
-# quilt stuff
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-# build variables (directorys)
-DEBIAN = $(shell pwd)/debian
-P_LIBS = $(DEBIAN)/libqt3-mt
-P_DOC = $(DEBIAN)/qt3-doc
-P_APPSDEV = $(DEBIAN)/qt3-apps-dev
-P_HEADERS = $(DEBIAN)/libqt3-headers
-P_QTMTDEV = $(DEBIAN)/libqt3-mt-dev
-
-TMP_INSTALL = $(DEBIAN)/tmp-install
-
-CONFIGURE_OPTS = \
- -prefix "/usr" \
- -sysconfdir "/etc/qt3" \
- -datadir "/usr/share/qt3" \
- -headerdir "/usr/include/qt3" \
- -docdir "/usr/share/qt3/doc" \
- -libdir "/usr/lib/$(DEB_HOST_MULTIARCH)" \
- -plugindir "/usr/lib/$(DEB_HOST_MULTIARCH)/qt3/plugins" \
- -translationdir "/usr/share/qt3/translations" \
- \
- -thread \
- -shared \
- -fast \
- -no-exceptions \
- -platform $(PLATFORM_ARG) \
- \
- -nis \
- -no-pch \
- -cups \
- -stl \
- -ipv6 \
- \
- -sm \
- -xshape \
- -xinerama \
- -xcursor \
- -xrandr \
- -xrender \
- -xft \
- -tablet \
- -xkb \
- \
- -system-zlib \
- -system-libpng \
- -system-libmng \
- -system-libjpeg \
- -system-nas-sound \
- \
- -enable-opengl \
- -dlopen-opengl \
- \
- -qt-gif \
- -qt-imgfmt-png \
- -qt-imgfmt-jpeg \
- -plugin-imgfmt-mng \
- \
- -plugin-sql-odbc \
- -plugin-sql-psql \
- -plugin-sql-mysql \
- -plugin-sql-ibase \
- -plugin-sql-sqlite \
- -plugin-sql-sqlite3 \
- \
- -I/usr/include/mysql \
- -I/usr/include/freetype2 \
- -I`pg_config --includedir` \
- -I`pg_config --includedir-server` \
- -L/usr/lib/$(DEB_HOST_MULTIARCH)\
- \
- -lfontconfig \
- -inputmethod \
- -glibmainloop \
- # End of CONFIGURE_OPTS
-
-interbase_archs := i386 amd64 sparc powerpc
-ifneq ($(DEB_HOST_ARCH_CPU),$(findstring $(DEB_HOST_ARCH_CPU),$(interbase_archs)))
- CONFIGURE_OPTS += -no-sql-ibase
- IBASE = -Nlibqt3-mt-ibase
-else
- IBASE =
-endif
-
-ifeq ($(DEB_HOST_ARCH_OS),hurd)
- CONFIGURE_OPTS += -no-sql-ibase
- IBASE = -Nlibqt3-mt-ibase
-endif
-
-ifeq ($(DEB_HOST_ARCH),arm)
- CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
-endif
-
-post-patches::
- dh_testdir
-
-build build-arch: libqt-thread-stamp
-build-indep:
-
- touch build-stamp
-
-libqt-thread-stamp: post-patches
-
- @echo "QTDIR is ${QTDIR}"
-
- dh_testdir
-
- echo yes | ./configure $(CONFIGURE_OPTS)
-
- rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
- ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
- ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
- ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
-
- # proceed
- $(MAKE) sub-src sub-plugins sub-tools
- $(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
- $(MAKE) INSTALL_ROOT=$(TMP_INSTALL) install
- $(MAKE) INSTALL_ROOT=$(TMP_INSTALL) plugins-install
-
- # archives get accidentally stripped by make install. Copy over unstripped ones for now.
- -cp lib/lib*.a $(TMP_INSTALL)/usr/lib/
-
- cp bin/qtrename140 $(TMP_INSTALL)/usr/bin/
- cp bin/findtr $(TMP_INSTALL)/usr/bin/
-
- # build conv2ui
- cd tools/designer/tools/conv2ui && $(MAKE)
- cp bin/conv2ui $(TMP_INSTALL)/usr/bin/conv2ui
-
- # build qvfb
- cd tools/qvfb/ && $(MAKE)
- cp tools/qvfb/qvfb $(TMP_INSTALL)/usr/bin/qvfb
-
- # install qmake.cache file
- install -d $(P_QTMTDEV)/usr/share/qt3/
- cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache
-
- # install qconfig.h for the mt
- install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
- install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h
-
- install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h
- install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h
- install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h
-
- touch libqt-thread-stamp
-
-clean::
-
- dh_testdir
-
- -rm -rf debian/patched
- -rm -rf build-stamp libqt-thread-stamp
-
- -chmod -R u+w *
- -chmod a-x doc/html/layout?.png
-
- if [ -f "src/Makefile" ]; then \
- $(MAKE) -C src clean; $(MAKE) -C plugins/src distclean; $(MAKE) -C tools distclean; \
- $(MAKE) -C tools/makeqpf distclean; $(MAKE) -C tools/qconfig distclean; $(MAKE) -C tools/qvfb distclean; \
- $(MAKE) -C tools/msg2qm distclean; $(MAKE) -C tools/mergetr distclean; $(MAKE) -C tools/qembed distclean; \
- $(MAKE) -C tools/designer/tools/conv2ui distclean; $(MAKE) -C tools/designer/tools/createcw distclean; \
- $(MAKE) -C tools/designer/plugins/glade distclean; $(MAKE) -C tools/designer/plugins/qglwidget distclean; \
- $(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \
- fi
-
- -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \
- config.status bin/moc bin/qmake src/moc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \
- src/tools/qconfig.cpp include/qconfig.h include/qmodules.h plugins/accessibleqtwidgets.prl \
- config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \
- config.tests/unix/ptrsize/ptrsizetest config.tests/unix/endian/endiantest.o \
- config.tests/unix/endian/endiantest lib/qt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \
- extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
-
- rm -f qmake/*o
- rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
- rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so
- rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o
-
- # delete generated Makefiles but save the toplevel Makefile
- -mv Makefile Makefile.save
- for a in `find . -name 'Makefile'`; do rm -f "$$a"; done
- -mv Makefile.save Makefile
-
- cd examples/ && find . -name '.obj' | xargs rm -rf
-
- # revert multi-arch path in install files
- for a in debian/*install debian/*links; do \
- [ ! -f $$a.arch ] || \
- mv $$a.arch $$a; \
- done
-
- dh_clean
-
-install: build
-
- dh_testdir
- dh_testroot
-
- dh_clean -i
- dh_installdirs
-
- # update multi-arch path in install files
- for a in debian/*install debian/*links; do \
- [ -d $$a ] || [ -f $$a.arch ] || \
- sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
- done
-
- # fix .prl files
- for a in $(TMP_INSTALL)/usr/lib/$(DEB_HOST_MULTIARCH)/*prl; do cat "$$a" | sed \
- "s#$(QTDIR)#/usr/share/qt3#g" > "$$a".new && mv "$$a".new "$$a"; done
-
- dh_install $(IBASE) --sourcedir=$(TMP_INSTALL)
-
- ## build qt3-doc package
- # copy all docs there first
- install -d $(P_DOC)/usr/share/qt3/doc/html/
- for a in `cd $(TMP_INSTALL)/usr/share/qt3/doc/html/ && find`; do cp $(TMP_INSTALL)/usr/share/qt3/doc/html/"$$a" $(P_DOC)/usr/share/qt3/doc/html/; done
- #typo bugfix
- sed -i -e 's/reveives/receives/' $(P_DOC)/usr/share/qt3/doc/html/qwidget.html
-
- ## build designer package documentation
- # qt3-designer
- install -d `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/
- for a in `cat doc/html/designer*.html doc/html/designer*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
- perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
- sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/ && \
- rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done
- rm -rf outputfile `pwd`/debian/qt3-designer/usr/share/qt3/doc/html/logo32.png
- rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/designer*
-
- ## build linguist package documentation
- # qt3-linguist
- install -d `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/
- for a in `cat doc/html/linguist*.html doc/html/linguist*.dcf | grep png | sed 's/^.*src=\"\([^\"]+\)\".*$$/\1/' | \
- perl -pe 's#<\?p[^>]+>##' | tee outputfile | perl -ne '/<img [^>]*(src=\"[^"]+\")/; print $$1' | \
- sed 's/src=//g' | sed 's/"/ /g'`; do cp doc/html/"$$a" `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/ && \
- rm -rf $(P_DOC)/usr/share/qt3/doc/html/"$$a" || true; done
- rm -rf outputfile `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html/logo32.png
- rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/linguist*
-
- ## qt3-assistant
- # remove docs from qt3-doc for qt-assistant
- rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/assistant*
-
- ## all packages
- # install the overrides files
- #for a in debian/overrides/*; do install -d debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides; done
- #for a in debian/overrides/*; do cp "$$a" debian/`echo "$$a" | sed 's/debian\/overrides\///g'`/usr/share/lintian/overrides/`echo "$$a" | sed 's/debian\/overrides\///g'`; done
-
- chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/aix-g++-64/qplatformdefs.h
- chmod 644 debian/qt3-dev-tools/usr/share/qt3/mkspecs/macx-pbuilder/Info.plist.app
-
-binary-indep: build install
-
- # Build architecture-independent files here.
- dh_testdir
- dh_testroot
-
- dh_installdocs -i -XREADME.Debian
- dh_installchangelogs -i changes-3.3.8
- dh_installchangelogs -i changes-3.3.8b
-
- find doc/man -path \*/CVS -prune -o -print | cpio -pmd $(P_DOC)/usr/share/qt3/doc/
-
- -rm -f `find $(P_DOC)/usr/share/qt3/doc/ -name "*.o"`
- find $(P_DOC) -type f -perm +0100 | xargs --no-run-if-empty rm -f
-
- install -d $(P_DOC)/usr/share/man/man3/
-
- for i in $(P_DOC)/usr/share/qt3/doc/doc/man/man3/* ; do mv $$i $(P_DOC)/usr/share/man/man3/ ; done
-
- -rm -rf $(P_DOC)/usr/share/qt3/doc/doc
-
- # other i18n files
- for a in `cd translations/ && find . -name 'qt_*.qm' | sed 's/qt_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
- install -m644 -D `pwd`/translations/qt_"$$a".qm `pwd`/debian/libqt3-i18n/usr/share/qt3/translations/qt_"$$a".qm; done
-
- # logo32.png
- cp `pwd`/doc/html/logo32.png `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/
-
- # remove qmake html docu from qt3-doc
- rm -rf `pwd`/debian/qt3-doc/usr/share/qt3/doc/html/qmake*
-
- # create examples package
- install -d `pwd`/debian/doc/qt3-examples/tools/designer
- install -d `pwd`/debian/doc/qt3-examples/tools/linguist
- cp -ax examples `pwd`/debian/doc/qt3-examples
- cp -ax tutorial `pwd`/debian/doc/qt3-examples
- cp -ax tools/designer/examples `pwd`/debian/doc/qt3-examples/tools/designer/
- cp -ax tools/linguist/tutorial `pwd`/debian/doc/qt3-examples/tools/linguist/
- for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt1'`; do rm -f "$$a"; done
- for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt2'`; do rm -f "$$a"; done
- for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'tt3'`; do rm -f "$$a"; done
- for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name '.moc'`; do rm -rf "$$a"; done
- for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name '.obj'`; do rm -rf "$$a"; done
- for a in `cd $(DEBIAN)/doc/qt3-examples/ && find $(DEBIAN)/doc/qt3-examples/ -name 'Makefile'`; do rm -f "$$a"; done
- install -D `pwd`/debian/maintain/build-examples.sh `pwd`/debian/doc/qt3-examples/build-examples
- chmod 755 `pwd`/debian/doc/qt3-examples/build-examples
- cd `pwd`/debian/doc/ && tar cvvfz qt3-examples.tar.gz qt3-examples/
- install -D `pwd`/debian/doc/qt3-examples.tar.gz `pwd`/debian/qt3-examples/usr/share/doc/qt3-examples/qt3-examples.tar.gz
-
- # proceed
- dh_compress -i -Xhtml/
- dh_link -i
-
- dh_fixperms -i
- dh_installdeb -i
-
- dh_perl -i
- dh_shlibdeps -i
-
- # fix shlibdeps madness
- for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done
-
- dh_gencontrol -i
- dh_md5sums -i
-
- dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
-
-binary-arch: build install
-
- dh_testdir
- dh_testroot
- dh_installdirs -a
-
- ## create qt3-apps-dev-package
- install -d $(P_APPSDEV)/usr/include/qt3/
- cp `pwd`/tools/designer/interfaces/*.h $(P_APPSDEV)/usr/include/qt3/
- cp `pwd`/tools/designer/editor/*.h $(P_APPSDEV)/usr/include/qt3/
- rm -rf `pwd`/debian/qt3-apps-dev/usr/include/qt3/preferences.ui.h
-
- ## qvfb package
- install -m644 -D `pwd`/tools/qvfb/pda.skin `pwd`/debian/qt3-dev-tools-embedded/etc/qt3/qvfb/pda.skin
- install -m644 -D `pwd`/tools/qvfb/pda_down.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_down.png
- install -m644 -D `pwd`/tools/qvfb/pda_up.png `pwd`/debian/qt3-dev-tools-embedded/usr/share/qvfb/pda_up.png
-
- # remove utterly ugle symlink
- rm -rf `pwd`/debian/qt3-dev-tools//usr/share/qt3/mkspecs/linux-g++/linux-g++
-
- # language file for linguist
- install -d `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/
- cp translations/template.ts `pwd`/debian/qt3-linguist/usr/share/doc/qt3-linguist/qt_untranslated.ts
-
- # fix that stupid friggin professional file
- perl -pi -e 's{\$$\$$QT_SOURCE_TREE}{$(QTDIR)}' src/qt_professional.pri
-
- ## i18n files for designer, linguist and assistant
- (cd `pwd`/tools/designer/designer/ && lrelease designer.pro)
- for a in `cd tools/designer/designer/ && find . -name 'designer_*.qm' | sed 's/designer_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
- install -m644 -D tools/designer/designer/designer_"$$a".qm `pwd`/debian/qt3-designer/usr/share/qt3/translations/designer_"$$a".qm; done
- rm -rf `pwd`/tools/designer/designer/*.qm
-
- (cd `pwd`/tools/assistant/ && lrelease assistant.pro)
- for a in `cd tools/assistant/ && find . -name 'assistant_*.qm' | sed 's/assistant_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
- install -m644 -D tools/assistant/assistant_"$$a".qm `pwd`/debian/qt3-assistant/usr/share/qt3/translations/assistant_"$$a".qm; done
- rm -rf `pwd`/tools/assistant/*.qm `pwd`/debian/libqt3-i18n/usr/share/qt3/translations/assistant_de.qm
-
- (cd `pwd`/tools/linguist/linguist/ && lrelease linguist.pro)
- for a in `cd tools/linguist/linguist/ && find . -name 'linguist_*.qm' | sed 's/linguist_//' | sed 's/\.qm//' | sed 's/\.\///g'`; do \
- install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/qt3-linguist/usr/share/qt3/translations/linguist_"$$a".qm; done
- rm -rf `pwd`/tools/linguist/linguist/*.qm
-
- # desktop lnk files
- install -m644 -D debian/maintain/designer-qt3.desktop `pwd`/debian/qt3-designer/usr/share/applications/designer-qt3.desktop
- install -m644 -D debian/maintain/linguist-qt3.desktop `pwd`/debian/qt3-linguist/usr/share/applications/linguist-qt3.desktop
-
- install -m644 -D debian/maintain/assistant-qt3.desktop `pwd`/debian/qt3-assistant/usr/share/applications/assistant-qt3.desktop
- install -m644 -D debian/maintain/qt3config.desktop `pwd`/debian/qt3-qtconfig/usr/share/applications/qt3config.desktop
-
- # include logo32 for every program
- cd `pwd`/debian/qt3-designer/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
- do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done
-
- cd `pwd`/debian/qt3-linguist/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
- do cat "$$a" | sed 's/logo32/logo32-linguist/g' > "$$a".new && mv "$$a".new "$$a"; done
-
- cd `pwd`/debian/qt3-assistant/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
- do cat "$$a" | sed 's/logo32/logo32-assistant/g' > "$$a".new && mv "$$a".new "$$a"; done
-
- cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html && for a in `find . -name '*.html'`; \
- do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done
-
- for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-"$$a"/usr/share/qt3/doc/html/logo32-"$$a".png; done
- install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/qt3-dev-tools/usr/share/qt3/doc/html/logo32-qmake.png
-
- # fix qmake.conf files
- cd `pwd`/debian/qt3-dev-tools/usr/share/qt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/qt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/qt3/g' | \
- sed 's/\-I\/usr\/include/&\/qt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done
-
- # build attic package and copy it to libqt3-ompat-headers
- cd `pwd`/src/ && tar cvvfz attic.tar.gz attic/
- install -D `pwd`/src/attic.tar.gz `pwd`/debian/libqt3-compat-headers/usr/share/doc/libqt3-compat-headers/attic.tar.gz
- rm -rf `pwd`/src/attic.tar.gz
-
- # rename some binaries to make qt3/4 installations possible
- mv `pwd`/debian/qt3-designer/usr/bin/designer `pwd`/debian/qt3-designer/usr/bin/designer-qt3
- mv `pwd`/debian/qt3-dev-tools/usr/bin/uic `pwd`/debian/qt3-dev-tools/usr/bin/uic-qt3
- mv `pwd`/debian/qt3-dev-tools/usr/bin/moc `pwd`/debian/qt3-dev-tools/usr/bin/moc-qt3
- mv `pwd`/debian/qt3-dev-tools/usr/bin/lupdate `pwd`/debian/qt3-dev-tools/usr/bin/lupdate-qt3
- mv `pwd`/debian/qt3-dev-tools/usr/bin/lrelease `pwd`/debian/qt3-dev-tools/usr/bin/lrelease-qt3
- mv `pwd`/debian/qt3-dev-tools/usr/bin/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-qt3
- mv `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig `pwd`/debian/qt3-qtconfig/usr/bin/qtconfig-qt3
- mv `pwd`/debian/qt3-assistant/usr/bin/assistant `pwd`/debian/qt3-assistant/usr/bin/assistant-qt3
- mv `pwd`/debian/qt3-linguist/usr/bin/linguist `pwd`/debian/qt3-linguist/usr/bin/linguist-qt3
-
- install -D doc/man/man1/moc.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/moc-qt3.1
- install -D doc/man/man1/uic.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/uic-qt3.1
- install -D doc/man/man1/lrelease.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lrelease-qt3.1
- install -D doc/man/man1/lupdate.1 `pwd`/debian/qt3-dev-tools/usr/share/man/man1/lupdate-qt3.1
-
- dh_link -pqt3-designer usr/share/qt3/doc/html usr/share/doc/qt3-designer/html
- dh_link -pqt3-assistant usr/share/qt3/doc/html usr/share/doc/qt3-assistant/html
- dh_link -pqt3-linguist usr/share/qt3/doc/html usr/share/doc/qt3-linguist/html
- dh_link -pqt3-dev-tools usr/share/qt3/doc/html usr/share/doc/qt3-dev-tools/html
-
- # copy README.Debian
- for a in libqt3-mt-dev libqt3-mt qt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done
-
- # install the qmake binary
- rm -rf `pwd`/debian/qt3-dev-tools/usr/bin/qmake
- install -D `pwd`/qmake/qmake `pwd`/debian/qt3-dev-tools/usr/bin/qmake-qt3
-
- # Install source for the designer tools, such as createcw.
- cp -ra tools/designer/tools debian/qt3-designer/usr/share/qt3/tools
- rm -f debian/qt3-designer/usr/share/qt3/tools/createcw/createcw
- rm -rf debian/qt3-designer/usr/share/qt3/tools/createcw/.moc
- rm -rf debian/qt3-designer/usr/share/qt3/tools/createcw/.obj
- rm -f debian/qt3-designer/usr/share/qt3/tools/createcw/Makefile
- rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/conv2ui
- rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.moc
- rm -rf debian/qt3-designer/usr/share/qt3/tools/conv2ui/.obj
- rm -f debian/qt3-designer/usr/share/qt3/tools/conv2ui/Makefile
-
- # run remaining debhelper scripts
- dh_installdocs -a $(IBASE) -XREADME.Debian
- dh_installmenu -a $(IBASE)
-
- dh_installchangelogs -a $(IBASE) changes-3.3.8
- dh_installchangelogs -a $(IBASE) changes-3.3.8b
-
- dh_link -a $(IBASE)
- dh_strip -a $(IBASE) --dbg-package=qt-x11-free-dbg
- dh_compress -a $(IBASE)
- dh_fixperms -a $(IBASE)
-
- # run remaining debhelper scripts
- dh_makeshlibs -a $(IBASE) -V
- dh_installdeb -a $(IBASE)
- dh_perl -a $(IBASE)
- dh_shlibdeps -a $(IBASE) -l`pwd`/debian/libqt3-mt/usr/lib
-
- # fix shlibdeps madness
- for a in `find debian/ -name '*.substvars'`; do cat "$$a" | sed 's/, xlibs (>> 4.1.0)//g' > "$$a".new && mv "$$a.new" "$$a"; done
-
- # fix conffiles file for qt3-dev-tools-embedded
- echo "/etc/qt3/qvfb/pda.skin" > `pwd`/debian/qt3-dev-tools-embedded/DEBIAN/conffiles
-
- dh_gencontrol -a $(IBASE)
- dh_md5sums -a $(IBASE)
- dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS)
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch binary-indep binary-arch binary install clean
diff --git a/ubuntu/_base/dependencies/qt3/debian/source/format b/ubuntu/_base/dependencies/qt3/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/qt3/debian/source/options b/ubuntu/_base/dependencies/qt3/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/dependencies/qt3/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/rules b/ubuntu/_base/dependencies/tqca-tls/debian/rules
index 22ec88d79..b0bc3efee 100755
--- a/ubuntu/_base/dependencies/tqca-tls/debian/rules
+++ b/ubuntu/_base/dependencies/tqca-tls/debian/rules
@@ -44,8 +44,8 @@ configure-stamp:
CFLAGS="$(CFLAGS)" ./configure
touch configure-stamp
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
deleted file mode 100644
index 3072b99aa..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/maintain/assistant-tqt3.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=tqassistant
-Name=TQt3 Assistant
-Name[de]=TQt3 Assistent
-Comment=TQt3 Helpcenter
-Comment[de]= TQt3 Hilfezentrum
-MimeType=application/x-assistant;
-Icon=assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
deleted file mode 100644
index cc95cead5..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/maintain/designer-tqt3.desktop
+++ /dev/null
@@ -1,77 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=tqdesigner
-Name=TQt3 Designer
-Name[bg]=TQt3 Дизайнер
-Name[br]=Ergrafer TQt3
-Name[ca]=Dissenyador TQt3
-Name[cs]=TQt3 designer
-Name[de]=TQt3-Designer
-Name[eo]=TQt3-Desegnilo
-Name[es]=Diseñador TQt3
-Name[et]=TQt3 disainer
-Name[eu]=TQt3 Diseinatzailea
-Name[gl]=Deseñador de TQt3
-Name[he]=TQt3 בצעמ
-Name[it]=Designer TQt3
-Name[ja]=TQt3デザイナー
-Name[ko]=TQt3 디자이너
-Name[lv]=TQt3 Dizainers
-Name[mk]=TQt3 дизајнер
-Name[no]=TQt3-designer
-Name[oc]=Dessinador TQt3
-Name[pl]=Projektant TQt3
-Name[sk]=TQt3 Dizajnér
-Name[sl]=Snovalnik TQt3
-Name[ta]=TQt3 À¨¼ôÀ¡Ç÷
-Name[uk]=Дизайнер TQt3
-Name[zh_CN.GB2312]=TQt3 设计者
-Name[zh_TW.Big5]=TQt3 設計器
-Comment=TQt3 interface designer
-Comment[az]=TQt3 axtar üz dizayn proqramı
-Comment[bg]=TQt3 interface дизайнер
-Comment[br]=Ergrafer etrefas TQt3
-Comment[ca]=Dissenyador d'interfícies TQt3
-Comment[cs]=Editor UI pro TQt3
-Comment[da]=TQt3 grænseflade designer
-Comment[de]=Schnittstellen-Designer für TQt3
-Comment[el]=Σχεδιασμός περιβάλλοντων TQt3
-Comment[eo]=TQt3-Interfacdesegnilo
-Comment[es]=Diseñador de interfaces de TQt3
-Comment[et]=TQt3 dialoogide redaktor
-Comment[eu]=TQt3 interfaze diseinatzailea
-Comment[fi]=TQt3:n käyttöliittymäsuunnittelija
-Comment[fr]=Conception d'interfaces avec TQt3
-Comment[gl]=Editor de interfaces de TQt3
-Comment[he]=TQt3-ל םיקשממ בצעמ
-Comment[hu]=TQt3 felülettervező
-Comment[is]=Viðmótshönnunartól fyrir TQt3
-Comment[it]=Editor per le interfaccie TQt3
-Comment[ja]=TQt3インターフェースデザイナー
-Comment[ko]=TQt3 인터페이스 디자이너
-Comment[lt]=TQt3 sąsajos redaktorius
-Comment[lv]=TQt3 starsejas dizainers
-Comment[mk]=Дизајнер на TQt3 дијалози
-Comment[nl]=TQt3 interface-ontwerper
-Comment[no]=TQt3-grensesnittdesigner
-Comment[no_NY]=Redigering av TQt3-miljø
-Comment[oc]=Dessinador d'interfacies TQt3
-Comment[pl]=Projektant interfejsu TQt3
-Comment[pt]=Editor de interfaces do TQt3
-Comment[pt_BR]=Designer de interface TQt3
-Comment[ro]=Dezvoltator de interfeţe TQt3
-Comment[ru]=редактор интерфейсов приложений TQt3
-Comment[sk]=TQt3 dizajnér rozhrania
-Comment[sl]=Snovalnik vmesnikov za TQt3
-Comment[sr]=Dizajner TQt3 interfejsa
-Comment[sv]=Editor för gränssnitt till TQt3
-Comment[ta]=TQt3 À¨¼ôÀ¡Ç÷
-Comment[tr]=TQt3 arayüz tasarım programı
-Comment[uk]=Редактор інтерфейсу для TQt3
-Comment[zh_CN.GB2312]=TQt3 界面设计程序
-Comment[zh_TW.Big5]=TQt3 介面編輯器
-MimeType=application/x-designer;
-Icon=designer
-Terminal=false
-Type=Application
-Categories=Qt;Development;
diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
deleted file mode 100644
index d879d32db..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/maintain/linguist-tqt3.desktop
+++ /dev/null
@@ -1,25 +0,0 @@
-[Desktop Entry]
-Exec=tqlinguist
-Name=TQt3 Linguist
-Name[de]=TQt3-Linguist
-Name[eo]=TQt3-Lingvisto
-Name[es]=Lingüista TQt3
-Name[ko]=TQt3 언어학자
-Name[lv]=TQt3 Lingvists
-Comment=Tool for translating message catalogues of TQt3 based programs
-Comment[da]=Redskab til at oversætte TQt3 baserede programmer
-Comment[de]=Dienstprogramm zur Übersetzung von Programmen, die auf TQt3 basieren
-Comment[eo]=Ilo por tradukado de mesaĝaroj de TQt3-bazitaj programoj
-Comment[es]=Herramienta para la traducción de catálogos de mensajes de programas basados en TQt3
-Comment[he]=TQt3 תוססובמ תוינכות לש תועדוה יגולטק םוגרתל ילכ
-Comment[hu]=Segédprogram a TQt3-alapú programok üzenetfájljainak lefordításához
-Comment[ko]=TQt3를 바탕으로 하는 프로그램에서 쓸 번역된 메세지 목록을 관리하는 도구
-Comment[lv]=Rīks ziņojumu katalogu tulkošanai uz TQt3 bāzētās programmās
-Comment[pt]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
-Comment[pt_BR]=Ferramenta para traduzir os catálogos de mensagens de programas do TQt3
-Comment[sv]=Verktyg för att översätta meddelandekataloger från TQt3-baserade program
-MimeType=application/x-linguist;
-Terminal=false
-Icon=linguist
-Type=Application
-Categories=Qt;Development
diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh b/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh
deleted file mode 100644
index 609a44bc1..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/maintain/mkpatch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-diff -Nru -x Makefile.cvs -x README.qt-copy -x upgrade_script.qt -x .cvsignore -x CVS -x include -x debian -x doc -x examples -x 3rdparty -x images -x mkspecs -I '^\*\*\( $\| \$Id\)' -I '^\#\( $\| \$Id\)' qt-x11-free-3.1.1.old/ qt-x11-free-3.1.1/ > qtcopy.diff
diff --git a/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop b/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop
deleted file mode 100644
index b3535c06f..000000000
--- a/ubuntu/_base/dependencies/tqt3/debian/maintain/tqt3config.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=tqtconfig
-Name=TQt3 Configuration
-Name[de]=TQt3 Konfiguration
-Comment=A graphical configuration tool for programs using TQt 3
-Comment[de]=Ein grafisches Konfigurationstool für TQt3-Programme
-MimeType=application/x-qtconfig;
-Terminal=false
-Icon=qtconfig
-Type=Application
-Categories=Qt;Settings;
diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules
index 50b75c5df..38573561f 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt3/debian/rules
@@ -20,7 +20,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
+DEB_BUILD_PARALLEL ?= true
ifeq ($(DEB_HOST_ARCH_OS),hurd)
PLATFORM_ARG = hurd-g++
@@ -397,13 +397,6 @@ binary-arch: build install
install -m644 -D tools/linguist/linguist/linguist_"$$a".qm `pwd`/debian/tqt3-linguist/usr/share/tqt3/translations/linguist_"$$a".qm; done
rm -rf `pwd`/tools/linguist/linguist/*.qm
- # desktop lnk files
- install -m644 -D debian/maintain/designer-tqt3.desktop `pwd`/debian/tqt3-designer/usr/share/applications/designer-tqt3.desktop
- install -m644 -D debian/maintain/linguist-tqt3.desktop `pwd`/debian/tqt3-linguist/usr/share/applications/linguist-tqt3.desktop
-
- install -m644 -D debian/maintain/assistant-tqt3.desktop `pwd`/debian/tqt3-assistant/usr/share/applications/assistant-tqt3.desktop
- install -m644 -D debian/maintain/tqt3config.desktop `pwd`/debian/tqt3-qtconfig/usr/share/applications/tqt3config.desktop
-
# include logo32 for every program
cd `pwd`/debian/tqt3-designer/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \
do cat "$$a" | sed 's/logo32/logo32-designer/g' > "$$a".new && mv "$$a".new "$$a"; done
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install
index fa797854e..4cfd10cf1 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-assistant.install
@@ -1,4 +1,6 @@
usr/bin/tqassistant
+usr/share/applications/tqassistant.desktop
+usr/share/pixmaps/tqassistant.png
usr/share/tqt3/doc/html/assistant*html
usr/share/tqt3/doc/html/assistant*dcf
usr/share/tqt3/doc/html/assistant*png
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
index 829c9a96e..6cfffd9cd 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-designer.install
@@ -1,6 +1,8 @@
usr/bin/tqdesigner
usr/bin/tqtcreatecw
usr/bin/tqtconv2ui
+usr/share/applications/tqdesigner.desktop
+usr/share/pixmaps/tqdesigner.png
usr/share/tqt3/templates/*
usr/share/tqt3/doc/html/designer*html
usr/share/tqt3/doc/html/designer*dcf
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install
index 8602850aa..c02015323 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-linguist.install
@@ -1,4 +1,6 @@
usr/bin/tqlinguist
+usr/share/applications/tqlinguist.desktop
+usr/share/pixmaps/tqlinguist.png
usr/share/tqt3/phrasebooks/*
usr/share/tqt3/doc/html/linguist*html
usr/share/tqt3/doc/html/linguist*dcf
diff --git a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install
index a1ae089bc..6b1f88962 100644
--- a/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install
+++ b/ubuntu/_base/dependencies/tqt3/debian/tqt3-qtconfig.install
@@ -1 +1,3 @@
usr/bin/tqtconfig
+usr/share/applications/tqtconfig.desktop
+usr/share/pixmaps/tqtconfig.png
diff --git a/ubuntu/_base/dependencies/tqtinterface/debian/rules b/ubuntu/_base/dependencies/tqtinterface/debian/rules
index d642db97b..0e9194d0c 100755
--- a/ubuntu/_base/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/_base/dependencies/tqtinterface/debian/rules
@@ -23,6 +23,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
+DEB_BUILD_PARALLEL ?= true
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
diff --git a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/rules b/ubuntu/_base/libraries/pytdeextensions/debian/rules
index 188238d79..e4c433701 100755
--- a/ubuntu/_base/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport)
DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity
include /usr/share/cdbs/1/rules/debhelper.mk
diff --git a/ubuntu/_base/tde-i18n/debian/rules b/ubuntu/_base/tde-i18n/debian/rules
index c5ae84be2..cf6f410a5 100755
--- a/ubuntu/_base/tde-i18n/debian/rules
+++ b/ubuntu/_base/tde-i18n/debian/rules
@@ -22,6 +22,8 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+DEB_BUILD_PARALLEL ?= true
+
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
DEB_PARALLEL_JOBS ?= $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
@@ -91,7 +93,7 @@ install:: $(I18N_INSTALL)
mkdir debian/$(I18N_DEST_PREFIX)-zhtw-trinity
cp -aR debian/$(I18N_DEST_PREFIX)-zh_TW-trinity/* debian/$(I18N_DEST_PREFIX)-zhtw-trinity/
-$(I18N_INSTALL):
+$(I18N_INSTALL): build
cd $(cur_lang_dir)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)-trinity $(DEB_MAKE_PARALLEL)
diff --git a/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/tdebase/debian/libtqt3-integration-trinity.install b/ubuntu/_base/tdebase/debian/libtqt3-integration-trinity.install
index bf22a6d40..c56f09234 100644
--- a/ubuntu/_base/tdebase/debian/libtqt3-integration-trinity.install
+++ b/ubuntu/_base/tdebase/debian/libtqt3-integration-trinity.install
@@ -1,7 +1,4 @@
-debian/tmp/opt/trinity/lib/trinity/plugins/integration/libtqtkde.la
-debian/tmp/opt/trinity/lib/trinity/plugins/integration/libtqtkde.so
-debian/tmp/opt/trinity/lib/trinity/plugins/integration/libtqtkde.so.0
-debian/tmp/opt/trinity/lib/trinity/plugins/integration/libtqtkde.so.0.0.0
-debian/tmp/opt/trinity/share/services/kded/kdeintegration.desktop
-debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.la
-debian/tmp/opt/trinity/lib/trinity/kded_kdeintegration.so
+debian/tmp/opt/trinity/share/services/kded/tdeintegration.desktop
+debian/tmp/opt/trinity/lib/trinity/kded_tdeintegration.la
+debian/tmp/opt/trinity/lib/trinity/kded_tdeintegration.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins/integration/libtqttde.*
diff --git a/ubuntu/_base/tdebase/debian/rules b/ubuntu/_base/tdebase/debian/rules
index 1fed17a20..741dc7f52 100755
--- a/ubuntu/_base/tdebase/debian/rules
+++ b/ubuntu/_base/tdebase/debian/rules
@@ -64,10 +64,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
-DWITH_PCRE="ON" \
-DWITH_KRB5="ON"
-# Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to
-# never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
DEB_FIXPERMS_EXCLUDE := \
opt/trinity/bin/kcheckpass \
opt/trinity/bin/tdekbdledsync \
diff --git a/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
index 1ce194945..4ca441e32 100644
--- a/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
+++ b/ubuntu/_base/tdebase/debian/tdebase-tdeio-plugins-trinity.install
@@ -156,25 +156,21 @@ debian/tmp/opt/trinity/share/mimelnk/media/blankdvd.desktop
debian/tmp/opt/trinity/share/mimelnk/media/camera_mounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/camera_unmounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cdrom_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cdrom_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cdrom_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cdrom_encrypted_locked.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-r_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-r_encrypted_locked.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/cd-rw_encrypted_locked.desktop
debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/dvd_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/dvd_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/dvd_encrypted_locked.desktop
debian/tmp/opt/trinity/share/mimelnk/media/dvdvideo.desktop
debian/tmp/opt/trinity/share/mimelnk/media/floppy5_mounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/floppy5_unmounted.desktop
@@ -182,17 +178,15 @@ debian/tmp/opt/trinity/share/mimelnk/media/floppy_mounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/floppy_unmounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/gphoto2camera.desktop
debian/tmp/opt/trinity/share/mimelnk/media/hdd_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/hdd_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/hdd_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/hdd_encrypted_locked.desktop
debian/tmp/opt/trinity/share/mimelnk/media/nfs_mounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/nfs_unmounted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/removable_mounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_mounted_decrypted.desktop
debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_decrypted.desktop
-debian/tmp/opt/trinity/share/mimelnk/media/removable_unmounted_encrypted.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/removable_encrypted_unlocked.desktop
+debian/tmp/opt/trinity/share/mimelnk/media/removable_encrypted_locked.desktop
debian/tmp/opt/trinity/share/mimelnk/media/svcd.desktop
debian/tmp/opt/trinity/share/mimelnk/media/vcd.desktop
debian/tmp/opt/trinity/share/mimelnk/media/zip_mounted.desktop
diff --git a/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/tdeedu/debian/blinken-trinity.install b/ubuntu/_base/tdeedu/debian/blinken-trinity.install
index 033f1086c..19a5b6041 100644
--- a/ubuntu/_base/tdeedu/debian/blinken-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/blinken-trinity.install
@@ -11,4 +11,5 @@ opt/trinity/bin/blinken
/opt/trinity/share/icons/hicolor/64x64/apps/blinken.png
/opt/trinity/share/icons/hicolor/128x128/apps/blinken.png
/opt/trinity/share/icons/hicolor/scalable/apps/blinken.svgz
+/opt/trinity/share/man/man1/blinken.1
../icons/blinken.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/blinken-trinity.manpages b/ubuntu/_base/tdeedu/debian/blinken-trinity.manpages
deleted file mode 100644
index bbad38ebc..000000000
--- a/ubuntu/_base/tdeedu/debian/blinken-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/blinken-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk b/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk
index fb8c1b6c3..7a55130b2 100644
--- a/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk
+++ b/ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk
@@ -95,6 +95,8 @@ ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
cdbs_kde_enable_debug = --enable-debug=full
endif
+DEB_BUILD_PARALLEL ?= true
+
cdbs_configure_flags += \
--with-qt-dir=/usr/share/qt3 \
--disable-rpath \
@@ -140,12 +142,27 @@ common-binary-arch::
cat $$tmpf >>debian/$$p.substvars; \
done; \
rm -f $$tmpf )
+ # update multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ -d $$a ] || [ -f $$a.arch ] || \
+ ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
+ sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
+ done
clean::
rm -rf debian/man/out
-rmdir debian/man
rm -f debian/stamp-man-pages
rm -rf debian/shlibs-check
+ # revert multi-arch path in install files
+ ls -d debian/* | \
+ grep -E "(install|links)$$" | \
+ while read a; do \
+ [ ! -f $$a.arch ] || \
+ mv $$a.arch $$a; \
+ done
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
diff --git a/ubuntu/_base/tdeedu/debian/control b/ubuntu/_base/tdeedu/debian/control
index 922988821..bed05cdc0 100644
--- a/ubuntu/_base/tdeedu/debian/control
+++ b/ubuntu/_base/tdeedu/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: ocaml-nox, libfacile-ocaml-dev, libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, autotools-dev, gawk, tdelibs14-trinity-dev, libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, graphviz, texlive-latex-base, ghostscript, libogg-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), cdbs (>= 0.4.39-0.1), quilt, cmake, tdelibs14-trinity-dev, ocaml-nox, libfacile-ocaml-dev, libasound2-dev, gawk, libboost-python-dev (>= 1.33.1), libusb-dev, sharutils, doxygen, graphviz, texlive-latex-base, ghostscript, libogg-dev
Standards-Version: 3.8.4
Package: tdeedu-trinity
diff --git a/ubuntu/_base/tdeedu/debian/indi-trinity.install b/ubuntu/_base/tdeedu/debian/indi-trinity.install
index 82db36a4a..577d05221 100644
--- a/ubuntu/_base/tdeedu/debian/indi-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/indi-trinity.install
@@ -16,3 +16,14 @@ opt/trinity/bin/skycommander
opt/trinity/bin/temma
opt/trinity/bin/v4ldriver
opt/trinity/bin/v4lphilips
+opt/trinity/share/man/man1/celestrongps.1
+opt/trinity/share/man/man1/fliccd.1
+opt/trinity/share/man/man1/indiserver.1
+opt/trinity/share/man/man1/lx200_16.1
+opt/trinity/share/man/man1/lx200autostar.1
+opt/trinity/share/man/man1/lx200classic.1
+opt/trinity/share/man/man1/lx200generic.1
+opt/trinity/share/man/man1/lx200gps.1
+opt/trinity/share/man/man1/temma.1
+opt/trinity/share/man/man1/v4ldriver.1
+opt/trinity/share/man/man1/v4lphilips.1
diff --git a/ubuntu/_base/tdeedu/debian/indi-trinity.manpages b/ubuntu/_base/tdeedu/debian/indi-trinity.manpages
deleted file mode 100644
index 1c974f253..000000000
--- a/ubuntu/_base/tdeedu/debian/indi-trinity.manpages
+++ /dev/null
@@ -1,11 +0,0 @@
-debian/man/celestrongps-trinity.1
-debian/man/fliccd-trinity.1
-debian/man/indiserver-trinity.1
-debian/man/lx200_16-trinity.1
-debian/man/lx200autostar-trinity.1
-debian/man/lx200classic-trinity.1
-debian/man/lx200generic-trinity.1
-debian/man/lx200gps-trinity.1
-debian/man/temma-trinity.1
-debian/man/v4ldriver-trinity.1
-debian/man/v4lphilips-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kalzium-trinity.install b/ubuntu/_base/tdeedu/debian/kalzium-trinity.install
index be9e9bd4d..cdd95b171 100644
--- a/ubuntu/_base/tdeedu/debian/kalzium-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kalzium-trinity.install
@@ -12,4 +12,5 @@ opt/trinity/bin/kalzium
/opt/trinity/share/icons/hicolor/64x64/apps/kalzium.png
/opt/trinity/share/icons/hicolor/128x128/apps/kalzium.png
/opt/trinity/share/icons/hicolor/scalable/apps/kalzium.svgz
+/opt/trinity/share/man/man1/kalzium.1
../icons/kalzium.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kalzium-trinity.manpages b/ubuntu/_base/tdeedu/debian/kalzium-trinity.manpages
deleted file mode 100644
index 2ac62d8e2..000000000
--- a/ubuntu/_base/tdeedu/debian/kalzium-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kalzium-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kanagram-trinity.install b/ubuntu/_base/tdeedu/debian/kanagram-trinity.install
index 747d64a84..f6c47b4c3 100644
--- a/ubuntu/_base/tdeedu/debian/kanagram-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kanagram-trinity.install
@@ -6,11 +6,11 @@ opt/trinity/bin/kanagram
/opt/trinity/share/doc/tde/HTML/en/kanagram/index.cache.bz2
/opt/trinity/share/doc/tde/HTML/en/kanagram/*.docbook
/opt/trinity/share/doc/tde/HTML/en/kanagram/*.png
-/opt/trinity/share/doc/tde/HTML/en/kanagram/*.svgz
/opt/trinity/share/icons/hicolor/16x16/apps/kanagram.png
/opt/trinity/share/icons/hicolor/22x22/apps/kanagram.png
/opt/trinity/share/icons/hicolor/32x32/apps/kanagram.png
/opt/trinity/share/icons/hicolor/48x48/apps/kanagram.png
/opt/trinity/share/icons/hicolor/128x128/apps/kanagram.png
/opt/trinity/share/icons/hicolor/scalable/apps/kanagram.svgz
+/opt/trinity/share/man/man1/kanagram.1
../icons/kanagram.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kanagram-trinity.manpages b/ubuntu/_base/tdeedu/debian/kanagram-trinity.manpages
deleted file mode 100644
index bf36c99a5..000000000
--- a/ubuntu/_base/tdeedu/debian/kanagram-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kanagram-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kbruch-trinity.install b/ubuntu/_base/tdeedu/debian/kbruch-trinity.install
index 6b4f60d97..6febf02d3 100644
--- a/ubuntu/_base/tdeedu/debian/kbruch-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kbruch-trinity.install
@@ -15,4 +15,5 @@ opt/trinity/bin/kbruch
/opt/trinity/share/icons/hicolor/scalable/apps/kbruch.svgz
/opt/trinity/share/icons/crystalsvg/32x32/actions/kbruch_*.png
/opt/trinity/share/icons/crystalsvg/64x64/actions/kbruch_*.png
+/opt/trinity/share/man/man1/kbruch.1
../icons/kbruch.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kbruch-trinity.manpages b/ubuntu/_base/tdeedu/debian/kbruch-trinity.manpages
deleted file mode 100644
index 622f534e2..000000000
--- a/ubuntu/_base/tdeedu/debian/kbruch-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kbruch-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/keduca-trinity.install b/ubuntu/_base/tdeedu/debian/keduca-trinity.install
index c4ea76970..323035510 100644
--- a/ubuntu/_base/tdeedu/debian/keduca-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/keduca-trinity.install
@@ -19,5 +19,8 @@ opt/trinity/lib/trinity/libkeducapart.so
/opt/trinity/share/mimelnk/application/x-edu.desktop
/opt/trinity/share/mimelnk/application/x-edugallery.desktop
/opt/trinity/share/services/keduca_part.desktop
+/opt/trinity/share/man/man1/keduca.1
+/opt/trinity/share/man/man1/keduca-shrinker.1
+/opt/trinity/share/man/man1/keducabuilder.1
../icons/keduca.xpm /opt/trinity/share/pixmaps
../keduca-shrinker opt/trinity/bin
diff --git a/ubuntu/_base/tdeedu/debian/keduca-trinity.manpages b/ubuntu/_base/tdeedu/debian/keduca-trinity.manpages
deleted file mode 100644
index 99bab9f63..000000000
--- a/ubuntu/_base/tdeedu/debian/keduca-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/keduca-trinity.1
-debian/man/keduca-shrinker-trinity.1
-debian/man/keducabuilder-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kgeography-trinity.install b/ubuntu/_base/tdeedu/debian/kgeography-trinity.install
index 97ceb7fb2..e40c7f05a 100644
--- a/ubuntu/_base/tdeedu/debian/kgeography-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kgeography-trinity.install
@@ -1,4 +1,5 @@
opt/trinity/bin/kgeography
+opt/trinity/bin/kgeography_gen_map.pl
/opt/trinity/share/applications/tde/kgeography.desktop
/opt/trinity/share/config.kcfg/kgeography.kcfg
/opt/trinity/share/doc/tde/HTML/en/kgeography
@@ -15,4 +16,5 @@ opt/trinity/bin/kgeography
/opt/trinity/share/icons/hicolor/32x32/apps/kgeography.png
/opt/trinity/share/icons/hicolor/48x48/apps/kgeography.png
/opt/trinity/share/icons/hicolor/64x64/apps/kgeography.png
+/opt/trinity/share/man/man1/kgeography.1
../icons/kgeography.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kgeography-trinity.manpages b/ubuntu/_base/tdeedu/debian/kgeography-trinity.manpages
deleted file mode 100644
index 390e2bed2..000000000
--- a/ubuntu/_base/tdeedu/debian/kgeography-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kgeography-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/khangman-trinity.install b/ubuntu/_base/tdeedu/debian/khangman-trinity.install
index bd61f0f6d..a2b2b0dae 100644
--- a/ubuntu/_base/tdeedu/debian/khangman-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/khangman-trinity.install
@@ -17,4 +17,5 @@ opt/trinity/bin/khangman
/opt/trinity/share/icons/hicolor/64x64/apps/khangman.png
/opt/trinity/share/icons/hicolor/128x128/apps/khangman.png
/opt/trinity/share/icons/hicolor/scalable/apps/khangman.svgz
+/opt/trinity/share/man/man1/khangman.1
../icons/khangman.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/khangman-trinity.manpages b/ubuntu/_base/tdeedu/debian/khangman-trinity.manpages
deleted file mode 100644
index b49d3e8fd..000000000
--- a/ubuntu/_base/tdeedu/debian/khangman-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/khangman-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kig-trinity.install b/ubuntu/_base/tdeedu/debian/kig-trinity.install
index 4a76ad271..9981401b1 100644
--- a/ubuntu/_base/tdeedu/debian/kig-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kig-trinity.install
@@ -32,6 +32,7 @@ opt/trinity/lib/trinity/libkigpart.so
/opt/trinity/share/icons/hicolor/64x64/apps/kig.png
/opt/trinity/share/icons/hicolor/128x128/apps/kig.png
/opt/trinity/share/icons/hicolor/scalable/apps/kig.svgz
+/opt/trinity/share/man/man1/kig.1
/opt/trinity/share/mimelnk/application/x-cabri.desktop
/opt/trinity/share/mimelnk/application/x-drgeo.desktop
/opt/trinity/share/mimelnk/application/x-kig.desktop
diff --git a/ubuntu/_base/tdeedu/debian/kig-trinity.manpages b/ubuntu/_base/tdeedu/debian/kig-trinity.manpages
deleted file mode 100644
index 9d8d993a9..000000000
--- a/ubuntu/_base/tdeedu/debian/kig-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kig-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kiten-trinity.install b/ubuntu/_base/tdeedu/debian/kiten-trinity.install
index 040a3cade..332fa50de 100644
--- a/ubuntu/_base/tdeedu/debian/kiten-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kiten-trinity.install
@@ -10,4 +10,6 @@ opt/trinity/bin/kitengen
/opt/trinity/share/icons/hicolor/48x48/apps/kiten.png
/opt/trinity/share/icons/hicolor/128x128/apps/kiten.png
/opt/trinity/share/icons/hicolor/scalable/apps/kiten.svgz
+/opt/trinity/share/man/man1/kiten.1
+/opt/trinity/share/man/man1/kitengen.1
../icons/kiten.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kiten-trinity.manpages b/ubuntu/_base/tdeedu/debian/kiten-trinity.manpages
deleted file mode 100644
index 1fd7ca049..000000000
--- a/ubuntu/_base/tdeedu/debian/kiten-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/kiten-trinity.1
-debian/man/kitengen-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/klatin-trinity.install b/ubuntu/_base/tdeedu/debian/klatin-trinity.install
index 1ef736d07..c3f7c9a75 100644
--- a/ubuntu/_base/tdeedu/debian/klatin-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/klatin-trinity.install
@@ -6,7 +6,6 @@ opt/trinity/bin/klatin
/opt/trinity/share/doc/tde/HTML/en/klatin/common
/opt/trinity/share/doc/tde/HTML/en/klatin/*.docbook
/opt/trinity/share/doc/tde/HTML/en/klatin/*.png
-/opt/trinity/share/doc/tde/HTML/en/klatin/README
/opt/trinity/share/icons/hicolor/16x16/apps/klatin.png
/opt/trinity/share/icons/hicolor/22x22/apps/klatin.png
/opt/trinity/share/icons/hicolor/32x32/apps/klatin.png
@@ -14,4 +13,5 @@ opt/trinity/bin/klatin
/opt/trinity/share/icons/hicolor/64x64/apps/klatin.png
/opt/trinity/share/icons/hicolor/128x128/apps/klatin.png
/opt/trinity/share/icons/hicolor/scalable/apps/klatin.svgz
+/opt/trinity/share/man/man1/klatin.1
../icons/klatin.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/klatin-trinity.manpages b/ubuntu/_base/tdeedu/debian/klatin-trinity.manpages
deleted file mode 100644
index 72c7f2719..000000000
--- a/ubuntu/_base/tdeedu/debian/klatin-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/klatin-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/klettres-trinity.install b/ubuntu/_base/tdeedu/debian/klettres-trinity.install
index 0d55cbb84..8b7cf6779 100644
--- a/ubuntu/_base/tdeedu/debian/klettres-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/klettres-trinity.install
@@ -12,4 +12,5 @@ opt/trinity/bin/klettres
/opt/trinity/share/icons/hicolor/48x48/apps/klettres.png
/opt/trinity/share/icons/hicolor/128x128/apps/klettres.png
/opt/trinity/share/icons/hicolor/scalable/apps/klettres.svgz
+/opt/trinity/share/man/man1/klettres.1
../icons/klettres.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/klettres-trinity.manpages b/ubuntu/_base/tdeedu/debian/klettres-trinity.manpages
deleted file mode 100644
index 769e1a35e..000000000
--- a/ubuntu/_base/tdeedu/debian/klettres-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/klettres-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kmplot-trinity.install b/ubuntu/_base/tdeedu/debian/kmplot-trinity.install
index 496ba1a4a..32fed65b2 100644
--- a/ubuntu/_base/tdeedu/debian/kmplot-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kmplot-trinity.install
@@ -15,6 +15,7 @@ opt/trinity/lib/trinity/libkmplotpart.so
/opt/trinity/share/icons/hicolor/64x64/apps/kmplot.png
/opt/trinity/share/icons/hicolor/128x128/apps/kmplot.png
/opt/trinity/share/icons/hicolor/scalable/apps/kmplot.svgz
+/opt/trinity/share/man/man1/kmplot.1
/opt/trinity/share/mimelnk/application/x-kmplot.desktop
/opt/trinity/share/services/kmplot_part.desktop
../icons/kmplot.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kmplot-trinity.manpages b/ubuntu/_base/tdeedu/debian/kmplot-trinity.manpages
deleted file mode 100644
index 347f3c24b..000000000
--- a/ubuntu/_base/tdeedu/debian/kmplot-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kmplot-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kpercentage-trinity.install b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.install
index b92df18bf..6c60bc546 100644
--- a/ubuntu/_base/tdeedu/debian/kpercentage-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.install
@@ -11,4 +11,5 @@ opt/trinity/bin/kpercentage
/opt/trinity/share/icons/hicolor/48x48/apps/kpercentage.png
/opt/trinity/share/icons/hicolor/128x128/apps/kpercentage.png
/opt/trinity/share/icons/hicolor/scalable/apps/kpercentage.svgz
+/opt/trinity/share/man/man1/kpercentage.1
../icons/kpercentage.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kpercentage-trinity.manpages b/ubuntu/_base/tdeedu/debian/kpercentage-trinity.manpages
deleted file mode 100644
index a08d7f942..000000000
--- a/ubuntu/_base/tdeedu/debian/kpercentage-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kpercentage-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kstars-trinity.install b/ubuntu/_base/tdeedu/debian/kstars-trinity.install
index 81b344151..4acb1eee3 100644
--- a/ubuntu/_base/tdeedu/debian/kstars-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kstars-trinity.install
@@ -1,7 +1,7 @@
etc/trinity/kstarsrc
opt/trinity/bin/kstars
-/opt/trinity/include/tde/kstarsinterface.h
-/opt/trinity/include/tde/simclockinterface.h
+/opt/trinity/include/kstarsinterface.h
+/opt/trinity/include/simclockinterface.h
/opt/trinity/share/applications/tde/kstars.desktop
/opt/trinity/share/config.kcfg/kstars.kcfg
/opt/trinity/share/doc/tde/HTML/en/kstars/common
@@ -14,4 +14,5 @@ opt/trinity/bin/kstars
/opt/trinity/share/icons/hicolor/64x64/apps/kstars.png
/opt/trinity/share/icons/hicolor/128x128/apps/kstars.png
/opt/trinity/share/icons/hicolor/scalable/apps/kstars.svgz
+/opt/trinity/share/man/man1/kstars.1
../icons/kstars.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kstars-trinity.manpages b/ubuntu/_base/tdeedu/debian/kstars-trinity.manpages
deleted file mode 100644
index e780d23cc..000000000
--- a/ubuntu/_base/tdeedu/debian/kstars-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kstars-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/ktouch-trinity.install b/ubuntu/_base/tdeedu/debian/ktouch-trinity.install
index 38be25793..f7842ee35 100644
--- a/ubuntu/_base/tdeedu/debian/ktouch-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/ktouch-trinity.install
@@ -12,4 +12,5 @@ opt/trinity/bin/ktouch
/opt/trinity/share/icons/hicolor/48x48/apps/ktouch.png
/opt/trinity/share/icons/hicolor/128x128/apps/ktouch.png
/opt/trinity/share/icons/hicolor/scalable/apps/ktouch.svgz
+/opt/trinity/share/man/man1/ktouch.1
../icons/ktouch.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/ktouch-trinity.manpages b/ubuntu/_base/tdeedu/debian/ktouch-trinity.manpages
deleted file mode 100644
index 3c91278db..000000000
--- a/ubuntu/_base/tdeedu/debian/ktouch-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/ktouch-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kturtle-trinity.install b/ubuntu/_base/tdeedu/debian/kturtle-trinity.install
index 396fae124..2363d9a0b 100644
--- a/ubuntu/_base/tdeedu/debian/kturtle-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kturtle-trinity.install
@@ -9,4 +9,5 @@ opt/trinity/bin/kturtle
/opt/trinity/share/doc/tde/HTML/en/kturtle/*.png
/opt/trinity/share/icons/hicolor/16x16/apps/kturtle.png
/opt/trinity/share/icons/hicolor/32x32/apps/kturtle.png
+/opt/trinity/share/man/man1/kturtle.1
../icons/kturtle.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kturtle-trinity.manpages b/ubuntu/_base/tdeedu/debian/kturtle-trinity.manpages
deleted file mode 100644
index f0a3e17d8..000000000
--- a/ubuntu/_base/tdeedu/debian/kturtle-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kturtle-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kverbos-trinity.install b/ubuntu/_base/tdeedu/debian/kverbos-trinity.install
index 553844a03..23914ba30 100644
--- a/ubuntu/_base/tdeedu/debian/kverbos-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kverbos-trinity.install
@@ -13,4 +13,5 @@ opt/trinity/bin/kverbos
/opt/trinity/share/icons/hicolor/48x48/apps/kverbos.png
/opt/trinity/share/icons/hicolor/128x128/apps/kverbos.png
/opt/trinity/share/icons/hicolor/scalable/apps/kverbos.svgz
+/opt/trinity/share/man/man1/kverbos.1
../icons/kverbos.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kverbos-trinity.manpages b/ubuntu/_base/tdeedu/debian/kverbos-trinity.manpages
deleted file mode 100644
index d47a4e1b1..000000000
--- a/ubuntu/_base/tdeedu/debian/kverbos-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kverbos-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.install b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.install
index 9e2031c86..3495c8048 100644
--- a/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.install
@@ -19,4 +19,7 @@ opt/trinity/lib/libkvoctraincore.so.0.0.0
/opt/trinity/share/icons/hicolor/22x22/apps/kvoctrain.png
/opt/trinity/share/icons/hicolor/32x32/apps/kvoctrain.png
/opt/trinity/share/icons/hicolor/48x48/apps/kvoctrain.png
+/opt/trinity/share/man/man1/kvoctrain.1
+/opt/trinity/share/man/man1/langen2kvtml.1
+/opt/trinity/share/man/man1/spotlight2kvtml.1
../icons/kvoctrain.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.manpages b/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.manpages
deleted file mode 100644
index c02c3041f..000000000
--- a/ubuntu/_base/tdeedu/debian/kvoctrain-trinity.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/man/kvoctrain-trinity.1
-debian/man/langen2kvtml-trinity.1
-debian/man/spotlight2kvtml-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.install b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.install
index 5db76116f..fac2db000 100644
--- a/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.install
@@ -19,5 +19,6 @@ opt/trinity/bin/kwordquiz
/opt/trinity/share/icons/crystalsvg/48x48/mimetypes/kwordquiz_doc.png
/opt/trinity/share/icons/crystalsvg/128x128/mimetypes/kwordquiz_doc.png
/opt/trinity/share/icons/crystalsvg/scalable/mimetypes/kwordquiz_doc.svg
+/opt/trinity/share/man/man1/kwordquiz.1
/opt/trinity/share/mimelnk/application/x-kwordquiz.desktop
../icons/kwordquiz.xpm /opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.manpages b/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.manpages
deleted file mode 100644
index 1f4715f49..000000000
--- a/ubuntu/_base/tdeedu/debian/kwordquiz-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/kwordquiz-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/libkiten-dev-trinity.install b/ubuntu/_base/tdeedu/debian/libkiten-dev-trinity.install
index e64535480..f8e45f4ce 100644
--- a/ubuntu/_base/tdeedu/debian/libkiten-dev-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/libkiten-dev-trinity.install
@@ -1,3 +1,3 @@
-/opt/trinity/include/tde/libkiten
+/opt/trinity/include/libkiten
opt/trinity/lib/libkiten.la
opt/trinity/lib/libkiten.so
diff --git a/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.install b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.install
index 1695e3cf1..d27abc9e2 100644
--- a/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.install
+++ b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.install
@@ -1,4 +1,4 @@
-/opt/trinity/include/tde/libtdeedu
+/opt/trinity/include/libtdeedu
opt/trinity/lib/libextdate.la
opt/trinity/lib/libextdate.so
opt/trinity/lib/libtdeeducore.la
diff --git a/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.manpages b/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.manpages
deleted file mode 100644
index b1292516f..000000000
--- a/ubuntu/_base/tdeedu/debian/libtdeedu-dev-trinity.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/test_extdate-trinity.1
-debian/man/test_extdatepicker-trinity.1
diff --git a/ubuntu/_base/tdeedu/debian/man/blinken-trinity.1 b/ubuntu/_base/tdeedu/debian/man/blinken-trinity.1
deleted file mode 100644
index 745feac0d..000000000
--- a/ubuntu/_base/tdeedu/debian/man/blinken-trinity.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BLINKEN 1 "December 13, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-blinken \- electronic memory game for TDE
-.SH SYNOPSIS
-.B blinken
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBBlinken\fP is based on an electronic game released in 1978 called
-``Simon Says'', which challenges players to remember sequences of
-increasing length. On the face of the device, there are 4 different
-color buttons, each with its own distinctive sound. These buttons
-light up randomly, creating the sequence that the player must then
-recall. If the player is successful in remembering the sequence of
-lights in the correct order, they advance to the next stage, where an
-identical sequence with one extra step is presented.
-.PP
-This application is part of the official TDE edutainment module.
-.SH OPTIONS
-For a full summary of options, run \fIblinken \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/blinken/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/blinken/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/blinken/\fP.
-.SH AUTHOR
-Blinken was written by Albert Astals Cid <tsdgeos@terra.es> and
-Danny Allen <danny@dannyallen.co.uk>.
-.br
-This manual page was prepared by Daniel Schepler <schepler@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/celestrongps-trinity.1 b/ubuntu/_base/tdeedu/debian/man/celestrongps-trinity.1
deleted file mode 100644
index 45adf8fdc..000000000
--- a/ubuntu/_base/tdeedu/debian/man/celestrongps-trinity.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH CELESTRONGPS 1 "March 16, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-celestrongps \- Celestron GPS driver for INDI telescope control
-.SH SYNOPSIS
-.B celestrongps
-[ \fB\-v\fP ]
-.SH DESCRIPTION
-KStars allows you to configure
-and control astronomical instruments such as telescopes and focusers via
-the INDI protocol. \fBcelestrongps\fP is a device driver for supporting
-particular types of external hardware.
-.PP
-You should normally not need to run this driver directly. Instead you
-should use KStars to configure and operate your astronomical instruments.
-Most operations can be found under the Devices menu within KStars.
-.PP
-KStars will start the INDI server internally, and the INDI server will
-in turn start this device driver.
-.PP
-Much more detailed information can be found in the KStars Handbook, as
-described below.
-.PP
-KStars is a graphical desktop planetarium for TDE, and forms part of
-the official TDE edutainment module.
-.SH OPTIONS
-.TP
-\fB\-v\fP
-Write more verbose output to stderr.
-.SH SEE ALSO
-.BR indiserver (1),
-.BR kstars (1).
-.PP
-The KStars Handbook contains detailed information on how to use INDI for
-telescope control. You can read this handbook in the TDE Help Centre.
-Alternatively you can enter the URL
-\fIhelp:/kstars/indi.html\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kstars/indi.html\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
-.SH AUTHOR
-KStars was written by Jason Harris <jharris@30doradus.org>,
-Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
-Pablo de Vicente <pvicentea@wanadoo.es>, Jasem Mutlaq <mutlaqja@ikarustech.com>,
-Carsten Niehaus <cniehaus@gmx.de>, Mark Hollomon <mhh@mindspring.com>,
-Vincent Jagot <vincent.jagot@free.fr> and
-Martin Piskernig <martin.piskernig@stuwo.at>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/fliccd-trinity.1 b/ubuntu/_base/tdeedu/debian/man/fliccd-trinity.1
deleted file mode 100644
index 3a0a73c0b..000000000
--- a/ubuntu/_base/tdeedu/debian/man/fliccd-trinity.1
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FLICCD 1 "March 16, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-fliccd \- Finger Lakes Instruments CCD driver for INDI telescope control
-.SH SYNOPSIS
-.B v4ldriver
-[ \fB\-v\fP ]
-.SH DESCRIPTION
-KStars allows you to configure
-and control astronomical instruments such as telescopes and focusers via
-the INDI protocol. \fBfliccd\fP is a device driver for supporting
-particular types of external hardware.
-.PP
-You should normally not need to run this driver directly. Instead you
-should use KStars to configure and operate your astronomical instruments.
-Most operations can be found under the Devices menu within KStars.
-.PP
-KStars will start the INDI server internally, and the INDI server will
-in turn start this device driver.
-.PP
-Much more detailed information can be found in the KStars Handbook, as
-described below.
-.PP
-KStars is a graphical desktop planetarium for TDE, and forms part of
-the official TDE edutainment module.
-.SH OPTIONS
-.TP
-\fB\-v\fP
-Write more verbose output to stderr.
-.SH SEE ALSO
-.BR indiserver (1),
-.BR kstars (1).
-.PP
-The KStars Handbook contains detailed information on how to use INDI for
-telescope control. You can read this handbook in the TDE Help Centre.
-Alternatively you can enter the URL
-\fIhelp:/kstars/indi.html\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kstars/indi.html\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
-.SH AUTHOR
-KStars was written by Jason Harris <jharris@30doradus.org>,
-Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
-Pablo de Vicente <pvicentea@wanadoo.es>, Jasem Mutlaq <mutlaqja@ikarustech.com>,
-Carsten Niehaus <cniehaus@gmx.de>, Mark Hollomon <mhh@mindspring.com>,
-Vincent Jagot <vincent.jagot@free.fr> and
-Martin Piskernig <martin.piskernig@stuwo.at>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/indiserver-trinity.1 b/ubuntu/_base/tdeedu/debian/man/indiserver-trinity.1
deleted file mode 100644
index d11ee6dc9..000000000
--- a/ubuntu/_base/tdeedu/debian/man/indiserver-trinity.1
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH INDISERVER 1 "October 16, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-indiserver \- INDI server for telescope control under KStars
-.SH SYNOPSIS
-.B indiserver
-[ \fB\-p\fP \fIport\fP ]
-[ \fB\-r\fP \fIattempts\fP ]
-[ \fB\-vv\fP ]
-\fIdriver\fP [ \fIdriver\fP ... ]
-.SH DESCRIPTION
-KStars allows you to configure
-and control astronomical instruments such as telescopes and focusers via
-the INDI protocol. \fBindiserver\fP is a server that sits between the
-KStars user interface and the low-level hardware drivers.
-.PP
-The INDI server is a network server, in that either local or remote clients
-may connect to it to control astronomical instruments. The INDI server must
-be running on the machine that is physically connected to the
-astronomical instruments.
-.PP
-Note that there is no need for you to run the INDI server directly. Using
-the KStars device manager, you can set up astronomical instruments and start
-or stop the INDI server all from within KStars.
-.PP
-You may however choose to run the INDI server manually from the command
-line. In this case you must pass the names of one or more drivers for
-individual astronomical instruments. The current list of available
-drivers is:
-.PP
-.RS
-celestrongps (Celestron GPS)
-.br
-fliccd (Finger Lakes Instruments CCD)
-.br
-lx200_16 (LX200 16")
-.br
-lx200autostar (LX200 Autostar)
-.br
-lx200classic (LX200 Classic)
-.br
-lx200generic (LX200 Generic)
-.br
-lx200gps (LX200 GPS)
-.br
-temma (Temma Takahashi)
-.br
-v4ldriver (Video4Linux Generic)
-.br
-v4lphilips (Philips Webcam)
-.RE
-.PP
-Much more detailed information can be found in the KStars Handbook, as
-described below.
-.PP
-KStars is a graphical desktop planetarium for TDE, and forms part of
-the official TDE edutainment module.
-.SH OPTIONS
-.TP
-\fB\-p\fP \fIport\fP
-Specify the port to listen on (defaults to 7624).
-.TP
-\fB\-r\fP \fIattempts\fP
-Specify the maximum number of restart attempts for each driver (defaults to 2).
-.TP
-\fB\-vv\fP
-Write more verbose output to stderr.
-.SH EXAMPLE
-To start an INDI server running an LX200 GPS driver and listening to
-connections on port 8000:
-.PP
-.RS
-\fIprompt$\fP indiserver -p 8000 lx200gps
-.RE
-.SH SEE ALSO
-.BR celestrongps (1),
-.BR fliccd (1),
-.BR lx200_16 (1),
-.BR lx200autostar (1),
-.BR lx200classic (1),
-.BR lx200generic (1),
-.BR lx200gps (1),
-.BR kstars (1),
-.BR temma (1),
-.BR v4ldriver (1),
-.BR v4lphilips (1).
-.PP
-The KStars Handbook contains detailed information on how to use INDI for
-telescope control. You can read this handbook in the TDE Help Centre.
-Alternatively you can enter the URL
-\fIhelp:/kstars/indi.html\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kstars/indi.html\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kstars/indi.html\fP.
-.SH AUTHOR
-KStars was written by Jason Harris <jharris@30doradus.org>,
-Heiko Evermann <heiko@evermann.de>, Thomas Kabelmann <tk78@gmx.de>,
-Pablo de Vicente <pvicentea@wanadoo.es>, Jasem Mutlaq <mutlaqja@ikarustech.com>,
-Carsten Niehaus <cniehaus@gmx.de>, Mark Hollomon <mhh@mindspring.com>,
-Vincent Jagot <vincent.jagot@free.fr> and
-Martin Piskernig <martin.piskernig@stuwo.at>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/kalzium-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kalzium-trinity.1
deleted file mode 100644
index b01903f10..000000000
--- a/ubuntu/_base/tdeedu/debian/man/kalzium-trinity.1
+++ /dev/null
@@ -1,55 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KALZIUM 1 "March 16, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kalzium \- a chemistry teaching tool for TDE
-.SH SYNOPSIS
-.B kalzium
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKalzium\fP is a program which shows you the Periodic System of
-Elements (PSE). You can use Kalzium to search for information about
-the elements or to learn facts about the PSE.
-.PP
-Kalzium provides you with all kinds of information about the PSE. You
-can look up lots of information about the elements and also use
-visualisations to show them.
-.PP
-You can visualize the Periodic Table of the Elements by blocks, groups,
-acidic behavior or different states of matter. You can also plot data for a
-range of elements (weight, mean weight, density, IE1, IE2, electronegativity),
-and you can go back in time to see what elements were known at a given date.
-.PP
-This application is part of the official TDE edutainment module.
-.SH OPTIONS
-For a full summary of options, run \fIkalzium \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kalzium/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kalzium/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kalzium/\fP.
-.SH AUTHOR
-Kalzium was written by Carsten Niehaus <cniehaus@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/kanagram-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kanagram-trinity.1
deleted file mode 100644
index 0955cd6d8..000000000
--- a/ubuntu/_base/tdeedu/debian/man/kanagram-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KANAGRAM 1 "December 13, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kanagram \- a letter order game for TDE
-.SH SYNOPSIS
-.B kanagram
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKAnagram\fP is a game that is based on the word/letter puzzles that the
-author played as a child. A word is picked at random and displayed with
-its letters in a messed order, with difficulty dependent on the chosen level.
-You have an unlimited number of attempts, and scores are kept.
-.PP
-It is a very simply constructed game, with 3 dificulty levels of play.
-It is fully customizable, allowing you to write in your own words and set
-your own 'look and feel' of the game. It is aimed for children aged 10+
-because of the difficulty, but of course everyone is welcome to try.
-.PP
-This application is part of the official TDE edutainment module.
-.SH OPTIONS
-For a full summary of options, run \fIkanagram \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kanagram/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kanagram/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kanagram/\fP.
-.SH AUTHOR
-KAnagram was written by Joshua Keel <joshuakeel@gmail.com> and
-Danny Allen <danny@dannyallen.co.uk>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/kbruch-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kbruch-trinity.1
deleted file mode 100644
index 68655e82e..000000000
--- a/ubuntu/_base/tdeedu/debian/man/kbruch-trinity.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KBRUCH 1 "October 16, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kbruch \- a fraction calculation teaching tool for TDE
-.SH SYNOPSIS
-.B kbruch
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKBruch\fP is a small program to practice calculating with fractions.
-Different exercises are provided for this purpose. The program checks
-the user's input and gives feedback.
-.PP
-This application is part of the official TDE edutainment module.
-.SH OPTIONS
-For a full summary of options, run \fIkbruch \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kbruch/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kbruch/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kbruch/\fP.
-.SH AUTHOR
-KBruch was written by Sebastian Stein <seb.kde@hpfsc.de>,
-Eva Brucherseifer <eva@kde.org> and others.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/keduca-shrinker-trinity.1 b/ubuntu/_base/tdeedu/debian/man/keduca-shrinker-trinity.1
deleted file mode 100644
index 57de28410..000000000
--- a/ubuntu/_base/tdeedu/debian/man/keduca-shrinker-trinity.1
+++ /dev/null
@@ -1,66 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KEDUCA-SHRINKER 1 "September 1, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-keduca-shrinker \- extract a random sample from a large KEduca test file
-.SH SYNOPSIS
-.B keduca-shrinker
-[ \fB\-o, \-\-output\fP=\fIfile\fP ]
-[ \fB\-n, \-\-number\fP=\fInumber\fP ]
-\fB\-i, \-\-input\fP=\fIfile\fP
-.SH DESCRIPTION
-\fBkeduca-shrinker\fP is a small program that reads a large KEduca
-test file (.edu) and extracts a random sample of questions to create a
-new smaller test file. For example, it could take a 100 question test
-file as input and then output a test file with 20 questions selected at
-random.
-.PP
-Note that the input file \fBmust\fP be uncompressed. When you save the
-original test in the KEduca Editor, you should explicitly clear the "Compress
-the file" checkbox. Otherwise keduca-shrinker will not be able to read it.
-.PP
-\fBKEduca\fP is a flash-card application for working with interactive
-form-based tests. It is shipped as part of the official TDE edutainment
-module.
-.SH OPTIONS
-.TP
-\fB\-i, \-\-input\fP=\fIfile\fP
-The large KEduca test file that should be read as input.
-.TP
-\fB\-o, \-\-output\fP=\fIfile\fP
-The smaller KEduca test file that should be written as output.
-This defaults to the input filename with \fI-shrinked\fP appended to its
-base. For example, if the input file is \fIfoo.edu\fP then the
-default output file is \fIfoo-shrinked.edu\fP.
-.TP
-\fB\-n, \-\-number\fP=\fInumber\fP
-The number of random questions to select from the input file.
-This defaults to 20.
-.SH SEE ALSO
-.BR keduca (1),
-.BR keducabuilder (1).
-.PP
-This tool is not yet part of the official TDE edutainment module.
-Its upstream site is
-\fIhttps://gna.org/projects/keduca-shrinker/\fP.
-.SH AUTHOR
-keduca-shrinker was written by Mathieu Roy <yeupou@coleumes.org>.
-It is licensed under the GNU General Public License (see the script
-itself for details).
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/keduca-trinity.1 b/ubuntu/_base/tdeedu/debian/man/keduca-trinity.1
deleted file mode 100644
index 634977aa1..000000000
--- a/ubuntu/_base/tdeedu/debian/man/keduca-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KEDUCA 1 "September 1, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-keduca \- interactive form-based tests for TDE
-.SH SYNOPSIS
-.B keduca
-.RI "[ " generic-options " ]"
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBKEduca\fP is a flash-card application that allows you to work with
-interactive form-based tests. This application is used only for viewing
-and taking these tests \- you can create and edit tests using the
-related application \fBKEducaBuilder\fP.
-.PP
-This application is part of the official TDE edutainment module.
-.SH OPTIONS
-For a full summary of options, run \fIkeduca \-\-help\fP.
-.SH SEE ALSO
-.BR keduca-shrinker (1),
-.BR keducabuilder (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/keduca/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/keduca/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/keduca/\fP.
-.SH AUTHOR
-KEduca was written by Javier Campos <javi@asyris.org>,
-Klas Kalass <klas@kde.org>, Henrique Pinto <henrique.pinto@kdemail.net>
-and Anne-Marie Mahfouf <annma@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/keducabuilder-trinity.1 b/ubuntu/_base/tdeedu/debian/man/keducabuilder-trinity.1
deleted file mode 100644
index a6431a28d..000000000
--- a/ubuntu/_base/tdeedu/debian/man/keducabuilder-trinity.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KEDUCABUILDER 1 "September 1, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-keducabuilder \- test/exam editor for KEduca
-.SH SYNOPSIS
-.B keducabuilder
-.RI "[ " generic-options " ]"
-[ \fIfile\fP ]
-.SH DESCRIPTION
-\fBKEducaBuilder\fP is the test editor for \fBKEduca\fP, a flash-card
-application for working with interactive form-based tests.
-KEducaBuilder is used to create and edit these tests, whereas KEduca
-itself can be used to view and take these tests.
-.PP
-This application is part of the official TDE edutainment module.
-.SH OPTIONS
-For a full summary of options, run \fIkeduca \-\-help\fP.
-.SH SEE ALSO
-.BR keduca (1),
-.BR keduca-shrinker (1).
-.PP
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/keduca/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/keduca/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/keduca/\fP.
-.SH AUTHOR
-KEduca was written by Javier Campos <javi@asyris.org>,
-Klas Kalass <klas@kde.org>, Henrique Pinto <henrique.pinto@kdemail.net>
-and Anne-Marie Mahfouf <annma@kde.org>.
-.br
-This manual page was prepared by Ben Burton <bab@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/kgeography-trinity.1 b/ubuntu/_base/tdeedu/debian/man/kgeography-trinity.1
deleted file mode 100644
index 451605d93..000000000
--- a/ubuntu/_base/tdeedu/debian/man/kgeography-trinity.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KGEOGRAPHY 1 "December 13, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-kgeography \- geography learning tool for TDE
-.SH SYNOPSIS
-.B kgeography
-.RI "[ " generic-options " ]"
-.SH DESCRIPTION
-\fBKGeography\fP contains maps allowing you to learn various countries or
- the political divisions of several countries. It has several modes,
- including a map browser and games involving the names, capitals, or
- flags of the map divisions.
-.PP
-This application is part of the official TDE edutainment module.
-.SH OPTIONS
-For a full summary of options, run \fIkgeography \-\-help\fP.
-.SH SEE ALSO
-Full user documentation is available through the TDE Help Centre.
-You can also enter the URL
-\fIhelp:/kgeography/\fP
-directly into konqueror or you can run
-`\fIkhelpcenter help:/kgeography/\fP'
-from the command-line.
-.PP
-If the TDE Help Centre is not installed then you can install the package
-\fItdeedu-doc-html\fP and read this documentation in HTML format from
-\fI/opt/trinity/share/doc/tde/HTML/en/kgeography/\fP.
-.SH AUTHOR
-KGeography was written by Albert Astals Cid <tsdgeos@terra.es>.
-.br
-This manual page was prepared by Daniel Schepler <schepler@debian.org>
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/ubuntu/_base/tdeedu/debian/man/khangman-trinity.1 b/ubuntu/_base/tdeedu/debian/man/khangman-trinity.1
deleted file mode 100644
index b130aa3ca..000000000
--- a/ubuntu/_base/tdeedu/debian/man/khangman-trinity.1
+++ /dev/null
@@ -1,52 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KHANGMAN 1 "October 16, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break