diff options
Diffstat (limited to 'ubuntu/_base')
12 files changed, 72 insertions, 70 deletions
diff --git a/ubuntu/_base/applications/development/piklab/debian/control b/ubuntu/_base/applications/development/piklab/debian/control index 502bc13bd..e67fd589a 100644 --- a/ubuntu/_base/applications/development/piklab/debian/control +++ b/ubuntu/_base/applications/development/piklab/debian/control @@ -2,8 +2,8 @@ Source: piklab-trinity Section: electronics Priority: extra Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: cdbs, debhelper (>= 10~), autotools-dev, quilt, chrpath, - libusb-dev, tdelibs14-trinity-dev, libreadline-dev | libreadline6-dev | libreadline5-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, + libusb-dev, libreadline-dev | libreadline6-dev | libreadline5-dev Standards-Version: 3.8.4 Homepage: http://piklab.sourceforge.net/ diff --git a/ubuntu/_base/applications/development/piklab/debian/install b/ubuntu/_base/applications/development/piklab/debian/install index 4b76727ec..36f006452 100644 --- a/ubuntu/_base/applications/development/piklab/debian/install +++ b/ubuntu/_base/applications/development/piklab/debian/install @@ -1,3 +1 @@ debian/*.xpm opt/trinity/share/pixmaps/ -#debian/*.desktop usr/share/applications/ -#debian/overrides/piklab usr/share/lintian/overrides/ diff --git a/ubuntu/_base/applications/development/piklab/debian/rules b/ubuntu/_base/applications/development/piklab/debian/rules index f21c51790..a6797f19a 100755 --- a/ubuntu/_base/applications/development/piklab/debian/rules +++ b/ubuntu/_base/applications/development/piklab/debian/rules @@ -1,17 +1,17 @@ #!/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 /usr/share/cdbs/1/class/cmake.mk include debian/cdbs/debian-tde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include -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) - -binary-install/piklab-trinity:: - mv debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1x debian/$(cdbs_curpkg)/opt/trinity/share/man/man1/piklab.1 +DEB_CMAKE_EXTRA_FLAGS := \ + -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \ + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -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/core/tdebase/debian/kate-trinity.install b/ubuntu/_base/core/tdebase/debian/kate-trinity.install index 4ab5fb474..9e8dc8111 100644 --- a/ubuntu/_base/core/tdebase/debian/kate-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/kate-trinity.install @@ -19,14 +19,12 @@ debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/highlighti debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modified.png debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modmod.png debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/modonhd.png -debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/16x16/actions/null.png debian/tmp/opt/trinity/share/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/curfiledir.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/indent.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modified.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modmod.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/modonhd.png -debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/null.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/16x16/actions/unindent.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/indent.png debian/tmp/opt/trinity/share/apps/kate/icons/locolor/22x22/actions/unindent.png diff --git a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install index b7fd05d0c..c02af16b0 100644 --- a/ubuntu/_base/core/tdebase/debian/konsole-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/konsole-trinity.install @@ -58,6 +58,8 @@ debian/tmp/opt/trinity/share/apps/konsole/su.desktop debian/tmp/opt/trinity/share/apps/konsole/sumc.desktop debian/tmp/opt/trinity/share/apps/konsole/syscolor.schema debian/tmp/opt/trinity/share/apps/konsole/tips +debian/tmp/opt/trinity/share/apps/konsole/Solarized.schema +debian/tmp/opt/trinity/share/apps/konsole/SolarizedLight.schema debian/tmp/opt/trinity/share/apps/konsole/Transparent_darkbg.schema debian/tmp/opt/trinity/share/apps/konsole/Transparent_lightbg.schema debian/tmp/opt/trinity/share/apps/konsole/Transparent_MC.schema diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install index 9ddb66bc2..132395ebd 100644 --- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install @@ -119,5 +119,4 @@ debian/tmp/opt/trinity/share/man/man1/ksystraycmd.1 debian/tmp/opt/trinity/share/man/man1/kwriteconfig.1 debian/tmp/opt/trinity/share/man/man1/kxkb.1 debian/tmp/opt/trinity/share/man/man1/tdedebugdialog.1 -debian/tmp/opt/trinity/share/man/man1/tdeio_system_documenthelper.1 debian/tmp/opt/trinity/share/man/man1/tdesu.1 diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control index 2af3ea23e..c2e08704b 100644 --- a/ubuntu/_base/core/tdelibs/debian/control +++ b/ubuntu/_base/core/tdelibs/debian/control @@ -13,7 +13,7 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutil liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev, libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev, libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev, - libtiff-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, + libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils, libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev, texinfo, libogg-dev, libtqtinterface-dev, lsb-release, base-files, sudo, libr-dev, diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules index 533c0ed51..bcbeda4fc 100755 --- a/ubuntu/_base/core/tdelibs/debian/rules +++ b/ubuntu/_base/core/tdelibs/debian/rules @@ -40,6 +40,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_LIBART="ON" \ -DWITH_LIBIDN="ON" \ -DWITH_TIFF="ON" \ + -DWITH_WEBP="ON" \ -DWITH_JASPER="ON" \ -DWITH_OPENEXR="ON" \ -DWITH_AVAHI="ON" \ diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install index 615399188..965adf1ea 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs-data-trinity.install @@ -1944,6 +1944,7 @@ debian/tmp/opt/trinity/share/services/tga.kimgio debian/tmp/opt/trinity/share/services/tiff.kimgio debian/tmp/opt/trinity/share/services/webdav.protocol debian/tmp/opt/trinity/share/services/webdavs.protocol +debian/tmp/opt/trinity/share/services/webp.kimgio debian/tmp/opt/trinity/share/services/xbm.kimgio debian/tmp/opt/trinity/share/services/xcf.kimgio debian/tmp/opt/trinity/share/services/xpm.kimgio diff --git a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install index 245802daa..f71e37af6 100644 --- a/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install +++ b/ubuntu/_base/core/tdelibs/debian/tdelibs14-trinity.install @@ -139,6 +139,8 @@ debian/tmp/opt/trinity/lib/trinity/kimg_tga.la debian/tmp/opt/trinity/lib/trinity/kimg_tga.so debian/tmp/opt/trinity/lib/trinity/kimg_tiff.la debian/tmp/opt/trinity/lib/trinity/kimg_tiff.so +debian/tmp/opt/trinity/lib/trinity/kimg_webp.la +debian/tmp/opt/trinity/lib/trinity/kimg_webp.so debian/tmp/opt/trinity/lib/trinity/kimg_xcf.la debian/tmp/opt/trinity/lib/trinity/kimg_xcf.so debian/tmp/opt/trinity/lib/trinity/kimg_xview.la diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index fc421f516..4ac9986bf 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -16,7 +16,7 @@ usr/include/tqt3/ntqbuffer.h usr/include/tqt3/ntqbutton.h usr/include/tqt3/ntqbuttongroup.h usr/include/tqt3/ntqcache.h -usr/include/tqt3/ntqcanvas.h +usr/include/tqt3/tqcanvas.h usr/include/tqt3/ntqcdestyle.h usr/include/tqt3/ntqcheckbox.h usr/include/tqt3/ntqcleanuphandler.h @@ -29,10 +29,10 @@ usr/include/tqt3/ntqcompactstyle.h usr/include/tqt3/ntqconnection.h usr/include/tqt3/ntqcstring.h usr/include/tqt3/ntqcursor.h -usr/include/tqt3/ntqdatabrowser.h +usr/include/tqt3/tqdatabrowser.h usr/include/tqt3/ntqdatastream.h -usr/include/tqt3/ntqdatatable.h -usr/include/tqt3/ntqdataview.h +usr/include/tqt3/tqdatatable.h +usr/include/tqt3/tqdataview.h usr/include/tqt3/ntqdatetime.h usr/include/tqt3/ntqdatetimeedit.h usr/include/tqt3/ntqdeepcopy.h @@ -44,11 +44,11 @@ usr/include/tqt3/ntqdir.h usr/include/tqt3/ntqdns.h usr/include/tqt3/ntqdockarea.h usr/include/tqt3/ntqdockwindow.h -usr/include/tqt3/ntqdom.h +usr/include/tqt3/tqdom.h usr/include/tqt3/ntqdragobject.h usr/include/tqt3/ntqdrawutil.h usr/include/tqt3/ntqdropsite.h -usr/include/tqt3/ntqeditorfactory.h +usr/include/tqt3/tqeditorfactory.h usr/include/tqt3/ntqerrormessage.h usr/include/tqt3/ntqeucjpcodec.h usr/include/tqt3/ntqeuckrcodec.h @@ -89,8 +89,8 @@ usr/include/tqt3/ntqhostaddress.h usr/include/tqt3/ntqhttp.h usr/include/tqt3/ntqiconset.h usr/include/tqt3/ntqiconview.h -usr/include/tqt3/ntqimage.h -usr/include/tqt3/ntqimageformatplugin.h +usr/include/tqt3/tqimage.h +usr/include/tqt3/tqimageformatplugin.h usr/include/tqt3/ntqinputcontext.h usr/include/tqt3/ntqinputcontextfactory.h usr/include/tqt3/ntqinputcontextplugin.h @@ -114,7 +114,7 @@ usr/include/tqt3/ntqlistview.h usr/include/tqt3/ntqlocale.h usr/include/tqt3/ntqlocalfs.h usr/include/tqt3/ntqmainwindow.h -usr/include/tqt3/ntqmap.h +usr/include/tqt3/tqmap.h usr/include/tqt3/ntqmemarray.h usr/include/tqt3/ntqmenubar.h usr/include/tqt3/ntqmenudata.h @@ -131,15 +131,15 @@ usr/include/tqt3/ntqnamespace.h usr/include/tqt3/ntqnetwork.h usr/include/tqt3/ntqnetworkprotocol.h usr/include/tqt3/ntqnp.h -usr/include/tqt3/ntqobject.h -usr/include/tqt3/ntqobjectcleanuphandler.h -usr/include/tqt3/ntqobjectdefs.h -usr/include/tqt3/ntqobjectdict.h -usr/include/tqt3/ntqobjectlist.h +usr/include/tqt3/tqobject.h +usr/include/tqt3/tqobjectcleanuphandler.h +usr/include/tqt3/tqobjectdefs.h +usr/include/tqt3/tqobjectdict.h +usr/include/tqt3/tqobjectlist.h usr/include/tqt3/ntqpaintdevice.h usr/include/tqt3/ntqpaintdevicemetrics.h usr/include/tqt3/ntqpainter.h -usr/include/tqt3/ntqpair.h +usr/include/tqt3/tqpair.h usr/include/tqt3/ntqpalette.h usr/include/tqt3/ntqpen.h usr/include/tqt3/ntqpicture.h @@ -156,12 +156,12 @@ usr/include/tqt3/ntqprinter.h usr/include/tqt3/ntqprocess.h usr/include/tqt3/ntqprogressbar.h usr/include/tqt3/ntqprogressdialog.h -usr/include/tqt3/ntqptrcollection.h -usr/include/tqt3/ntqptrdict.h -usr/include/tqt3/ntqptrlist.h -usr/include/tqt3/ntqptrqueue.h -usr/include/tqt3/ntqptrstack.h -usr/include/tqt3/ntqptrvector.h +usr/include/tqt3/tqptrcollection.h +usr/include/tqt3/tqptrdict.h +usr/include/tqt3/tqptrlist.h +usr/include/tqt3/tqptrqueue.h +usr/include/tqt3/tqptrstack.h +usr/include/tqt3/tqptrvector.h usr/include/tqt3/ntqpushbutton.h usr/include/tqt3/ntqradiobutton.h usr/include/tqt3/ntqrangecontrol.h @@ -194,32 +194,33 @@ usr/include/tqt3/ntqsound.h usr/include/tqt3/ntqspinbox.h usr/include/tqt3/ntqsplashscreen.h usr/include/tqt3/ntqsplitter.h -usr/include/tqt3/ntqsql.h -usr/include/tqt3/ntqsqlcursor.h -usr/include/tqt3/ntqsqldatabase.h -usr/include/tqt3/ntqsqldriver.h -usr/include/tqt3/ntqsqldriverplugin.h -usr/include/tqt3/ntqsqleditorfactory.h -usr/include/tqt3/ntqsqlerror.h -usr/include/tqt3/ntqsqlfield.h -usr/include/tqt3/ntqsqlform.h -usr/include/tqt3/ntqsqlindex.h -usr/include/tqt3/ntqsqlpropertymap.h -usr/include/tqt3/ntqsqlquery.h -usr/include/tqt3/ntqsqlrecord.h -usr/include/tqt3/ntqsqlresult.h -usr/include/tqt3/ntqsqlselectcursor.h +usr/include/tqt3/tqsql.h +usr/include/tqt3/tqsqlcursor.h +usr/include/tqt3/tqsqldatabase.h +usr/include/tqt3/tqsqldriver.h +usr/include/tqt3/tqsqldriverplugin.h +usr/include/tqt3/tqsqleditorfactory.h +usr/include/tqt3/tqsqlerror.h +usr/include/tqt3/tqsqlfield.h +usr/include/tqt3/tqsqlform.h +usr/include/tqt3/tqsqlindex.h +usr/include/tqt3/tqsqlpropertymap.h +usr/include/tqt3/tqsqlquery.h +usr/include/tqt3/tqsqlrecord.h +usr/include/tqt3/tqsqlresult.h +usr/include/tqt3/tqsqlselectcursor.h usr/include/tqt3/ntqstatusbar.h -usr/include/tqt3/ntqstring.h -usr/include/tqt3/ntqstringlist.h -usr/include/tqt3/ntqstrlist.h -usr/include/tqt3/ntqstrvec.h +usr/include/tqt3/tqstring.h +usr/include/tqt3/tqstringlist.h +usr/include/tqt3/tqstrlist.h +usr/include/tqt3/tqstrvec.h usr/include/tqt3/ntqstyle.h usr/include/tqt3/ntqstylefactory.h usr/include/tqt3/ntqstyleplugin.h usr/include/tqt3/ntqstylesheet.h usr/include/tqt3/ntqsyntaxhighlighter.h usr/include/tqt3/ntqt.h +usr/include/tqt3/tqt.h usr/include/tqt3/ntqtabbar.h usr/include/tqt3/ntqtabdialog.h usr/include/tqt3/ntqtable.h @@ -247,9 +248,9 @@ usr/include/tqt3/ntqurloperator.h usr/include/tqt3/ntqutfcodec.h usr/include/tqt3/ntquuid.h usr/include/tqt3/ntqvalidator.h -usr/include/tqt3/ntqvaluelist.h -usr/include/tqt3/ntqvaluestack.h -usr/include/tqt3/ntqvaluevector.h +usr/include/tqt3/tqvaluelist.h +usr/include/tqt3/tqvaluestack.h +usr/include/tqt3/tqvaluevector.h usr/include/tqt3/ntqvariant.h usr/include/tqt3/ntqvbox.h usr/include/tqt3/ntqvbuttongroup.h @@ -257,15 +258,15 @@ usr/include/tqt3/ntqvfbhdr.h usr/include/tqt3/ntqvgroupbox.h usr/include/tqt3/ntqwaitcondition.h usr/include/tqt3/ntqwhatsthis.h -usr/include/tqt3/ntqwidget.h -usr/include/tqt3/ntqwidgetintdict.h -usr/include/tqt3/ntqwidgetlist.h -usr/include/tqt3/ntqwidgetplugin.h -usr/include/tqt3/ntqwidgetstack.h +usr/include/tqt3/tqwidget.h +usr/include/tqt3/tqwidgetintdict.h +usr/include/tqt3/tqwidgetlist.h +usr/include/tqt3/tqwidgetplugin.h +usr/include/tqt3/tqwidgetstack.h usr/include/tqt3/ntqwindowdefs.h usr/include/tqt3/ntqwindowsstyle.h usr/include/tqt3/ntqwinexport.h usr/include/tqt3/ntqwizard.h usr/include/tqt3/ntqwmatrix.h usr/include/tqt3/ntqworkspace.h -usr/include/tqt3/ntqxml.h +usr/include/tqt3/tqxml.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install index c86cba1b1..9425bb67a 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -8,4 +8,4 @@ usr/include/tqt3/ntqconfig.h usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqglcolormap.h usr/include/tqt3/ntqmodules.h -usr/include/tqt3/ntqwidgetfactory.h +usr/include/tqt3/tqwidgetfactory.h |