From eb43b26bb29043db6976674f47af3ae48ffe0022 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Mon, 10 Dec 2018 15:01:51 -0200
Subject: [PATCH] Updating "deb" packages.

---
 debian/changelog |  2 +-
 debian/control   |  2 +-
 debian/rules     | 20 ++++++++++++--------
 rpm/lib3270.spec |  7 ++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83ada8e..3c22020 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pw3270 (5.2-0) unstable; urgency=low
+lib3270 (5.2-0) unstable; urgency=low
 
   * Initial Release
 
diff --git a/debian/control b/debian/control
index 3988647..1552baa 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}, lib3270 (= ${binary:Version}), pkg-config, lib3270 (= ${binary:Version}), lib3270++ (= ${binary:Version})
 Description: TN3270 Access library development files.
- TN3270 access library originally designed as part of the pw3270 application; C/C++ Development files.
+ TN3270 access library originally designed as part of the pw3270 application.
 
 Package: lib3270-dbg
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 2c2a66f..d704f42 100644
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export DH_VERBOSE=1
 export DH_COMPAT=9
 
 # Name of the package
-PACKAGE_NAME=pw3270
+PACKAGE_NAME=lib3270
 
 CFLAGS = -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -25,6 +25,10 @@ build-stamp:
 	# Add here commands to compile the package.
 	aclocal
 	autoconf
+    
+	mkdir -p scripts
+	automake --add-missing 2> /dev/null | true
+    
 	./configure --prefix=/usr
 	make all
 	# --- end custom part for compiling
@@ -52,16 +56,16 @@ install: build
 	make all
 
 	# Install lib3270
-	make DESTDIR=$(PWD)/debian/lib3270 -C lib3270 install-library
+	make DESTDIR=$(PWD)/debian/lib3270 -C src/lib3270 install-shared
 	find $(PWD)/debian/lib3270 -type f | sed -e "s@^$(PWD)/debian/lib3270/@/@g" > $(PWD)/debian/lib3270.install
 
-	# Install lib3270
-	make DESTDIR=$(PWD)/debian/lib3270++ -C lib3270 install-library
+	# Install lib3270++
+	make DESTDIR=$(PWD)/debian/lib3270++ -C src/lib3270++ install-shared
 	find $(PWD)/debian/lib3270++ -type f | sed -e "s@^$(PWD)/debian/lib3270++/@/@g" > $(PWD)/debian/lib3270++.install
 
 	# Install dev
-	make DESTDIR=$(PWD)/debian/lib3270-dev -C lib3270 install-dev
-	make DESTDIR=$(PWD)/debian/lib3270-dev -C lib3270++ install-dev
+	make DESTDIR=$(PWD)/debian/lib3270-dev -C src/lib3270 install-dev
+	make DESTDIR=$(PWD)/debian/lib3270-dev -C src/lib3270++ install-dev
 	find $(PWD)/debian/lib3270-dev -type f | sed -e "s@^$(PWD)/debian/lib3270-dev/@/@g" > $(PWD)/debian/lib3270-dev.install
 
 	# --- end custom part for installing
@@ -75,7 +79,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf
-	dh_installdocs AUTHORS LICENSE
+	dh_installdocs AUTHORS LICENSE README.md
 	dh_installexamples
 	dh_installmenu
 #	dh_installlogrotate
@@ -89,7 +93,7 @@ binary-arch: build install
 #	dh_undocumented
 	dh_installchangelogs
 	dh_link
-	dh_strip --dbg-package=pw3270-dbg
+	dh_strip --dbg-package=lib3270-dbg
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs
diff --git a/rpm/lib3270.spec b/rpm/lib3270.spec
index 12e091f..3b14e90 100644
--- a/rpm/lib3270.spec
+++ b/rpm/lib3270.spec
@@ -50,8 +50,8 @@ Url:		https://portal.softwarepublico.gov.br/social/pw3270/
 Group:		Development/Libraries/C and C++
 BuildRoot:	/var/tmp/%{name}-%{version}
 
-Provides:	lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}
-Conflicts:	otherproviders(lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION})
+Provides:	lib3270_%{_libvrs}
+Conflicts:	otherproviders(lib3270_%{_libvrs})
 
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  autoconf >= 2.61
@@ -95,9 +95,6 @@ Requires:	lib3270++%{_libvrs} = %{version}
 Provides:	lib3270-devel = %{version}
 Conflicts:	otherproviders(lib3270-devel)
 
-Provides:	lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}-devel
-Conflicts:	otherproviders(lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}-devel)
-
 %description devel
 
 TN3270 access library for C/C++ development files.
--
libgit2 0.21.2