[neon/backports-jammy/signon-ui/Neon/release] debian: Fix duplication patch fail
Scarlett Moore
null at kde.org
Tue Sep 19 15:58:39 BST 2023
Git commit 7e621568ba0ce9199cb5b506845e3d7a6969fb6f by Scarlett Moore.
Committed on 19/09/2023 at 16:58.
Pushed by scarlettmoore into branch 'Neon/release'.
Fix duplication patch fail
M +0 -40 debian/control
M +0 -21 debian/rules
M +0 -2 debian/signon-ui-service.install
M +0 -2 debian/signon-ui-x11.install
https://invent.kde.org/neon/backports-jammy/signon-ui/-/commit/7e621568ba0ce9199cb5b506845e3d7a6969fb6f
diff --git a/debian/control b/debian/control
index 345d7f8..d2ce885 100644
--- a/debian/control
+++ b/debian/control
@@ -49,43 +49,3 @@ Breaks: signon-ui (<< 0.17), ubuntu-system-settings-online-accounts (<< 0.4)
Replaces: signon-ui (<< 0.17), ubuntu-system-settings-online-accounts (<< 0.4)
Description: D-Bus service file for signon-ui
This D-Bus service is used to provide a UI for authenticating online accounts.
-Source: signon-ui
-Section: gnome
-Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Diane Trout <diane at debian.org>
-Build-Depends: dbus-test-runner,
- debhelper-compat (= 13),
- libaccounts-qt5-dev,
- libnotify-dev,
- libproxy-dev,
- libqt5webkit5-dev,
- libsignon-qt5-dev,
- libx11-dev,
- pkg-config,
- qtbase5-dev (>= 5.0.2+dfsg1),
- qtdeclarative5-dev,
- qtwebengine5-dev,
- signon-plugins-dev,
- xvfb,
- xauth,
-Standards-Version: 4.5.1
-Homepage: https://launchpad.net/signon-ui
-Rules-Requires-Root: no
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/signon-ui
-Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/signon-ui.git
-
-Package: signon-ui-x11
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends},
- signon-ui-service
-Description: Single Sign-on UI
- UI for the signond Single Signon service
-
-Package: signon-ui-service
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-Description: D-Bus service file for signon-ui
- This D-Bus service is used to provide a UI for authenticating online accounts.
diff --git a/debian/rules b/debian/rules
index b3f2220..849f76c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,24 +20,3 @@ override_dh_install:
%:
dh $@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-export QT_SELECT=qt5
-
-include /usr/share/dpkg/architecture.mk
-
-LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-
-override_dh_auto_configure:
- dh_auto_configure -- "CONFIG+=force-foreign-qwindow" \
- "CONFIG+=use-ubuntu-web-view" \
- "HTTP_WARNING_HELP=help:web-credentials/http-warning" \
- "LIBDIR=$(LIBDIR)" \
- "LIBEXECDIR=$(LIBDIR)"
-
-%:
- dh $@
diff --git a/debian/signon-ui-service.install b/debian/signon-ui-service.install
index 0d058a8..e7e60ae 100644
--- a/debian/signon-ui-service.install
+++ b/debian/signon-ui-service.install
@@ -1,4 +1,2 @@
usr/share/dbus-1/services/com.canonical.indicators.webcredentials.service
usr/share/dbus-1/services/com.nokia.singlesignonui.service
-usr/share/dbus-1/services/com.canonical.indicators.webcredentials.service
-usr/share/dbus-1/services/com.nokia.singlesignonui.service
diff --git a/debian/signon-ui-x11.install b/debian/signon-ui-x11.install
index a51f290..dfb802a 100644
--- a/debian/signon-ui-x11.install
+++ b/debian/signon-ui-x11.install
@@ -1,4 +1,2 @@
usr/bin/signon-ui
usr/share/applications/signon-ui.desktop
-usr/bin/signon-ui
-usr/share/applications/signon-ui.desktop
More information about the Neon-commits
mailing list