Download as
Browse Code »

Commit eb43b26bb29043db6976674f47af3ae48ffe0022

Authored by Perry Werneck
1 parent 39c7b224
Exists in master and in 3 other branches develop, macos, network_module

Updating "deb" packages.

Showing 4 changed files with 16 additions and 15 deletions   Show diff stats
debian/changelog
  Diff comments   View file @eb43b26
1 -pw3270 (5.2-0) unstable; urgency=low 1 +lib3270 (5.2-0) unstable; urgency=low
2 2
3 * Initial Release 3 * Initial Release
4 4
debian/control
  Diff comments   View file @eb43b26
@@ -23,7 +23,7 @@ Architecture: any @@ -23,7 +23,7 @@ Architecture: any
23 Section: libdevel 23 Section: libdevel
24 Depends: ${misc:Depends}, lib3270 (= ${binary:Version}), pkg-config, lib3270 (= ${binary:Version}), lib3270++ (= ${binary:Version}) 24 Depends: ${misc:Depends}, lib3270 (= ${binary:Version}), pkg-config, lib3270 (= ${binary:Version}), lib3270++ (= ${binary:Version})
25 Description: TN3270 Access library development files. 25 Description: TN3270 Access library development files.
26 - TN3270 access library originally designed as part of the pw3270 application; C/C++ Development files. 26 + TN3270 access library originally designed as part of the pw3270 application.
27 27
28 Package: lib3270-dbg 28 Package: lib3270-dbg
29 Architecture: any 29 Architecture: any
@@ -9,7 +9,7 @@ export DH_VERBOSE=1 @@ -9,7 +9,7 @@ export DH_VERBOSE=1
9 export DH_COMPAT=9 9 export DH_COMPAT=9
10 10
11 # Name of the package 11 # Name of the package
12 -PACKAGE_NAME=pw3270 12 +PACKAGE_NAME=lib3270
13 13
14 CFLAGS = -g 14 CFLAGS = -g
15 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) 15 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -25,6 +25,10 @@ build-stamp: @@ -25,6 +25,10 @@ build-stamp:
25 # Add here commands to compile the package. 25 # Add here commands to compile the package.
26 aclocal 26 aclocal
27 autoconf 27 autoconf
  28 +
  29 + mkdir -p scripts
  30 + automake --add-missing 2> /dev/null | true
  31 +
28 ./configure --prefix=/usr 32 ./configure --prefix=/usr
29 make all 33 make all
30 # --- end custom part for compiling 34 # --- end custom part for compiling
@@ -52,16 +56,16 @@ install: build @@ -52,16 +56,16 @@ install: build
52 make all 56 make all
53 57
54 # Install lib3270 58 # Install lib3270
55 - make DESTDIR=$(PWD)/debian/lib3270 -C lib3270 install-library 59 + make DESTDIR=$(PWD)/debian/lib3270 -C src/lib3270 install-shared
56 find $(PWD)/debian/lib3270 -type f | sed -e "s@^$(PWD)/debian/lib3270/@/@g" > $(PWD)/debian/lib3270.install 60 find $(PWD)/debian/lib3270 -type f | sed -e "s@^$(PWD)/debian/lib3270/@/@g" > $(PWD)/debian/lib3270.install
57 61
58 - # Install lib3270  
59 - make DESTDIR=$(PWD)/debian/lib3270++ -C lib3270 install-library 62 + # Install lib3270++
  63 + make DESTDIR=$(PWD)/debian/lib3270++ -C src/lib3270++ install-shared
60 find $(PWD)/debian/lib3270++ -type f | sed -e "s@^$(PWD)/debian/lib3270++/@/@g" > $(PWD)/debian/lib3270++.install 64 find $(PWD)/debian/lib3270++ -type f | sed -e "s@^$(PWD)/debian/lib3270++/@/@g" > $(PWD)/debian/lib3270++.install
61 65
62 # Install dev 66 # Install dev
63 - make DESTDIR=$(PWD)/debian/lib3270-dev -C lib3270 install-dev  
64 - make DESTDIR=$(PWD)/debian/lib3270-dev -C lib3270++ install-dev 67 + make DESTDIR=$(PWD)/debian/lib3270-dev -C src/lib3270 install-dev
  68 + make DESTDIR=$(PWD)/debian/lib3270-dev -C src/lib3270++ install-dev
65 find $(PWD)/debian/lib3270-dev -type f | sed -e "s@^$(PWD)/debian/lib3270-dev/@/@g" > $(PWD)/debian/lib3270-dev.install 69 find $(PWD)/debian/lib3270-dev -type f | sed -e "s@^$(PWD)/debian/lib3270-dev/@/@g" > $(PWD)/debian/lib3270-dev.install
66 70
67 # --- end custom part for installing 71 # --- end custom part for installing
@@ -75,7 +79,7 @@ binary-arch: build install @@ -75,7 +79,7 @@ binary-arch: build install
75 dh_testdir 79 dh_testdir
76 dh_testroot 80 dh_testroot
77 # dh_installdebconf 81 # dh_installdebconf
78 - dh_installdocs AUTHORS LICENSE 82 + dh_installdocs AUTHORS LICENSE README.md
79 dh_installexamples 83 dh_installexamples
80 dh_installmenu 84 dh_installmenu
81 # dh_installlogrotate 85 # dh_installlogrotate
@@ -89,7 +93,7 @@ binary-arch: build install @@ -89,7 +93,7 @@ binary-arch: build install
89 # dh_undocumented 93 # dh_undocumented
90 dh_installchangelogs 94 dh_installchangelogs
91 dh_link 95 dh_link
92 - dh_strip --dbg-package=pw3270-dbg 96 + dh_strip --dbg-package=lib3270-dbg
93 dh_compress 97 dh_compress
94 dh_fixperms 98 dh_fixperms
95 dh_makeshlibs 99 dh_makeshlibs
rpm/lib3270.spec
  Diff comments   View file @eb43b26
@@ -50,8 +50,8 @@ Url: https://portal.softwarepublico.gov.br/social/pw3270/ @@ -50,8 +50,8 @@ Url: https://portal.softwarepublico.gov.br/social/pw3270/
50 Group: Development/Libraries/C and C++ 50 Group: Development/Libraries/C and C++
51 BuildRoot: /var/tmp/%{name}-%{version} 51 BuildRoot: /var/tmp/%{name}-%{version}
52 52
53 -Provides: lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}  
54 -Conflicts: otherproviders(lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}) 53 +Provides: lib3270_%{_libvrs}
  54 +Conflicts: otherproviders(lib3270_%{_libvrs})
55 55
56 BuildRequires: pkgconfig(openssl) 56 BuildRequires: pkgconfig(openssl)
57 BuildRequires: autoconf >= 2.61 57 BuildRequires: autoconf >= 2.61
@@ -95,9 +95,6 @@ Requires: lib3270++%{_libvrs} = %{version} @@ -95,9 +95,6 @@ Requires: lib3270++%{_libvrs} = %{version}
95 Provides: lib3270-devel = %{version} 95 Provides: lib3270-devel = %{version}
96 Conflicts: otherproviders(lib3270-devel) 96 Conflicts: otherproviders(lib3270-devel)
97 97
98 -Provides: lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}-devel  
99 -Conflicts: otherproviders(lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}-devel)  
100 -  
101 %description devel 98 %description devel
102 99
103 TN3270 access library for C/C++ development files. 100 TN3270 access library for C/C++ development files.