From 3b2f8b6b4fd657e1bf61e73c7d8c84568acf8a72 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 6 Jun 2020 18:21:30 +0900
Subject: DEB kasablanca: updated after dropping automake files.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 59cfe912f1d2eeea370b93fae1003897bc227dc8)
---
 debian/_base/applications/kasablanca/debian/docs       |  1 -
 .../kasablanca/debian/kasablanca-trinity.menu          |  7 +++++++
 debian/_base/applications/kasablanca/debian/menu       |  7 -------
 .../debian/patches/04_am_maintainer_mode.diff          | 11 -----------
 .../debian/patches/06_disable_no_undefined.diff        | 18 ------------------
 .../applications/kasablanca/debian/patches/series      |  2 --
 6 files changed, 7 insertions(+), 39 deletions(-)
 create mode 100644 debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu
 delete mode 100644 debian/_base/applications/kasablanca/debian/menu
 delete mode 100644 debian/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff
 delete mode 100644 debian/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff

(limited to 'debian/_base/applications/kasablanca')

diff --git a/debian/_base/applications/kasablanca/debian/docs b/debian/_base/applications/kasablanca/debian/docs
index c17f03764..ca0272abf 100644
--- a/debian/_base/applications/kasablanca/debian/docs
+++ b/debian/_base/applications/kasablanca/debian/docs
@@ -1,4 +1,3 @@
 AUTHORS
-NEWS
 README
 TODO
diff --git a/debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu b/debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu
new file mode 100644
index 000000000..2b2588878
--- /dev/null
+++ b/debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu
@@ -0,0 +1,7 @@
+?package(kasablanca-trinity):\
+	needs="X11" \
+	hints="TDE" \
+	section="Apps/Net"\
+	title="kasablanca" \
+	longtitle="kasablanca - ftp client" \
+	command="/opt/trinity/bin/kasablanca"
diff --git a/debian/_base/applications/kasablanca/debian/menu b/debian/_base/applications/kasablanca/debian/menu
deleted file mode 100644
index 2b2588878..000000000
--- a/debian/_base/applications/kasablanca/debian/menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(kasablanca-trinity):\
-	needs="X11" \
-	hints="TDE" \
-	section="Apps/Net"\
-	title="kasablanca" \
-	longtitle="kasablanca - ftp client" \
-	command="/opt/trinity/bin/kasablanca"
diff --git a/debian/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff b/debian/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
- 
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
- 
- dnl generate the config header
diff --git a/debian/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff b/debian/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
-        KDE_USE_CLOSURE_TRUE="#"
-        KDE_USE_CLOSURE_FALSE=""
-        KDE_NO_UNDEFINED=""
--       case $host in 
--         *-*-linux-gnu)
--           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
--                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
--		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
--		[KDE_NO_UNDEFINED=""])],
--	    [KDE_NO_UNDEFINED=""])
--           ;;
--       esac
-   fi
-   AC_SUBST(KDE_USE_CLOSURE_TRUE)
-   AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/debian/_base/applications/kasablanca/debian/patches/series b/debian/_base/applications/kasablanca/debian/patches/series
index b8743ddd9..e69de29bb 100644
--- a/debian/_base/applications/kasablanca/debian/patches/series
+++ b/debian/_base/applications/kasablanca/debian/patches/series
@@ -1,2 +0,0 @@
-04_am_maintainer_mode.diff
-06_disable_no_undefined.diff
-- 
cgit v1.2.1