From f746e8b2ee31e4f8e3e8bb071c0591489b2e0ced Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 26 Feb 2019 13:15:21 -0300
Subject: [PATCH] Removing libv3270 submodule

---
 .gitmodules      |  3 ---
 arch/PKGBUILD    | 38 ++++++++++++++++++++++++++++++++++++++
 debian/control   |  8 +-------
 debian/rules     | 17 ++---------------
 debian/shlibs    |  5 +++--
 modules/libv3270 |  1 -
 6 files changed, 44 insertions(+), 28 deletions(-)
 create mode 100644 arch/PKGBUILD
 delete mode 160000 modules/libv3270

diff --git a/.gitmodules b/.gitmodules
index 2045818..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "modules/libv3270"]
-	path = modules/libv3270
-	url = http://softwarepublico.gov.br/gitlab/pw3270/libv3270.git
diff --git a/arch/PKGBUILD b/arch/PKGBUILD
new file mode 100644
index 0000000..c5ab9cc
--- /dev/null
+++ b/arch/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Perry Werneck <perry.werneck@gmail.com>
+
+pkgname=pw3270
+
+pkgver=5.2
+pkgrel=1
+pkgdesc="IBM 3270 Terminal emulator for GTK"
+url="https://portal.softwarepublico.gov.br/social/pw3270/"
+arch=(i686 x86_64)
+license=(GPL)
+depends=()
+makedepends=(autoconf automake make openssl lib3270 gtk3 libv3270 python3 dbus dbus-glib imagemagick optipng)
+checkdepends=()
+
+#groups=(gnome)
+
+source=($pkgname-$pkgver.tar.xz)
+sha256sums=('SKIP')
+
+provides=($pkgname)
+conflicts=($pkgname)
+
+prepare() {
+  cd $pkgname-$pkgver
+  NOCONFIGURE=1 ./autogen.sh
+  ./configure --prefix=/usr
+}
+
+build() {
+  cd $pkgname-$pkgver
+  make all
+}
+
+package() {
+  cd $pkgname-$pkgver
+  DESTDIR="$pkgdir" make install
+}
+
diff --git a/debian/control b/debian/control
index 347fd67..61c61e7 100644
--- a/debian/control
+++ b/debian/control
@@ -14,16 +14,10 @@ Description: IBM 3270 Terminal emulator for gtk
 Package: pw3270-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libdbus-1-dev, lib3270-dev (= ${binary:Version}), pw3270 (= ${binary:Version})
+Depends: ${misc:Depends}, libdbus-1-dev, libv3270-dev (= ${binary:Version}), pw3270 (= ${binary:Version})
 Description: lib3270 development files.
  This package contains the files needed for development of pw3270 extensions and plugins
 
-Package: pw3270-plugin-dbus
-Architecture: any
-Depends: ${misc:Depends}, pw3270 (= ${binary:Version}), libdbus-1-3
-Description: DBUS plugin for pw3270.
- This package contains the plugin allowing scripting of a pw3270 session using dbus calls.
-
 Package: pw3270-dbg
 Architecture: any
 Depends: lib3270 (= ${binary:Version}), pw3270 (= ${binary:Version}), ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index ead3762..3140439 100644
--- a/debian/rules
+++ b/debian/rules
@@ -52,27 +52,14 @@ install: build
 	# Build package
 	make all
 
-	# Install main library
-	make DESTDIR=$(PWD)/debian/lib3270 install-lib
-
 	# Install pw3270's GUI
-	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME) install-app
+	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME) install-application
 
 	# Install $(PACKAGE_NAME)-sdk
-	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev -C sdk install-$(PACKAGE_NAME)
-	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev -C src/libpw3270cpp install
-
-	mkdir -p $(PWD)/debian/lib3270-dev/lib3270
-	install --mode=644 src/include/lib3270.h $(PWD)/debian/lib3270-dev
-	install --mode=644 src/include/lib3270/*.h $(PWD)/debian/lib3270-dev/lib3270
-
-	# Install DBUS plugin
-	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-plugin-dbus -C src/plugins/dbus3270/ install
+	make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-dev install-devel
 
 	# Get file lists
-	find $(PWD)/debian/lib3270 -type f | sed -e "s@^$(PWD)/debian/lib3270/@/@g" > $(PWD)/debian/lib3270.install
 	find $(PWD)/debian/$(PACKAGE_NAME) -type f | sed -e "s@^$(PWD)/debian/$(PACKAGE_NAME)/@/@g" > $(PWD)/debian/$(PACKAGE_NAME).install
-	find $(PWD)/debian/$(PACKAGE_NAME)-plugin-dbus -type f | sed -e "s@^$(PWD)/debian/$(PACKAGE_NAME)-plugin-dbus/@/@g" > $(PWD)/debian/$(PACKAGE_NAME)-plugin-dbus.install
 	find $(PWD)/debian/$(PACKAGE_NAME)-dev -type f | sed -e "s@^$(PWD)/debian/$(PACKAGE_NAME)-dev/@/@g" > $(PWD)/debian/$(PACKAGE_NAME)-dev.install
 	# --- end custom part for installing
 
diff --git a/debian/shlibs b/debian/shlibs
index f40bebf..d5fcd1d 100644
--- a/debian/shlibs
+++ b/debian/shlibs
@@ -1,3 +1,4 @@
-lib3270 5.1 lib3270 (>= 5.1)
-libpw3270 5.1 pw3270 (>= 5.1)
+lib3270 5.2 lib3270 (>= 5.2)
+libv3270 5.2 libv3270 (>= 5.2)
+libpw3270 5.2 pw3270 (>= 5.2)
 
diff --git a/modules/libv3270 b/modules/libv3270
deleted file mode 160000
index 6a30818..0000000
--- a/modules/libv3270
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6a308188fb74a6b619d488275fe824d2df9214c5
--
libgit2 0.21.2