summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-09-03 03:44:38 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-09-03 03:44:59 +0200
commit1175de8ddbf1c50d9a3219cb56e1eedcefd6ff9d (patch)
tree7b859386b1b1aaf0885deec56bb7702a23922009
parentc94f9396261ebad3255ea3215e965c0e526cdbf4 (diff)
downloadtde-packaging-1175de8ddbf1c50d9a3219cb56e1eedcefd6ff9d.tar.gz
tde-packaging-1175de8ddbf1c50d9a3219cb56e1eedcefd6ff9d.zip
DEB kscope: Drop old common patches related to automake.
Added AUTHORS file to package. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 75466a5f7cb60c6fd38a1baa19a914e353f02740)
-rw-r--r--debian/_base/applications/development/kscope/debian/docs1
-rw-r--r--debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff11
-rw-r--r--debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff18
-rw-r--r--debian/_base/applications/development/kscope/debian/patches/series2
-rw-r--r--ubuntu/_base/applications/development/kscope/debian/docs1
-rw-r--r--ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/applications/development/kscope/debian/patches/series2
8 files changed, 2 insertions, 62 deletions
diff --git a/debian/_base/applications/development/kscope/debian/docs b/debian/_base/applications/development/kscope/debian/docs
index 1333ed77b..7d96d4e7e 100644
--- a/debian/_base/applications/development/kscope/debian/docs
+++ b/debian/_base/applications/development/kscope/debian/docs
@@ -1 +1,2 @@
+AUTHORS
TODO
diff --git a/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff b/debian/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/debian/_base/applications/development/kscope/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/development/kscope/debian/patches/06_disable_no_undefined.diff b/debian/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/debian/_base/applications/development/kscope/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/development/kscope/debian/patches/series b/debian/_base/applications/development/kscope/debian/patches/series
index b8743ddd9..e69de29bb 100644
--- a/debian/_base/applications/development/kscope/debian/patches/series
+++ b/debian/_base/applications/development/kscope/debian/patches/series
@@ -1,2 +0,0 @@
-04_am_maintainer_mode.diff
-06_disable_no_undefined.diff
diff --git a/ubuntu/_base/applications/development/kscope/debian/docs b/ubuntu/_base/applications/development/kscope/debian/docs
index 1333ed77b..7d96d4e7e 100644
--- a/ubuntu/_base/applications/development/kscope/debian/docs
+++ b/ubuntu/_base/applications/development/kscope/debian/docs
@@ -1 +1,2 @@
+AUTHORS
TODO
diff --git a/ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff b/ubuntu/_base/applications/development/kscope/debian/patches/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/applications/development/kscope/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/development/kscope/debian/patches/06_disable_no_undefined.diff b/ubuntu/_base/applications/development/kscope/debian/patches/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/applications/development/kscope/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/development/kscope/debian/patches/series b/ubuntu/_base/applications/development/kscope/debian/patches/series
index b8743ddd9..e69de29bb 100644
--- a/ubuntu/_base/applications/development/kscope/debian/patches/series
+++ b/ubuntu/_base/applications/development/kscope/debian/patches/series
@@ -1,2 +0,0 @@
-04_am_maintainer_mode.diff
-06_disable_no_undefined.diff