From cf6cfba504d875349fbeb4c993b245e2dae4e010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 2 May 2019 18:09:40 +0200 Subject: [PATCH] DEB krusader: Disable build with --enable-final. Add basic package documentation. Cleanup rules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 11a8d4e8c73649d5467d2d09e36df1cec32423da) --- .../_base/applications/krusader/debian/docs | 1 + .../_base/applications/krusader/debian/rules | 22 +++---------------- .../_base/applications/krusader/debian/docs | 1 + .../_base/applications/krusader/debian/rules | 22 +++---------------- 4 files changed, 8 insertions(+), 38 deletions(-) diff --git a/debian/_base/applications/krusader/debian/docs b/debian/_base/applications/krusader/debian/docs index 623fe2da9..1a4f0317f 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 09dae12b8..978b9c75a 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 623fe2da9..1a4f0317f 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 09dae12b8..978b9c75a 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 \