From c00f352b926c37a3ae7f79ee7ce66398a668faec Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez <jorge.gonzalez.gonzalez@gmail.com> Date: Sat, 1 Feb 2020 13:06:52 +0100 Subject: [PATCH] Fix debian libssl dependency --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 648909fe..858ff086 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ If you do not want to use them pass options --disable-libconfig, --disable-liblu On Ubuntu/Debian use: - sudo apt-get install libreadline-dev libconfig-dev libssl1.0-dev lua5.2 liblua5.2-dev libevent-dev libjansson-dev libpython-dev libpython3-dev libgcrypt-dev zlib1g-dev lua-lgi make + sudo apt-get install libreadline-dev libconfig-dev libssl-dev lua5.2 liblua5.2-dev libevent-dev libjansson-dev libpython-dev libpython3-dev libgcrypt-dev zlib1g-dev lua-lgi make To build and install the packaege, run: dpkg-buildpackage -b From 783f6985aa452a42f253b25f8d9e215657cb9ae8 Mon Sep 17 00:00:00 2001 From: Olivier Kaloudoff <kaloudov@yandex.com> Date: Mon, 30 Mar 2020 14:38:11 +0200 Subject: [PATCH 1/4] debian/control: add missing dependency libgcrypt-dev --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 8daa5d94..e71f80b4 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Build-Depends: autoconf-archive, libjansson-dev, libpython-dev, liblua5.2-dev, + libgcrypt-dev, lua-lgi, lua5.2 Standards-Version: 3.9.5 From 66bcf7d07f12e8cb16ef6b8575b92f32e526f2bd Mon Sep 17 00:00:00 2001 From: Olivier Kaloudoff <kaloudov@yandex.com> Date: Mon, 30 Mar 2020 14:39:05 +0200 Subject: [PATCH 2/4] debian/rules: configure using prefix=/usr --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index b82afaac..e29b4d17 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ export DH_VERBOSE=1 VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d'-') PACKAGE_NAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p') override_dh_auto_configure: - ./configure --disable-openssl + ./configure --disable-openssl --prefix=/usr %: cp tg-server.pub server.pub dh $@ --with autotools-dev From dd912f1ed8518ddb691c34a536034f3b9ef63745 Mon Sep 17 00:00:00 2001 From: Olivier Kaloudoff <kaloudov@yandex.com> Date: Mon, 30 Mar 2020 14:39:40 +0200 Subject: [PATCH 3/4] fix install step (telegram -> bin/telegram-cli) --- Makefile.in | 4 ++-- debian/install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index f0bfc76d..ffcce82b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -66,6 +66,6 @@ distclean: rm -rf ${DIR_LIST} config.h config.log config.status install: all - @mkdir -p $(INSTALL_BIN) - $(INSTALL) telegram $(INSTALL_BIN) + @mkdir -p $(DESTDIR)/$(INSTALL_BIN) + $(INSTALL) bin/telegram-cli $(DESTDIR)/$(INSTALL_BIN) rm -rf ${DIR_LIST} config.log config.status > /dev/null || echo "all clean" diff --git a/debian/install b/debian/install index 8fa667d1..ab1b228e 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,4 @@ -bin/telegram-cli usr/bin +#bin/telegram-cli usr/bin server.pub etc/telegram-cli #bin/telegram-cli usr/share/telegram-daemon/bin From a3832eeec6ba4b3ebf182fd567b046a3169b7435 Mon Sep 17 00:00:00 2001 From: Olivier Kaloudoff <kaloudov@yandex.com> Date: Mon, 30 Mar 2020 16:43:43 +0200 Subject: [PATCH 4/4] debian/rules: prevent run of dh_usrlocal --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index e29b4d17..43febf23 100755 --- a/debian/rules +++ b/debian/rules @@ -11,8 +11,13 @@ export DH_VERBOSE=1 VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d'-') PACKAGE_NAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p') + override_dh_auto_configure: ./configure --disable-openssl --prefix=/usr + +override_dh_usrlocal: + + %: cp tg-server.pub server.pub dh $@ --with autotools-dev