From 31fc951bd08b33682f26a4b820f51d679787b219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 2 May 2019 18:57:27 +0200 Subject: [PATCH] DEB tork: 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 cd0d3349cf62fce2a244fd6a3f91187ad8db0828) --- debian/_base/applications/tork/debian/docs | 3 +++ debian/_base/applications/tork/debian/rules | 30 +++------------------ ubuntu/_base/applications/tork/debian/docs | 3 +++ ubuntu/_base/applications/tork/debian/rules | 30 +++------------------ 4 files changed, 14 insertions(+), 52 deletions(-) create mode 100644 debian/_base/applications/tork/debian/docs create mode 100644 ubuntu/_base/applications/tork/debian/docs diff --git a/debian/_base/applications/tork/debian/docs b/debian/_base/applications/tork/debian/docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/debian/_base/applications/tork/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/debian/_base/applications/tork/debian/rules b/debian/_base/applications/tork/debian/rules index cbb4c2d6c..232394751 100755 --- a/debian/_base/applications/tork/debian/rules +++ b/debian/_base/applications/tork/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 @@ -11,33 +14,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -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 - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - install/tork-trinity:: mkdir -p debian/tmp/usr/share/menu sed "s|package(tork)|package(tork-trinity)|" \ debian/tmp/usr/share/menu/tork-trinity - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap diff --git a/ubuntu/_base/applications/tork/debian/docs b/ubuntu/_base/applications/tork/debian/docs new file mode 100644 index 000000000..ca0272abf --- /dev/null +++ b/ubuntu/_base/applications/tork/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +TODO diff --git a/ubuntu/_base/applications/tork/debian/rules b/ubuntu/_base/applications/tork/debian/rules index cbb4c2d6c..232394751 100755 --- a/ubuntu/_base/applications/tork/debian/rules +++ b/ubuntu/_base/applications/tork/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 @@ -11,33 +14,8 @@ DEB_CONFIGURE_INFODIR := /opt/trinity/share/info DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -post-patches:: debian/stamp-bootstrap - -debian/stamp-bootstrap: - dh_testdir - - # Regenerate build system -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 - - autoreconf --install && automake -f && \ - $(MAKE) -f admin/Makefile.common && \ - touch debian/stamp-bootstrap - install/tork-trinity:: mkdir -p debian/tmp/usr/share/menu sed "s|package(tork)|package(tork-trinity)|" \ debian/tmp/usr/share/menu/tork-trinity - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap