Branch: master

9e8d2b34 2019-05-25 23:03:38 Slávek Banko
DEB knetworkmanager8: Disable build with --enable-final.
Cleanup rules.

Signed-off-by: Slávek Banko <slavek.banko@...>
M debian/_base/applications/knetworkmanager8/debian/rules
M ubuntu/_base/applications/knetworkmanager8/debian/rules

debian/_base/applications/knetworkmanager8/debian/rules

diff --git a/debian/_base/applications/knetworkmanager8/debian/rules b/debian/_base/applications/knetworkmanager8/debian/rules
index 7c15321..1b87e9c 100755
--- a/debian/_base/applications/knetworkmanager8/debian/rules
+++ b/debian/_base/applications/knetworkmanager8/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
 
@@ -17,39 +20,8 @@
 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
-
 binary-install/network-manager-kde-trinity::
 	# Install autostart file
 	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
 		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
 	mv debian/network-manager-kde-trinity/usr/share/man debian/network-manager-kde-trinity/opt/trinity/share/
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f aclocal.m4
-	rm -f acinclude.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap

ubuntu/_base/applications/knetworkmanager8/debian/rules

diff --git a/ubuntu/_base/applications/knetworkmanager8/debian/rules b/ubuntu/_base/applications/knetworkmanager8/debian/rules
index 7c15321..1b87e9c 100755
--- a/ubuntu/_base/applications/knetworkmanager8/debian/rules
+++ b/ubuntu/_base/applications/knetworkmanager8/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
 
@@ -17,39 +20,8 @@
 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
-
 binary-install/network-manager-kde-trinity::
 	# Install autostart file
 	install -D -m 644 knetworkmanager-0.8/src/knetworkmanager.desktop \
 		debian/network-manager-kde-trinity/opt/trinity/share/autostart/knetworkmanager-trinity.desktop
 	mv debian/network-manager-kde-trinity/usr/share/man debian/network-manager-kde-trinity/opt/trinity/share/
-
-clean::
-	find . -name Makefile.in | xargs rm -f
-	rm -f aclocal.m4
-	rm -f acinclude.m4
-	rm -f configure
-	rm -f configure.files
-	rm -f configure.in
-	rm -f config.h.in
-	rm -f stamp-h.in
-	rm -f subdirs	
-	rm -f admin/ltmain.sh
-	rm -f admin/libtool.m4.in
-	rm -f debian/stamp-bootstrap