From caf63f4e59627dcebfebae92c662117a0f09a0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 2 May 2019 17:49:50 +0200 Subject: [PATCH] DEB kdbg: 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 --- debian/_base/applications/kdbg/debian/docs | 1 + debian/_base/applications/kdbg/debian/rules | 29 ++------------------- ubuntu/_base/applications/kdbg/debian/docs | 1 + ubuntu/_base/applications/kdbg/debian/rules | 29 ++------------------- 4 files changed, 6 insertions(+), 54 deletions(-) diff --git a/debian/_base/applications/kdbg/debian/docs b/debian/_base/applications/kdbg/debian/docs index 2e58c4d34..d5aaf5213 100644 --- a/debian/_base/applications/kdbg/debian/docs +++ b/debian/_base/applications/kdbg/debian/docs @@ -1,2 +1,3 @@ BUGS +README TODO diff --git a/debian/_base/applications/kdbg/debian/rules b/debian/_base/applications/kdbg/debian/rules index 9af858abc..a4ee92738 100755 --- a/debian/_base/applications/kdbg/debian/rules +++ b/debian/_base/applications/kdbg/debian/rules @@ -1,7 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -#export DH_VERBOSE=1 +# Currently is not possible to build with --enable-final +DEB_BUILD_OPTIONS += noopt DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man @@ -14,31 +15,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-tde.mk -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 - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap - install/kdbg-trinity:: dh_testdir @@ -48,4 +24,3 @@ install/kdbg-trinity:: mkdir -p debian/kdbg-trinity/opt/trinity/share/man mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/ rmdir debian/kdbg-trinity/usr/share/man - diff --git a/ubuntu/_base/applications/kdbg/debian/docs b/ubuntu/_base/applications/kdbg/debian/docs index 2e58c4d34..d5aaf5213 100644 --- a/ubuntu/_base/applications/kdbg/debian/docs +++ b/ubuntu/_base/applications/kdbg/debian/docs @@ -1,2 +1,3 @@ BUGS +README TODO diff --git a/ubuntu/_base/applications/kdbg/debian/rules b/ubuntu/_base/applications/kdbg/debian/rules index 9af858abc..a4ee92738 100755 --- a/ubuntu/_base/applications/kdbg/debian/rules +++ b/ubuntu/_base/applications/kdbg/debian/rules @@ -1,7 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -#export DH_VERBOSE=1 +# Currently is not possible to build with --enable-final +DEB_BUILD_OPTIONS += noopt DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man @@ -14,31 +15,6 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-tde.mk -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 - -clean:: - dh_testdir - rm -f debian/stamp-bootstrap - install/kdbg-trinity:: dh_testdir @@ -48,4 +24,3 @@ install/kdbg-trinity:: mkdir -p debian/kdbg-trinity/opt/trinity/share/man mv debian/kdbg-trinity/usr/share/man/man1 debian/kdbg-trinity/opt/trinity/share/man/ rmdir debian/kdbg-trinity/usr/share/man -