[neon/backports-jammy/signon-ui/Neon/release] debian: Patch to ubuntu version

Scarlett Moore null at kde.org
Tue Sep 19 14:36:39 BST 2023


Git commit 014f280c868b8aa3e4f087b3424cfcb9f13b0832 by Scarlett Moore.
Committed on 19/09/2023 at 15:35.
Pushed by scarlettmoore into branch 'Neon/release'.

Patch to ubuntu version

M  +493  -0    debian/changelog
R  +0    -0    debian/compat [from: debian/debian/compat - 100% similarity]
M  +51   -0    debian/control
M  +20   -0    debian/copyright
D  +0    -493  debian/debian/changelog
D  +0    -51   debian/debian/control
D  +0    -20   debian/debian/copyright
D  +0    -22   debian/debian/rules
D  +0    -2    debian/debian/signon-ui-service.install
D  +0    -2    debian/debian/signon-ui-x11.install
M  +22   -0    debian/rules
M  +2    -0    debian/signon-ui-service.install
M  +2    -0    debian/signon-ui-x11.install

https://invent.kde.org/neon/backports-jammy/signon-ui/-/commit/014f280c868b8aa3e4f087b3424cfcb9f13b0832

diff --git a/debian/changelog b/debian/changelog
index c1e931e..544fa8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,496 @@
+signon-ui (0.17+18.04.20171027+really20160406-0ubuntu3) hirsute; urgency=medium
+
+  * Remove build dependency on qt5-default, which no longer exists
+    (LP: #1921781).
+
+ -- Logan Rosen <logan at ubuntu.com>  Tue, 06 Apr 2021 23:43:03 -0400
+
+signon-ui (0.17+18.04.20171027+really20160406-0ubuntu2) focal; urgency=medium
+
+  * No-change rebuild for libgcc-s1 package name change.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Mar 2020 07:25:35 +0100
+
+signon-ui (0.17+18.04.20171027+really20160406-0ubuntu1) bionic; urgency=medium
+
+  * Rebuild of 0.17+16.04.20160406-0ubuntu1 source. Versions later than
+    this crash when trying to add a Google account in KDE
+    systemsettings. An upstream solution requires unimplemented changes
+    to KDE Kaccounts KCM, so for now revert to last good working
+    version. (LP: #1727811)
+  * Re-drop build dependency on libgstreamer-plugins-base0.10-dev
+  * Re-drop transitional signon-ui package (package was renamed for Utopic)
+
+ -- Rik Mills <rikmills at kubuntu.org>  Fri, 27 Oct 2017 15:57:25 +0100
+
+signon-ui (0.17+16.04.20160406-0ubuntu1) xenial; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Update Ubuntu.Web backend, make it the default on Unity (LP:
+    #1547647)
+
+ -- David Barth <david.barth at canonical.com>  Wed, 06 Apr 2016 09:17:36 +0000
+
+signon-ui (0.17+16.04.20151125-0ubuntu1) xenial; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Strip trailing "/" when comparing URLs (LP: #1173926)
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+ -- David Barth <david.barth at canonical.com>  Wed, 25 Nov 2015 16:34:10 +0000
+
+signon-ui (0.17+15.10.20150810-0ubuntu1) wily; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Fix portability to non-X11 platforms (LP: #1473422, #1473423)
+
+ -- CI Train Bot <ci-train-bot at canonical.com>  Mon, 10 Aug 2015 08:37:45 +0000
+
+signon-ui (0.17+15.04.20150410-0ubuntu2~gcc5.1) wily; urgency=medium
+
+  * No-change rebuild using GCC 5.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 03 Aug 2015 18:39:20 +0200
+
+signon-ui (0.17+15.04.20150410-0ubuntu1) vivid; urgency=medium
+
+  [ Iain Lane ]
+  * src/signon.pro: Add 'quick' to the list of Qt modules used; we use
+    QQuickView
+
+ -- CI Train Bot <ci-train-bot at canonical.com>  Fri, 10 Apr 2015 08:47:04 +0000
+
+signon-ui (0.17+14.10.20140916-0ubuntu1) utopic; urgency=low
+
+  [ Colin Watson ]
+  * Add versioned Breaks/Replaces on signon-ui to signon-ui-x11 to fix
+    upgrades from before 0.17. (LP: #1363352)
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 16 Sep 2014 19:07:08 +0000
+
+signon-ui (0.17+14.10.20140814-0ubuntu1) utopic; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Alberto Mardegan ]
+  * New release Add signon-ui-service, to fix co-installation with u-s-
+    s-o-a. Use Oxide instead of WebKit2 .
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 14 Aug 2014 10:23:08 +0000
+
+signon-ui (0.17+14.10.20140612-0ubuntu1) utopic; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Use Oxide instead of WebKit2
+  * Add signon-ui-service, to fix co-installation with u-s-s-o-a
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 12 Jun 2014 13:35:05 +0000
+
+signon-ui (0.16+14.10.20140530-0ubuntu1) utopic; urgency=low
+
+  [ Timo Jyrinki ]
+  * Depend on libqt5sensors5-dev instead of qtsensors5-dev. (LP:
+    #1317885) (LP: #1317885)
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Fri, 30 May 2014 17:38:39 +0000
+
+signon-ui (0.16+14.04.20140304.is.0.15+14.04.20140313-0ubuntu2) utopic; urgency=medium
+
+  * debian/control: remove arch constraints in gl/gles build-deps, not needed
+    as it follows what Qt uses
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Tue, 29 Apr 2014 10:57:43 -0700
+
+signon-ui (0.16+14.04.20140304.is.0.15+14.04.20140313-0ubuntu1) trusty; urgency=low
+
+  * New rebuild forced
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 13 Mar 2014 15:22:16 +0000
+
+signon-ui (0.16+14.04.20140304.is.0.15+14.04.20131024.2-0ubuntu1) trusty; urgency=medium
+
+  * Reverting as desktop image isn't installable (main/universe
+    mismatch) and causing all signon-ui tests on Touch failing
+
+ -- Didier Roche <didrocks at ubuntu.com>  Wed, 05 Mar 2014 12:19:29 +0100
+
+signon-ui (0.16+14.04.20140304-0ubuntu1) trusty; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Tag version 0.16.
+  * Add an experimental method to get the WebView cookies This is
+    intended to be used by the webapps container, in the attempt to
+    reduce the number of web logins required to the user.
+  * Disable failing test on QtDBus Q_ASSERT See https://bugreports.qt-
+    project.org/browse/QTBUG-36475 . (LP: #1271052)
+
+  [ Alexandre Abreu ]
+  * Update UA overrides from the most recent ones .
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 04 Mar 2014 15:04:01 +0000
+
+signon-ui (0.15+14.04.20131024.2-0ubuntu1) trusty; urgency=low
+
+  [ Ken VanDine ]
+  * Don't limit arch to a fixed set (LP: #1239743) . (LP: #1239743)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 119
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 24 Oct 2013 20:30:36 +0000
+
+signon-ui (0.15+13.10.20131016.2-0ubuntu1) saucy; urgency=low
+
+  [ Alberto Mardegan ]
+  * Do not anchor to the osk item (OnScreenKeyboard), as it's not a
+    sibling. . (LP: #1238485)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 117
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 16 Oct 2013 14:15:21 +0000
+
+signon-ui (0.15+13.10.20131011-0ubuntu1) saucy; urgency=low
+
+  [ Ken VanDine ]
+  * Use a MainView and pull in the UserAgent logic used in the Browser
+    component. Using the correct useragent fixes things like facebook
+    suggesting users should install the facebook app for iphone (LP:
+    #1235259). (LP: #1235259)
+  * Allow overriding the QML files used by placing them in
+    /usr/share/signon-ui/qml If there is a webview.qml file in that
+    directory, load it instead of using the one built into the
+    resources. This is useful for debugging QML only changes on the
+    device without needing to rebuild and install signon-ui. It is
+    important to note, when overriding them you need to copy include the
+    .qml and .js files into that directory. .
+
+  [ Iain Lane ]
+  * Allow LIBDIR and LIBEXECDIR to be overridden; install in multiarch
+    path; set LIBEXECDIR=LIBDIR .
+
+  [ Alberto Mardegan ]
+  * Bump build dependency for XEmbed support .
+  * Allow the request to be cancelled from the UI. Clients can provide a
+    QML component to be used in order to create the authentication page,
+    and this gives them a way to add a cancel button there. (LP:
+    #1231691)
+  * Let the client override the Page component. . (LP: #1231691)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 115
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Fri, 11 Oct 2013 04:33:07 +0000
+
+signon-ui (0.15+13.10.20131003.1-0ubuntu1) saucy; urgency=low
+
+  [ Alberto Mardegan ]
+  * Add missing import line The lack of this line was causing the
+    "units.gu()" function to be undefined, and therefore the form factor
+    was undefined as well, and consequently also the user-agent. . (LP:
+    #1217792)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 108
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 03 Oct 2013 16:36:31 +0000
+
+signon-ui (0.15daily13.06.25-0ubuntu1) saucy; urgency=low
+
+  [ Alberto Mardegan ]
+  * Show a warning message when authenticating with plain
+    HTTP. (LP: #1180297).
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 106
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 25 Jun 2013 04:31:06 +0000
+
+signon-ui (0.15daily13.06.12-0ubuntu1) saucy; urgency=low
+
+  [ Alberto Mardegan ]
+  * Don't block the "about:blank" URL.
+  * Don't empty the username field when the login form is re-presented.
+  * Do not hardcode the prefix in D-Bus service files.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 104
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 12 Jun 2013 04:31:57 +0000
+
+signon-ui (0.14daily13.06.05.1-0ubuntu1) saucy; urgency=low
+
+  [ phablet ]
+  * Add some more logic for the webview, based on Ubuntu.Browser for better 
+    support on phablet
+
+  [ Ken VanDine ]
+  * Optionally use WebKit2 in Qt5 Add a configuration option ("qmake
+    CONFIG+=no-widgets") to disable using the QtWidgets based QWebView
+    and use QtQuick's WebView, which is based on WebKit2. Another
+    configuration option ("CONFIG+=force-foreign-qwindow") can be used
+    to enable window embedding/reparenting with Qt5, which otherwise
+    would only be enabled with Qt 5.1 or later. Note that the "no-
+    widgets" option is not activated in debian/rules; that bit should go
+    into a separate branch. The WebView implementation is mostly based
+    on Ken Vandine's "phablet-rebased" branch; the big difference here
+    is that the WebView is opened in a separate process, which is
+    spawned by signon-ui with a hacked $HOME variable which will force
+    WebKit2 to store all its data (cookies and form completions) into a
+    different location depending on the identity being authenticated.
+    The process separation is needed in order not to share the same
+    WebKit's WebProcess among the WebViews, which would defeat the trick
+    of changing $HOME.
+
+  [ Alberto Mardegan ]
+  * Use bzr-export to implement the "make dist" command This includes
+    the po/Makefile file, which was previously being excluded by
+    mistake. . (LP: #1162296)
+  * Wait 3 seconds before reporting a page load failure When logging in
+    to Google with an Ubuntu SSO account, the browser is briefly
+    redirected to a page which fails to load; however, the
+    authentication then continues successfully. In order not to stop the
+    authentication process, wait three seconds before terminating the
+    authentication with an error, and abort the timer if another URL is
+    queued. . (LP: #1171853)
+  * Cancel fail timer when a load is in progress If a page is loading,
+    don't make the request fail. . (LP: #1171853)
+  * Implement removeIdentityData signond will call this method when an
+    identity is removed or being signed out. .
+  * Optionally use WebKit2 in Qt5 Add a configuration option ("qmake
+    CONFIG+=no-widgets") to disable using the QtWidgets based QWebView
+    and use QtQuick's WebView, which is based on WebKit2. Another
+    configuration option ("CONFIG+=force-foreign-qwindow") can be used
+    to enable window embedding/reparenting with Qt5, which otherwise
+    would only be enabled with Qt 5.1 or later. Note that the "no-
+    widgets" option is not activated in debian/rules; that bit should go
+    into a separate branch. The WebView implementation is mostly based
+    on Ken Vandine's "phablet-rebased" branch; the big difference here
+    is that the WebView is opened in a separate process, which is
+    spawned by signon-ui with a hacked $HOME variable which will force
+    WebKit2 to store all its data (cookies and form completions) into a
+    different location depending on the identity being authenticated.
+    The process separation is needed in order not to share the same
+    WebKit's WebProcess among the WebViews, which would defeat the trick
+    of changing $HOME.
+  * Runtime detection of browser handler Even if the "use-webkit2"
+    option is given at build time, allow using the qtwebkit1 interface
+    on xcb. This allows us to use the same signon-ui binary for desktop
+    and phone form factors. .
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 100
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 05 Jun 2013 18:49:08 +0000
+
+signon-ui (0.14daily13.05.14ubuntu.unity.next-0ubuntu1) raring; urgency=low
+
+  [ Alberto Mardegan ]
+  * Add a flag to disable SSL errors (to be used for integration tests).
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 97 (ubuntu-unity/next)
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 14 May 2013 13:50:47 +0000
+
+signon-ui (0.14daily13.05.02.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
+
+  * Automatic snapshot from revision 95 (ubuntu-unity/next)
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 02 May 2013 20:48:13 +0000
+
+signon-ui (0.14daily13.05.02ubuntu.unity.next-0ubuntu1) raring; urgency=low
+
+  * Automatic snapshot from revision 92 (ubuntu-unity/next)
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 02 May 2013 07:36:29 +0000
+
+signon-ui (0.14daily13.05.01.1ubuntu.unity.next-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control
+    - don't build for powerpc, qtsensors5-dev isn't available
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Thu, 02 May 2013 01:16:37 -0700
+
+signon-ui (0.14daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
+
+  [ Alberto Mardegan ]
+  * Fix a crash potentially happening when the XEmbed container reused the 
+    same X window ID from a previous one.
+
+  [ Ken VanDine ]
+  * Automatic snapshot from revision 84 (bootstrap)
+
+  [ Alberto Mardegan ]
+  * po/Makefile is missing from released tarballs (LP: #1162296)
+  * Cannot log in to Google apps domain + Ubuntu SSO (LP: #1171853)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 90 (ubuntu-unity/next)
+
+ -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 01 May 2013 07:53:33 +0000
+
+signon-ui (0.14-0ubuntu2) saucy; urgency=low
+
+  [ Alberto Mardegan ]
+  * Fix a crash potentially happening when the XEmbed container reused the 
+    same X window ID from a previous one. (LP: #1158969)
+  * Fixed Cannot log in to Google apps domain + Ubuntu SSO (LP: #1171853)
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Wed, 29 May 2013 10:37:43 -0400
+
+signon-ui (0.14-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+    - Fix page scrolling for some websites (LP: #1158173)
+    - Prevent a double deletion of the browser dialog (LP: #1111507)
+    - Tests: don't use any libnotify methods.
+
+ -- Alberto Mardegan <alberto.mardegan at canonical.com>  Thu, 21 Mar 2013 14:46:48 +0200
+
+signon-ui (0.13bzr13.03.19-0ubuntu1) raring; urgency=low
+
+  * Do not quit if some accounts are failing (LP: #1135038)
+  * Default daemonTimeout to 30 (LP: #1112680)
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Tue, 19 Mar 2013 11:17:02 -0400
+
+signon-ui (0.12bzr13.01.09-0ubuntu1) raring; urgency=low
+
+  * Inline packaging metadata.
+  * Fix typo in proxy detection algorithm (LP: #1095254) [mardy]
+  * Tests: add functional test for the reauthenticator [mardy]
+
+ -- Robert Bruce Park <robert.park at canonical.com>  Wed, 09 Jan 2013 14:55:15 -0800
+
+signon-ui (0.11-0ubuntu1) quantal-proposed; urgency=low
+
+  * New upstream release.
+    - Do not instantiate invalid QDBusMessages (LP: #1040580)
+    - Do not allocate the proxy factory on the
+      stack (LP: #1053444) (LP: #1053454)
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Tue, 25 Sep 2012 16:47:07 -0400
+
+signon-ui (0.10-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Fixed proxy support (LP: #1048590)
+    - Don't emit an OSD notification when accounts fail to
+      authenticate (LP: #1049140)
+  * debian/control
+    - build depend on libproxy-dev
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Wed, 19 Sep 2012 15:06:38 -0400
+
+signon-ui (0.9-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Early terminate successful requests with no UI (LP: #1049207)
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Wed, 12 Sep 2012 09:36:58 -0400
+
+signon-ui (0.8-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Successfully terminate the browser request as soon as we are requested
+      to load the final URL.  This fixes spawning a bunch of instances of
+      external browser instances (LP: #1048177) (LP: #1047588)
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Mon, 10 Sep 2012 09:08:27 -0400
+
+signon-ui (0.7-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - protect webkit from untrusted content, only allow https (LP: #1039084)
+  * -debian/patches/unit_tests_only.patch, merged upstream
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Fri, 07 Sep 2012 09:33:56 -0400
+
+signon-ui (0.6-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Fri, 17 Aug 2012 16:53:56 -0400
+
+signon-ui (0.5-0ubuntu1) quantal; urgency=low
+
+  * New upstream release
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Thu, 02 Aug 2012 14:40:56 -0400
+
+signon-ui (0.4+bzr47-0quantal1) quantal; urgency=low
+
+  * New snapshot rev 47
+  * common-project-config.pri
+    - fixed FTBFS by including X11 in pkgconfg
+  * tests/test.pro
+    - Only run unit tests
+  * debian/control
+    - added build depends for libxext-dev, gdb, xvfb, dbus-test-runner
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Wed, 01 Aug 2012 17:03:13 -0400
+
+signon-ui (0.4+bzr46-0quantal1) quantal; urgency=low
+
+  * rebuild for quantal
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Mon, 16 Jul 2012 09:59:56 -0400
+
+signon-ui (0.4+bzr46-0precise2) precise; urgency=low
+
+  * no change rebuild
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Fri, 15 Jun 2012 16:53:26 -0400
+
+signon-ui (0.4+bzr46-0precise1) precise; urgency=low
+
+  * new snapshot tag 0.4+bzr46
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Fri, 01 Jun 2012 14:43:03 -0400
+
+signon-ui (0.3+bzr43-0precise1) precise; urgency=low
+
+  * new snapshot tag 0.3+bzr43
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Wed, 04 Apr 2012 15:03:37 -0400
+
+signon-ui (0.3+bzr34-0precise2) precise; urgency=low
+
+  * rebased on trunk
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Fri, 30 Mar 2012 12:01:03 -0400
+
+signon-ui (0.3+bzr34-0precise1) precise; urgency=low
+
+  * new snapshot tag 0.3+bzr40
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Thu, 29 Mar 2012 14:34:00 -0400
+
+signon-ui (0.2+bzr37-0precise1) precise; urgency=low
+
+  * New snapshot r37
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Mon, 19 Mar 2012 12:27:12 -0400
+
+signon-ui (0.2-0precise2) precise; urgency=low
+
+  * debian/control
+    - added build depends on libx11-dev
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Thu, 05 Jan 2012 12:55:17 -0500
+
+signon-ui (0.2-0precise1) precise; urgency=low
+
+  * Initial release
+
+ -- Ken VanDine <ken.vandine at canonical.com>  Thu, 05 Jan 2012 10:32:27 -0500
 signon-ui (0.17+16.04.20151125-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/debian/compat b/debian/compat
similarity index 100%
rename from debian/debian/compat
rename to debian/compat
diff --git a/debian/control b/debian/control
index 7e98db8..345d7f8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,57 @@
 Source: signon-ui
 Section: gnome
 Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop at lists.ubuntu.com>
+Build-Depends: dbus-test-runner,
+               debhelper (>= 9),
+               gdb,
+               libaccounts-qt5-dev,
+               libgl1-mesa-dev | libgl-dev,
+               libgles2-mesa-dev | libgles2-dev,
+               libicu-dev,
+               libnotify-dev,
+               libproxy-dev,
+               libqt5opengl5-dev,
+               libqt5webkit5-dev,
+               libsignon-qt5-dev,
+               libsqlite3-dev,
+               libx11-dev,
+               libxext-dev,
+               libxslt1-dev,
+               pkg-config,
+               qtbase5-dev (>= 5.0.2+dfsg1-3ubuntu1),
+               qtdeclarative5-dev,
+               qtlocation5-dev,
+               libqt5sensors5-dev,
+               signon-plugins-dev,
+               xvfb,
+Standards-Version: 3.9.3
+Homepage: https://launchpad.net/signon-ui
+# If you aren't a member of ~online-accounts but need to upload packaging changes,
+# just go ahead.  ~online-accounts will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~online-accounts/signon-ui/trunk
+
+Package: signon-ui-x11
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         signon-ui-service
+Breaks: signon-ui (<< 0.17)
+Replaces: signon-ui (<< 0.17)
+Description: Single Sign-on UI
+ UI for the signond Single Signon service
+
+Package: signon-ui-service
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+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,
diff --git a/debian/copyright b/debian/copyright
index 0fe312d..71cdc65 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,23 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: online-accounts-signon-ui
+Upstream-Contact: Alberto Mardegan <alberto.mardegan at canonical.com>
+Source: https://launchpad.net/online-accounts-signon-ui
+
+Files: *
+Copyright: 2011 Canonical Ltd.
+License: GPL-3
+
+Files: src/animation-label.*
+Copyright: 2009 Nokia Corporation
+License: GPL-3
+
+Files: debian/*
+Copyright: 2011 Ken VanDine <ken.vandine at canonical.com>
+License: GPL-3
+
+License: GPL-3
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: signon-ui
 Upstream-Contact: Alberto Mardegan <alberto.mardegan at canonical.com>
diff --git a/debian/debian/changelog b/debian/debian/changelog
deleted file mode 100644
index eb14dbc..0000000
--- a/debian/debian/changelog
+++ /dev/null
@@ -1,493 +0,0 @@
-signon-ui (0.17+18.04.20171027+really20160406-0ubuntu3) hirsute; urgency=medium
-
-  * Remove build dependency on qt5-default, which no longer exists
-    (LP: #1921781).
-
- -- Logan Rosen <logan at ubuntu.com>  Tue, 06 Apr 2021 23:43:03 -0400
-
-signon-ui (0.17+18.04.20171027+really20160406-0ubuntu2) focal; urgency=medium
-
-  * No-change rebuild for libgcc-s1 package name change.
-
- -- Matthias Klose <doko at ubuntu.com>  Mon, 23 Mar 2020 07:25:35 +0100
-
-signon-ui (0.17+18.04.20171027+really20160406-0ubuntu1) bionic; urgency=medium
-
-  * Rebuild of 0.17+16.04.20160406-0ubuntu1 source. Versions later than
-    this crash when trying to add a Google account in KDE
-    systemsettings. An upstream solution requires unimplemented changes
-    to KDE Kaccounts KCM, so for now revert to last good working
-    version. (LP: #1727811)
-  * Re-drop build dependency on libgstreamer-plugins-base0.10-dev
-  * Re-drop transitional signon-ui package (package was renamed for Utopic)
-
- -- Rik Mills <rikmills at kubuntu.org>  Fri, 27 Oct 2017 15:57:25 +0100
-
-signon-ui (0.17+16.04.20160406-0ubuntu1) xenial; urgency=medium
-
-  [ Alberto Mardegan ]
-  * Update Ubuntu.Web backend, make it the default on Unity (LP:
-    #1547647)
-
- -- David Barth <david.barth at canonical.com>  Wed, 06 Apr 2016 09:17:36 +0000
-
-signon-ui (0.17+16.04.20151125-0ubuntu1) xenial; urgency=medium
-
-  [ Alberto Mardegan ]
-  * Strip trailing "/" when comparing URLs (LP: #1173926)
-
-  [ CI Train Bot ]
-  * New rebuild forced.
-
- -- David Barth <david.barth at canonical.com>  Wed, 25 Nov 2015 16:34:10 +0000
-
-signon-ui (0.17+15.10.20150810-0ubuntu1) wily; urgency=medium
-
-  [ Alberto Mardegan ]
-  * Fix portability to non-X11 platforms (LP: #1473422, #1473423)
-
- -- CI Train Bot <ci-train-bot at canonical.com>  Mon, 10 Aug 2015 08:37:45 +0000
-
-signon-ui (0.17+15.04.20150410-0ubuntu2~gcc5.1) wily; urgency=medium
-
-  * No-change rebuild using GCC 5.
-
- -- Matthias Klose <doko at ubuntu.com>  Mon, 03 Aug 2015 18:39:20 +0200
-
-signon-ui (0.17+15.04.20150410-0ubuntu1) vivid; urgency=medium
-
-  [ Iain Lane ]
-  * src/signon.pro: Add 'quick' to the list of Qt modules used; we use
-    QQuickView
-
- -- CI Train Bot <ci-train-bot at canonical.com>  Fri, 10 Apr 2015 08:47:04 +0000
-
-signon-ui (0.17+14.10.20140916-0ubuntu1) utopic; urgency=low
-
-  [ Colin Watson ]
-  * Add versioned Breaks/Replaces on signon-ui to signon-ui-x11 to fix
-    upgrades from before 0.17. (LP: #1363352)
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 16 Sep 2014 19:07:08 +0000
-
-signon-ui (0.17+14.10.20140814-0ubuntu1) utopic; urgency=low
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
-  [ Alberto Mardegan ]
-  * New release Add signon-ui-service, to fix co-installation with u-s-
-    s-o-a. Use Oxide instead of WebKit2 .
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 14 Aug 2014 10:23:08 +0000
-
-signon-ui (0.17+14.10.20140612-0ubuntu1) utopic; urgency=medium
-
-  [ Alberto Mardegan ]
-  * Use Oxide instead of WebKit2
-  * Add signon-ui-service, to fix co-installation with u-s-s-o-a
-
-  [ Ubuntu daily release ]
-  * New rebuild forced
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 12 Jun 2014 13:35:05 +0000
-
-signon-ui (0.16+14.10.20140530-0ubuntu1) utopic; urgency=low
-
-  [ Timo Jyrinki ]
-  * Depend on libqt5sensors5-dev instead of qtsensors5-dev. (LP:
-    #1317885) (LP: #1317885)
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Fri, 30 May 2014 17:38:39 +0000
-
-signon-ui (0.16+14.04.20140304.is.0.15+14.04.20140313-0ubuntu2) utopic; urgency=medium
-
-  * debian/control: remove arch constraints in gl/gles build-deps, not needed
-    as it follows what Qt uses
-
- -- Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>  Tue, 29 Apr 2014 10:57:43 -0700
-
-signon-ui (0.16+14.04.20140304.is.0.15+14.04.20140313-0ubuntu1) trusty; urgency=low
-
-  * New rebuild forced
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 13 Mar 2014 15:22:16 +0000
-
-signon-ui (0.16+14.04.20140304.is.0.15+14.04.20131024.2-0ubuntu1) trusty; urgency=medium
-
-  * Reverting as desktop image isn't installable (main/universe
-    mismatch) and causing all signon-ui tests on Touch failing
-
- -- Didier Roche <didrocks at ubuntu.com>  Wed, 05 Mar 2014 12:19:29 +0100
-
-signon-ui (0.16+14.04.20140304-0ubuntu1) trusty; urgency=medium
-
-  [ Alberto Mardegan ]
-  * Tag version 0.16.
-  * Add an experimental method to get the WebView cookies This is
-    intended to be used by the webapps container, in the attempt to
-    reduce the number of web logins required to the user.
-  * Disable failing test on QtDBus Q_ASSERT See https://bugreports.qt-
-    project.org/browse/QTBUG-36475 . (LP: #1271052)
-
-  [ Alexandre Abreu ]
-  * Update UA overrides from the most recent ones .
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 04 Mar 2014 15:04:01 +0000
-
-signon-ui (0.15+14.04.20131024.2-0ubuntu1) trusty; urgency=low
-
-  [ Ken VanDine ]
-  * Don't limit arch to a fixed set (LP: #1239743) . (LP: #1239743)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 119
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 24 Oct 2013 20:30:36 +0000
-
-signon-ui (0.15+13.10.20131016.2-0ubuntu1) saucy; urgency=low
-
-  [ Alberto Mardegan ]
-  * Do not anchor to the osk item (OnScreenKeyboard), as it's not a
-    sibling. . (LP: #1238485)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 117
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 16 Oct 2013 14:15:21 +0000
-
-signon-ui (0.15+13.10.20131011-0ubuntu1) saucy; urgency=low
-
-  [ Ken VanDine ]
-  * Use a MainView and pull in the UserAgent logic used in the Browser
-    component. Using the correct useragent fixes things like facebook
-    suggesting users should install the facebook app for iphone (LP:
-    #1235259). (LP: #1235259)
-  * Allow overriding the QML files used by placing them in
-    /usr/share/signon-ui/qml If there is a webview.qml file in that
-    directory, load it instead of using the one built into the
-    resources. This is useful for debugging QML only changes on the
-    device without needing to rebuild and install signon-ui. It is
-    important to note, when overriding them you need to copy include the
-    .qml and .js files into that directory. .
-
-  [ Iain Lane ]
-  * Allow LIBDIR and LIBEXECDIR to be overridden; install in multiarch
-    path; set LIBEXECDIR=LIBDIR .
-
-  [ Alberto Mardegan ]
-  * Bump build dependency for XEmbed support .
-  * Allow the request to be cancelled from the UI. Clients can provide a
-    QML component to be used in order to create the authentication page,
-    and this gives them a way to add a cancel button there. (LP:
-    #1231691)
-  * Let the client override the Page component. . (LP: #1231691)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 115
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Fri, 11 Oct 2013 04:33:07 +0000
-
-signon-ui (0.15+13.10.20131003.1-0ubuntu1) saucy; urgency=low
-
-  [ Alberto Mardegan ]
-  * Add missing import line The lack of this line was causing the
-    "units.gu()" function to be undefined, and therefore the form factor
-    was undefined as well, and consequently also the user-agent. . (LP:
-    #1217792)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 108
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 03 Oct 2013 16:36:31 +0000
-
-signon-ui (0.15daily13.06.25-0ubuntu1) saucy; urgency=low
-
-  [ Alberto Mardegan ]
-  * Show a warning message when authenticating with plain
-    HTTP. (LP: #1180297).
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 106
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 25 Jun 2013 04:31:06 +0000
-
-signon-ui (0.15daily13.06.12-0ubuntu1) saucy; urgency=low
-
-  [ Alberto Mardegan ]
-  * Don't block the "about:blank" URL.
-  * Don't empty the username field when the login form is re-presented.
-  * Do not hardcode the prefix in D-Bus service files.
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 104
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 12 Jun 2013 04:31:57 +0000
-
-signon-ui (0.14daily13.06.05.1-0ubuntu1) saucy; urgency=low
-
-  [ phablet ]
-  * Add some more logic for the webview, based on Ubuntu.Browser for better 
-    support on phablet
-
-  [ Ken VanDine ]
-  * Optionally use WebKit2 in Qt5 Add a configuration option ("qmake
-    CONFIG+=no-widgets") to disable using the QtWidgets based QWebView
-    and use QtQuick's WebView, which is based on WebKit2. Another
-    configuration option ("CONFIG+=force-foreign-qwindow") can be used
-    to enable window embedding/reparenting with Qt5, which otherwise
-    would only be enabled with Qt 5.1 or later. Note that the "no-
-    widgets" option is not activated in debian/rules; that bit should go
-    into a separate branch. The WebView implementation is mostly based
-    on Ken Vandine's "phablet-rebased" branch; the big difference here
-    is that the WebView is opened in a separate process, which is
-    spawned by signon-ui with a hacked $HOME variable which will force
-    WebKit2 to store all its data (cookies and form completions) into a
-    different location depending on the identity being authenticated.
-    The process separation is needed in order not to share the same
-    WebKit's WebProcess among the WebViews, which would defeat the trick
-    of changing $HOME.
-
-  [ Alberto Mardegan ]
-  * Use bzr-export to implement the "make dist" command This includes
-    the po/Makefile file, which was previously being excluded by
-    mistake. . (LP: #1162296)
-  * Wait 3 seconds before reporting a page load failure When logging in
-    to Google with an Ubuntu SSO account, the browser is briefly
-    redirected to a page which fails to load; however, the
-    authentication then continues successfully. In order not to stop the
-    authentication process, wait three seconds before terminating the
-    authentication with an error, and abort the timer if another URL is
-    queued. . (LP: #1171853)
-  * Cancel fail timer when a load is in progress If a page is loading,
-    don't make the request fail. . (LP: #1171853)
-  * Implement removeIdentityData signond will call this method when an
-    identity is removed or being signed out. .
-  * Optionally use WebKit2 in Qt5 Add a configuration option ("qmake
-    CONFIG+=no-widgets") to disable using the QtWidgets based QWebView
-    and use QtQuick's WebView, which is based on WebKit2. Another
-    configuration option ("CONFIG+=force-foreign-qwindow") can be used
-    to enable window embedding/reparenting with Qt5, which otherwise
-    would only be enabled with Qt 5.1 or later. Note that the "no-
-    widgets" option is not activated in debian/rules; that bit should go
-    into a separate branch. The WebView implementation is mostly based
-    on Ken Vandine's "phablet-rebased" branch; the big difference here
-    is that the WebView is opened in a separate process, which is
-    spawned by signon-ui with a hacked $HOME variable which will force
-    WebKit2 to store all its data (cookies and form completions) into a
-    different location depending on the identity being authenticated.
-    The process separation is needed in order not to share the same
-    WebKit's WebProcess among the WebViews, which would defeat the trick
-    of changing $HOME.
-  * Runtime detection of browser handler Even if the "use-webkit2"
-    option is given at build time, allow using the qtwebkit1 interface
-    on xcb. This allows us to use the same signon-ui binary for desktop
-    and phone form factors. .
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 100
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 05 Jun 2013 18:49:08 +0000
-
-signon-ui (0.14daily13.05.14ubuntu.unity.next-0ubuntu1) raring; urgency=low
-
-  [ Alberto Mardegan ]
-  * Add a flag to disable SSL errors (to be used for integration tests).
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 97 (ubuntu-unity/next)
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Tue, 14 May 2013 13:50:47 +0000
-
-signon-ui (0.14daily13.05.02.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
-
-  * Automatic snapshot from revision 95 (ubuntu-unity/next)
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 02 May 2013 20:48:13 +0000
-
-signon-ui (0.14daily13.05.02ubuntu.unity.next-0ubuntu1) raring; urgency=low
-
-  * Automatic snapshot from revision 92 (ubuntu-unity/next)
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Thu, 02 May 2013 07:36:29 +0000
-
-signon-ui (0.14daily13.05.01.1ubuntu.unity.next-0ubuntu2) UNRELEASED; urgency=low
-
-  * debian/control
-    - don't build for powerpc, qtsensors5-dev isn't available
-
- -- Ken VanDine <ken.vandine at canonical.com>  Thu, 02 May 2013 01:16:37 -0700
-
-signon-ui (0.14daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low
-
-  [ Alberto Mardegan ]
-  * Fix a crash potentially happening when the XEmbed container reused the 
-    same X window ID from a previous one.
-
-  [ Ken VanDine ]
-  * Automatic snapshot from revision 84 (bootstrap)
-
-  [ Alberto Mardegan ]
-  * po/Makefile is missing from released tarballs (LP: #1162296)
-  * Cannot log in to Google apps domain + Ubuntu SSO (LP: #1171853)
-
-  [ Ubuntu daily release ]
-  * Automatic snapshot from revision 90 (ubuntu-unity/next)
-
- -- Ubuntu daily release <ps-jenkins at lists.canonical.com>  Wed, 01 May 2013 07:53:33 +0000
-
-signon-ui (0.14-0ubuntu2) saucy; urgency=low
-
-  [ Alberto Mardegan ]
-  * Fix a crash potentially happening when the XEmbed container reused the 
-    same X window ID from a previous one. (LP: #1158969)
-  * Fixed Cannot log in to Google apps domain + Ubuntu SSO (LP: #1171853)
-
- -- Ken VanDine <ken.vandine at canonical.com>  Wed, 29 May 2013 10:37:43 -0400
-
-signon-ui (0.14-0ubuntu1) raring; urgency=low
-
-  * New upstream release.
-    - Fix page scrolling for some websites (LP: #1158173)
-    - Prevent a double deletion of the browser dialog (LP: #1111507)
-    - Tests: don't use any libnotify methods.
-
- -- Alberto Mardegan <alberto.mardegan at canonical.com>  Thu, 21 Mar 2013 14:46:48 +0200
-
-signon-ui (0.13bzr13.03.19-0ubuntu1) raring; urgency=low
-
-  * Do not quit if some accounts are failing (LP: #1135038)
-  * Default daemonTimeout to 30 (LP: #1112680)
-
- -- Ken VanDine <ken.vandine at canonical.com>  Tue, 19 Mar 2013 11:17:02 -0400
-
-signon-ui (0.12bzr13.01.09-0ubuntu1) raring; urgency=low
-
-  * Inline packaging metadata.
-  * Fix typo in proxy detection algorithm (LP: #1095254) [mardy]
-  * Tests: add functional test for the reauthenticator [mardy]
-
- -- Robert Bruce Park <robert.park at canonical.com>  Wed, 09 Jan 2013 14:55:15 -0800
-
-signon-ui (0.11-0ubuntu1) quantal-proposed; urgency=low
-
-  * New upstream release.
-    - Do not instantiate invalid QDBusMessages (LP: #1040580)
-    - Do not allocate the proxy factory on the
-      stack (LP: #1053444) (LP: #1053454)
-
- -- Ken VanDine <ken.vandine at canonical.com>  Tue, 25 Sep 2012 16:47:07 -0400
-
-signon-ui (0.10-0ubuntu1) quantal; urgency=low
-
-  * New upstream release.
-    - Fixed proxy support (LP: #1048590)
-    - Don't emit an OSD notification when accounts fail to
-      authenticate (LP: #1049140)
-  * debian/control
-    - build depend on libproxy-dev
-
- -- Ken VanDine <ken.vandine at canonical.com>  Wed, 19 Sep 2012 15:06:38 -0400
-
-signon-ui (0.9-0ubuntu1) quantal; urgency=low
-
-  * New upstream release.
-    - Early terminate successful requests with no UI (LP: #1049207)
-
- -- Ken VanDine <ken.vandine at canonical.com>  Wed, 12 Sep 2012 09:36:58 -0400
-
-signon-ui (0.8-0ubuntu1) quantal; urgency=low
-
-  * New upstream release.
-    - Successfully terminate the browser request as soon as we are requested
-      to load the final URL.  This fixes spawning a bunch of instances of
-      external browser instances (LP: #1048177) (LP: #1047588)
-
- -- Ken VanDine <ken.vandine at canonical.com>  Mon, 10 Sep 2012 09:08:27 -0400
-
-signon-ui (0.7-0ubuntu1) quantal; urgency=low
-
-  * New upstream release.
-    - protect webkit from untrusted content, only allow https (LP: #1039084)
-  * -debian/patches/unit_tests_only.patch, merged upstream
-
- -- Ken VanDine <ken.vandine at canonical.com>  Fri, 07 Sep 2012 09:33:56 -0400
-
-signon-ui (0.6-0ubuntu1) quantal; urgency=low
-
-  * New upstream release.
-
- -- Ken VanDine <ken.vandine at canonical.com>  Fri, 17 Aug 2012 16:53:56 -0400
-
-signon-ui (0.5-0ubuntu1) quantal; urgency=low
-
-  * New upstream release
-
- -- Ken VanDine <ken.vandine at canonical.com>  Thu, 02 Aug 2012 14:40:56 -0400
-
-signon-ui (0.4+bzr47-0quantal1) quantal; urgency=low
-
-  * New snapshot rev 47
-  * common-project-config.pri
-    - fixed FTBFS by including X11 in pkgconfg
-  * tests/test.pro
-    - Only run unit tests
-  * debian/control
-    - added build depends for libxext-dev, gdb, xvfb, dbus-test-runner
-
- -- Ken VanDine <ken.vandine at canonical.com>  Wed, 01 Aug 2012 17:03:13 -0400
-
-signon-ui (0.4+bzr46-0quantal1) quantal; urgency=low
-
-  * rebuild for quantal
-
- -- Ken VanDine <ken.vandine at canonical.com>  Mon, 16 Jul 2012 09:59:56 -0400
-
-signon-ui (0.4+bzr46-0precise2) precise; urgency=low
-
-  * no change rebuild
-
- -- Ken VanDine <ken.vandine at canonical.com>  Fri, 15 Jun 2012 16:53:26 -0400
-
-signon-ui (0.4+bzr46-0precise1) precise; urgency=low
-
-  * new snapshot tag 0.4+bzr46
-
- -- Ken VanDine <ken.vandine at canonical.com>  Fri, 01 Jun 2012 14:43:03 -0400
-
-signon-ui (0.3+bzr43-0precise1) precise; urgency=low
-
-  * new snapshot tag 0.3+bzr43
-
- -- Ken VanDine <ken.vandine at canonical.com>  Wed, 04 Apr 2012 15:03:37 -0400
-
-signon-ui (0.3+bzr34-0precise2) precise; urgency=low
-
-  * rebased on trunk
-
- -- Ken VanDine <ken.vandine at canonical.com>  Fri, 30 Mar 2012 12:01:03 -0400
-
-signon-ui (0.3+bzr34-0precise1) precise; urgency=low
-
-  * new snapshot tag 0.3+bzr40
-
- -- Ken VanDine <ken.vandine at canonical.com>  Thu, 29 Mar 2012 14:34:00 -0400
-
-signon-ui (0.2+bzr37-0precise1) precise; urgency=low
-
-  * New snapshot r37
-
- -- Ken VanDine <ken.vandine at canonical.com>  Mon, 19 Mar 2012 12:27:12 -0400
-
-signon-ui (0.2-0precise2) precise; urgency=low
-
-  * debian/control
-    - added build depends on libx11-dev
-
- -- Ken VanDine <ken.vandine at canonical.com>  Thu, 05 Jan 2012 12:55:17 -0500
-
-signon-ui (0.2-0precise1) precise; urgency=low
-
-  * Initial release
-
- -- Ken VanDine <ken.vandine at canonical.com>  Thu, 05 Jan 2012 10:32:27 -0500
diff --git a/debian/debian/control b/debian/debian/control
deleted file mode 100644
index d2ce885..0000000
--- a/debian/debian/control
+++ /dev/null
@@ -1,51 +0,0 @@
-Source: signon-ui
-Section: gnome
-Priority: optional
-Maintainer: Ubuntu Desktop Team <ubuntu-desktop at lists.ubuntu.com>
-Build-Depends: dbus-test-runner,
-               debhelper (>= 9),
-               gdb,
-               libaccounts-qt5-dev,
-               libgl1-mesa-dev | libgl-dev,
-               libgles2-mesa-dev | libgles2-dev,
-               libicu-dev,
-               libnotify-dev,
-               libproxy-dev,
-               libqt5opengl5-dev,
-               libqt5webkit5-dev,
-               libsignon-qt5-dev,
-               libsqlite3-dev,
-               libx11-dev,
-               libxext-dev,
-               libxslt1-dev,
-               pkg-config,
-               qtbase5-dev (>= 5.0.2+dfsg1-3ubuntu1),
-               qtdeclarative5-dev,
-               qtlocation5-dev,
-               libqt5sensors5-dev,
-               signon-plugins-dev,
-               xvfb,
-Standards-Version: 3.9.3
-Homepage: https://launchpad.net/signon-ui
-# If you aren't a member of ~online-accounts but need to upload packaging changes,
-# just go ahead.  ~online-accounts will notice and sync up the code again.
-Vcs-Bzr: https://code.launchpad.net/~online-accounts/signon-ui/trunk
-
-Package: signon-ui-x11
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         signon-ui-service
-Breaks: signon-ui (<< 0.17)
-Replaces: signon-ui (<< 0.17)
-Description: Single Sign-on UI
- UI for the signond Single Signon service
-
-Package: signon-ui-service
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}
-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.
diff --git a/debian/debian/copyright b/debian/debian/copyright
deleted file mode 100644
index f743e03..0000000
--- a/debian/debian/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: online-accounts-signon-ui
-Upstream-Contact: Alberto Mardegan <alberto.mardegan at canonical.com>
-Source: https://launchpad.net/online-accounts-signon-ui
-
-Files: *
-Copyright: 2011 Canonical Ltd.
-License: GPL-3
-
-Files: src/animation-label.*
-Copyright: 2009 Nokia Corporation
-License: GPL-3
-
-Files: debian/*
-Copyright: 2011 Ken VanDine <ken.vandine at canonical.com>
-License: GPL-3
-
-License: GPL-3
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/debian/rules b/debian/debian/rules
deleted file mode 100644
index 849f76c..0000000
--- a/debian/debian/rules
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-
-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)"
-
-override_dh_install:
-	rm -f debian/*/usr/bin/signon-ui-unittest
-	dh_install --fail-missing
-
-%:
-	dh $@
diff --git a/debian/debian/signon-ui-service.install b/debian/debian/signon-ui-service.install
deleted file mode 100644
index e7e60ae..0000000
--- a/debian/debian/signon-ui-service.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/dbus-1/services/com.canonical.indicators.webcredentials.service
-usr/share/dbus-1/services/com.nokia.singlesignonui.service
diff --git a/debian/debian/signon-ui-x11.install b/debian/debian/signon-ui-x11.install
deleted file mode 100644
index dfb802a..0000000
--- a/debian/debian/signon-ui-x11.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/signon-ui
-usr/share/applications/signon-ui.desktop
diff --git a/debian/rules b/debian/rules
index 117a259..b3f2220 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,28 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
+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)"
+
+override_dh_install:
+	rm -f debian/*/usr/bin/signon-ui-unittest
+	dh_install --fail-missing
+
+%:
+	dh $@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
diff --git a/debian/signon-ui-service.install b/debian/signon-ui-service.install
index e7e60ae..0d058a8 100644
--- a/debian/signon-ui-service.install
+++ b/debian/signon-ui-service.install
@@ -1,2 +1,4 @@
 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 dfb802a..a51f290 100644
--- a/debian/signon-ui-x11.install
+++ b/debian/signon-ui-x11.install
@@ -1,2 +1,4 @@
 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