Commit eb43b26bb29043db6976674f47af3ae48ffe0022
1 parent
39c7b224
Exists in
master
and in
3 other branches
Updating "deb" packages.
Showing
4 changed files
with
16 additions
and
15 deletions
Show diff stats
debian/changelog
debian/control
| ... | ... | @@ -23,7 +23,7 @@ Architecture: any |
| 23 | 23 | Section: libdevel |
| 24 | 24 | Depends: ${misc:Depends}, lib3270 (= ${binary:Version}), pkg-config, lib3270 (= ${binary:Version}), lib3270++ (= ${binary:Version}) |
| 25 | 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 | 28 | Package: lib3270-dbg |
| 29 | 29 | Architecture: any | ... | ... |
debian/rules
| ... | ... | @@ -9,7 +9,7 @@ export DH_VERBOSE=1 |
| 9 | 9 | export DH_COMPAT=9 |
| 10 | 10 | |
| 11 | 11 | # Name of the package |
| 12 | -PACKAGE_NAME=pw3270 | |
| 12 | +PACKAGE_NAME=lib3270 | |
| 13 | 13 | |
| 14 | 14 | CFLAGS = -g |
| 15 | 15 | ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) |
| ... | ... | @@ -25,6 +25,10 @@ build-stamp: |
| 25 | 25 | # Add here commands to compile the package. |
| 26 | 26 | aclocal |
| 27 | 27 | autoconf |
| 28 | + | |
| 29 | + mkdir -p scripts | |
| 30 | + automake --add-missing 2> /dev/null | true | |
| 31 | + | |
| 28 | 32 | ./configure --prefix=/usr |
| 29 | 33 | make all |
| 30 | 34 | # --- end custom part for compiling |
| ... | ... | @@ -52,16 +56,16 @@ install: build |
| 52 | 56 | make all |
| 53 | 57 | |
| 54 | 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 | 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 | 64 | find $(PWD)/debian/lib3270++ -type f | sed -e "s@^$(PWD)/debian/lib3270++/@/@g" > $(PWD)/debian/lib3270++.install |
| 61 | 65 | |
| 62 | 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 | 69 | find $(PWD)/debian/lib3270-dev -type f | sed -e "s@^$(PWD)/debian/lib3270-dev/@/@g" > $(PWD)/debian/lib3270-dev.install |
| 66 | 70 | |
| 67 | 71 | # --- end custom part for installing |
| ... | ... | @@ -75,7 +79,7 @@ binary-arch: build install |
| 75 | 79 | dh_testdir |
| 76 | 80 | dh_testroot |
| 77 | 81 | # dh_installdebconf |
| 78 | - dh_installdocs AUTHORS LICENSE | |
| 82 | + dh_installdocs AUTHORS LICENSE README.md | |
| 79 | 83 | dh_installexamples |
| 80 | 84 | dh_installmenu |
| 81 | 85 | # dh_installlogrotate |
| ... | ... | @@ -89,7 +93,7 @@ binary-arch: build install |
| 89 | 93 | # dh_undocumented |
| 90 | 94 | dh_installchangelogs |
| 91 | 95 | dh_link |
| 92 | - dh_strip --dbg-package=pw3270-dbg | |
| 96 | + dh_strip --dbg-package=lib3270-dbg | |
| 93 | 97 | dh_compress |
| 94 | 98 | dh_fixperms |
| 95 | 99 | dh_makeshlibs | ... | ... |
rpm/lib3270.spec
| ... | ... | @@ -50,8 +50,8 @@ Url: https://portal.softwarepublico.gov.br/social/pw3270/ |
| 50 | 50 | Group: Development/Libraries/C and C++ |
| 51 | 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 | 56 | BuildRequires: pkgconfig(openssl) |
| 57 | 57 | BuildRequires: autoconf >= 2.61 |
| ... | ... | @@ -95,9 +95,6 @@ Requires: lib3270++%{_libvrs} = %{version} |
| 95 | 95 | Provides: lib3270-devel = %{version} |
| 96 | 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 | 98 | %description devel |
| 102 | 99 | |
| 103 | 100 | TN3270 access library for C/C++ development files. | ... | ... |