From 59cfe912f1d2eeea370b93fae1003897bc227dc8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 6 Jun 2020 18:21:30 +0900 Subject: [PATCH] DEB kasablanca: updated after dropping automake files. Signed-off-by: Michele Calgaro --- .../_base/applications/kasablanca/debian/docs | 1 - .../debian/{menu => kasablanca-trinity.menu} | 0 .../debian/patches/04_am_maintainer_mode.diff | 11 ----------- .../patches/06_disable_no_undefined.diff | 18 ------------------ .../kasablanca/debian/patches/series | 2 -- .../_base/applications/kasablanca/debian/docs | 1 - .../debian/{menu => kasablanca-trinity.menu} | 0 .../debian/patches/04_am_maintainer_mode.diff | 11 ----------- .../patches/06_disable_no_undefined.diff | 18 ------------------ .../kasablanca/debian/patches/series | 2 -- 10 files changed, 64 deletions(-) rename debian/_base/applications/kasablanca/debian/{menu => kasablanca-trinity.menu} (100%) 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 rename ubuntu/_base/applications/kasablanca/debian/{menu => kasablanca-trinity.menu} (100%) delete mode 100644 ubuntu/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff delete mode 100644 ubuntu/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff 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/menu b/debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu similarity index 100% rename from debian/_base/applications/kasablanca/debian/menu rename to debian/_base/applications/kasablanca/debian/kasablanca-trinity.menu 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 diff --git a/ubuntu/_base/applications/kasablanca/debian/docs b/ubuntu/_base/applications/kasablanca/debian/docs index c17f03764..ca0272abf 100644 --- a/ubuntu/_base/applications/kasablanca/debian/docs +++ b/ubuntu/_base/applications/kasablanca/debian/docs @@ -1,4 +1,3 @@ AUTHORS -NEWS README TODO diff --git a/ubuntu/_base/applications/kasablanca/debian/menu b/ubuntu/_base/applications/kasablanca/debian/kasablanca-trinity.menu similarity index 100% rename from ubuntu/_base/applications/kasablanca/debian/menu rename to ubuntu/_base/applications/kasablanca/debian/kasablanca-trinity.menu diff --git a/ubuntu/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff b/ubuntu/_base/applications/kasablanca/debian/patches/04_am_maintainer_mode.diff deleted file mode 100644 index 391a80285..000000000 --- a/ubuntu/_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/ubuntu/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff b/ubuntu/_base/applications/kasablanca/debian/patches/06_disable_no_undefined.diff deleted file mode 100644 index 05c932c3c..000000000 --- a/ubuntu/_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/ubuntu/_base/applications/kasablanca/debian/patches/series b/ubuntu/_base/applications/kasablanca/debian/patches/series index b8743ddd9..e69de29bb 100644 --- a/ubuntu/_base/applications/kasablanca/debian/patches/series +++ b/ubuntu/_base/applications/kasablanca/debian/patches/series @@ -1,2 +0,0 @@ -04_am_maintainer_mode.diff -06_disable_no_undefined.diff