summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/_base/applications/development/piklab/debian/control4
-rw-r--r--debian/_base/applications/development/piklab/debian/install2
-rwxr-xr-xdebian/_base/applications/development/piklab/debian/rules24
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-trinity-bin.install1
4 files changed, 14 insertions, 17 deletions
diff --git a/debian/_base/applications/development/piklab/debian/control b/debian/_base/applications/development/piklab/debian/control
index 733219472..5ae69eb30 100644
--- a/debian/_base/applications/development/piklab/debian/control
+++ b/debian/_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/debian/_base/applications/development/piklab/debian/install b/debian/_base/applications/development/piklab/debian/install
index 4b76727ec..36f006452 100644
--- a/debian/_base/applications/development/piklab/debian/install
+++ b/debian/_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/debian/_base/applications/development/piklab/debian/rules b/debian/_base/applications/development/piklab/debian/rules
index f21c51790..a6797f19a 100755
--- a/debian/_base/applications/development/piklab/debian/rules
+++ b/debian/_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/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install b/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
index 9ddb66bc2..132395ebd 100644
--- a/debian/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/_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