On Mon, Jan 20, 2020 at 08:27:41PM +0100, Moritz Mühlenhoff wrote:
> On Thu, Sep 12, 2019 at 11:48:46PM +0200, Axel Beckert wrote:
> > > or we're moving forward with the Qt4 removal.
> >
> > Just move forward. IIRC amora already has been removed from testing,
> > so it really shouldn't be an issue for the Qt4 removal.
>
> Quick status update: qt4 is now removed from testing and we're
> planning to remove it from unstable by end of Februrary (along
> with whatever rdeps (currently 15) remain by that date).
Attached is a quick-and-dirty patch to drop the amora-applet binary
package, qt4 will soon be removed from unstable.
Cheers,
Moritz
diff -Naur amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.dirs amora-server-1.2~svn+git2015.04.25/debian/amora-applet.dirs
--- amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.dirs 2015-03-16 20:29:23.000000000 +0100
+++ amora-server-1.2~svn+git2015.04.25/debian/amora-applet.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/applications
diff -Naur amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.docs amora-server-1.2~svn+git2015.04.25/debian/amora-applet.docs
--- amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.docs 2015-03-16 20:29:23.000000000 +0100
+++ amora-server-1.2~svn+git2015.04.25/debian/amora-applet.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-amora-applet/README
-debian/README.source
diff -Naur amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.install amora-server-1.2~svn+git2015.04.25/debian/amora-applet.install
--- amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.install 2015-03-16 20:29:23.000000000 +0100
+++ amora-server-1.2~svn+git2015.04.25/debian/amora-applet.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-# qmake-qt4's generated install target has the path hardwired. So we
-# do it manually.
-amora-applet/amorad-gui usr/bin
-debian/amorad-gui.desktop usr/share/applications
diff -Naur amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.menu amora-server-1.2~svn+git2015.04.25/debian/amora-applet.menu
--- amora-server-1.2~svn+git2015.04.25.orig/debian/amora-applet.menu 2015-03-16 20:29:23.000000000 +0100
+++ amora-server-1.2~svn+git2015.04.25/debian/amora-applet.menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-?package(amora-applet):needs="X11" section="Applications/Mobile Devices"\
- title="Amora Daemon (systray applet)" command="/usr/bin/amorad-gui"
diff -Naur amora-server-1.2~svn+git2015.04.25.orig/debian/control amora-server-1.2~svn+git2015.04.25/debian/control
--- amora-server-1.2~svn+git2015.04.25.orig/debian/control 2015-04-26 02:24:42.000000000 +0200
+++ amora-server-1.2~svn+git2015.04.25/debian/control 2020-02-26 12:52:33.293657036 +0100
@@ -10,12 +10,10 @@
libbluetooth-dev,
libdbus-1-dev,
libimlib2-dev,
- libqt4-dev,
libtool-bin,
libx11-dev,
libxtst-dev,
- pkg-config,
- qt4-qmake
+ pkg-config
Standards-Version: 3.9.6
Homepage: https://github.com/amora/amora#readme
Vcs-Git: git://github.com/amora/amora.git
@@ -48,28 +46,3 @@
The client has to be installed on the mobile phone and is not
contained in the package. It can be downloaded from the home page of
the project.
-
-Package: amora-applet
-Provides: amora-server
-Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Description: use a bluetooth device as X remote control (systray applet)
- Amora (A mobile remote assistant) is an application that enables you
- to control your desktop using your mobile phone. It uses bluetooth to
- send mouse and keyboard events to the X session. With it, you can
- control your presentations, movies or any other application which
- mainly uses mouse and cursor keys.
- .
- Amora also has a screenshot feature, where you can see a thumbnail of
- the currently focused window on the mobile phone.
- .
- Currently only Symbian Series 60 mobile phones are supported. A Java
- client implementation is under development. A proof of concept client
- for Linux based mobile device like the Nokia Internet Tablets and the
- OpenMoko FreeRunner is available.
- .
- This package contains the Qt-based system tray applet version of the
- daemon running on the to be remote controlled computer. The client
- has to be installed on the mobile phone and is not contained in the
- package. It can be downloaded from the home page of the project.
diff -Naur amora-server-1.2~svn+git2015.04.25.orig/debian/rules amora-server-1.2~svn+git2015.04.25/debian/rules
--- amora-server-1.2~svn+git2015.04.25.orig/debian/rules 2015-03-16 20:29:23.000000000 +0100
+++ amora-server-1.2~svn+git2015.04.25/debian/rules 2020-02-26 12:52:49.545755336 +0100
@@ -13,8 +13,6 @@
override_dh_auto_configure:
cd amora-cli && autoreconf -f -i
dh_auto_configure -D amora-cli
- # Does qmake-qt4 support cross-compiling?
- $(MAKE) amora-applet/Makefile
override_dh_clean:
# Remove any amora-screenshot.png which usually result from testing
--- amora-server-1.2~svn+git2015.04.25.orig/Makefile 2015-04-25 23:56:16.000000000 +0200
+++ amora-server-1.2~svn+git2015.04.25/Makefile 2020-02-26 12:54:59.802670048 +0100
@@ -9,7 +9,7 @@
DIR=$(TMPDIR)/$(BUILDDIR)
WORKDIR=$(shell pwd)
-all: amora-cli/amorad amora-applet/amorad-gui
+all: amora-cli/amorad
amora-cli/configure: amora-cli/configure.ac
cd amora-cli && autoreconf -i
