[neon/kde/kdepim-runtime/Neon/unstable] /: clean up

Carlos De Maine null at kde.org
Sat Oct 28 01:50:50 BST 2023


Git commit 087ba13c7079b47afb920f380d0f5c4dbcc69f4d by Carlos De Maine.
Committed on 28/10/2023 at 02:50.
Pushed by carlosdem into branch 'Neon/unstable'.

clean up

D  +0    -23   .gitignore
M  +0    -1    debian/control
D  +0    -7    debian/installgen
M  +6    -6    debian/kpim6-kdepim-runtime.install
M  +0    -10   debian/not-installed
D  +0    -1    debian/source/local-options
D  +0    -11   debian/tests/control
D  +0    -4    debian/tests/testsuite
D  +0    -8    debian/tests/testsuite.xsession

https://invent.kde.org/neon/kde/kdepim-runtime/-/commit/087ba13c7079b47afb920f380d0f5c4dbcc69f4d

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 4163e11..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Ignore the following files
-*~
-*.[oa]
-*.kdev4
-.kdev_include_paths
-.swp.*
-.*.swp
-*.kate-swp
-Makefile
-*.moc
-*.moc.cpp
-autom4te.cache
-svn-commit.tmp
-svn-commit.*.tmp
-*.kdevelop.pcs
-*.kdev4
-svnmerge-commit-message.txt
-avail
-Doxyfile
-*.user
-/build/
-CMakeLists.txt.user*
-
diff --git a/debian/control b/debian/control
index e16fe5b..372fffe 100644
--- a/debian/control
+++ b/debian/control
@@ -79,7 +79,6 @@ Description: runtime components for Akonadi KDE
  This package contains Akonadi agents written using KDE Development Platform
  libraries.
  Any package that uses Akonadi should probably pull this in as a dependency.
- The kres-bridges is also parts of this package.
  .
  This package is part of the kdepim-runtime module.
 
diff --git a/debian/installgen b/debian/installgen
deleted file mode 100644
index c4ba0fc..0000000
--- a/debian/installgen
+++ /dev/null
@@ -1,7 +0,0 @@
-[kdepim-runtime]
-missing dst:usr/include/
-missing dst:usr/share/dbus-\d+/interfaces/.*\.xml$
-missing dst:usr/lib/lib[^/]+\.so$ link:
-dst:usr/bin/
-dst:usr/lib/
-dst:usr/share/
diff --git a/debian/kpim6-kdepim-runtime.install b/debian/kpim6-kdepim-runtime.install
index abafaae..63cd5ee 100644
--- a/debian/kpim6-kdepim-runtime.install
+++ b/debian/kpim6-kdepim-runtime.install
@@ -1,11 +1,11 @@
 usr/bin/
 usr/bin/gidmigrator
-usr/lib/*/libakonadi-filestore.so.*
-usr/lib/*/libakonadi-singlefileresource.so.*
-usr/lib/*/libfolderarchivesettings.so.*
-usr/lib/*/libkmindexreader.so.*
-usr/lib/*/libmaildir.so.*
-usr/lib/*/libnewmailnotifier.so.*
+usr/lib/*/libakonadi-filestore.so*
+usr/lib/*/libakonadi-singlefileresource.so*
+usr/lib/*/libfolderarchivesettings.so*
+usr/lib/*/libkmindexreader.so*
+usr/lib/*/libmaildir.so*
+usr/lib/*/libnewmailnotifier.so*
 usr/lib/*/qt6/plugins/kf6/kio/
 usr/lib/*/qt6/plugins/pim6
 usr/share/akonadi/
diff --git a/debian/not-installed b/debian/not-installed
index c0a9ffe..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,10 +0,0 @@
-# TODO: talk to usptream about getting these not installed. they are not used.
-./usr/share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
-./usr/share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml
-
-# TODO: upstream SKIP_NAMELINK so we get no symlinks for private libs
-./usr/lib/*/libakonadi-filestore.so
-./usr/lib/*/libakonadi-singlefileresource.so
-./usr/lib/*/libfolderarchivesettings.so
-./usr/lib/*/libkmindexreader.so
-./usr/lib/*/libmaildir.so
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 9a6437f..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Tests: testsuite
-Depends: akonadi-backend-sqlite,
-         build-essential,
-         dbus-x11,
-         kinit,
-         libkf5plasma5,
-         xauth,
-         xvfb,
-         @,
-         @builddeps@
-Restrictions: build-needed
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
deleted file mode 100755
index fa0feb1..0000000
--- a/debian/tests/testsuite
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
deleted file mode 100755
index 5216db9..0000000
--- a/debian/tests/testsuite.xsession
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-kdeinit5
-dh_auto_test
-ret=$?
-kdeinit5_shutdown
-exit $ret


More information about the Neon-commits mailing list