summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-05-02 18:09:40 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-05-02 18:09:40 +0200
commit11a8d4e8c73649d5467d2d09e36df1cec32423da (patch)
tree1c8381dd4537e1675c5bd9af88e403d6d576ac02
parentae2affd8684e7e8c7a52a2e17e8a4bcea16b137e (diff)
downloadtde-packaging-11a8d4e8c73649d5467d2d09e36df1cec32423da.zip
tde-packaging-11a8d4e8c73649d5467d2d09e36df1cec32423da.tar.gz
DEB krusader: Disable build with --enable-final.
Add basic package documentation. Cleanup rules. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/_base/applications/krusader/debian/docs1
-rwxr-xr-xdebian/_base/applications/krusader/debian/rules22
-rw-r--r--ubuntu/_base/applications/krusader/debian/docs1
-rwxr-xr-xubuntu/_base/applications/krusader/debian/rules22
4 files changed, 8 insertions, 38 deletions
diff --git a/debian/_base/applications/krusader/debian/docs b/debian/_base/applications/krusader/debian/docs
index 623fe2d..1a4f031 100644
--- a/debian/_base/applications/krusader/debian/docs
+++ b/debian/_base/applications/krusader/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
FAQ
README
TODO
diff --git a/debian/_base/applications/krusader/debian/rules b/debian/_base/applications/krusader/debian/rules
index 09dae12..978b9c7 100755
--- a/debian/_base/applications/krusader/debian/rules
+++ b/debian/_base/applications/krusader/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
@@ -8,8 +11,6 @@ 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_DESTDIR = $(CURDIR)/debian/krusader-trinity/
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
@@ -17,23 +18,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
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
-
install/krusader-trinity::
# install xpm files used by menu
install -D -p -m0644 pics/cr16-app-krusader_root.xpm \
diff --git a/ubuntu/_base/applications/krusader/debian/docs b/ubuntu/_base/applications/krusader/debian/docs
index 623fe2d..1a4f031 100644
--- a/ubuntu/_base/applications/krusader/debian/docs
+++ b/ubuntu/_base/applications/krusader/debian/docs
@@ -1,3 +1,4 @@
+AUTHORS
FAQ
README
TODO
diff --git a/ubuntu/_base/applications/krusader/debian/rules b/ubuntu/_base/applications/krusader/debian/rules
index 09dae12..978b9c7 100755
--- a/ubuntu/_base/applications/krusader/debian/rules
+++ b/ubuntu/_base/applications/krusader/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
@@ -8,8 +11,6 @@ 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_DESTDIR = $(CURDIR)/debian/krusader-trinity/
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
@@ -17,23 +18,6 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
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
-
install/krusader-trinity::
# install xpm files used by menu
install -D -p -m0644 pics/cr16-app-krusader_root.xpm \