Download as
Browse Code »

Commit 795c8ff90a45bfccccabface9ff8cd96209954e2

Authored by Perry Werneck
2 parents 1ab5b48e 0db200c1
Exists in master and in 2 other branches develop, macos

Merge branch 'develop'

Showing 7 changed files with 12 additions and 9 deletions   Show diff stats
@@ -31,7 +31,7 @@ AC_PREREQ(2.61) @@ -31,7 +31,7 @@ AC_PREREQ(2.61)
31 31
32 dnl Initialise automake with the package name, version and 32 dnl Initialise automake with the package name, version and
33 dnl bug-reporting address. 33 dnl bug-reporting address.
34 -AC_INIT([lib3270], [5.3], [perry.werneck@gmail.com]) 34 +AC_INIT([lib3270], [5.4], [perry.werneck@gmail.com])
35 35
36 dnl Place auxilliary scripts here. 36 dnl Place auxilliary scripts here.
37 AC_CONFIG_AUX_DIR([scripts]) 37 AC_CONFIG_AUX_DIR([scripts])
debian/changelog
  Diff comments   View file @795c8ff
1 -lib3270 (5.3-0) unstable; urgency=low 1 +lib3270 (5.4-0) unstable; urgency=low
2 2
3 * Initial Release 3 * Initial Release
4 4
debian/lib3270.dsc
  Diff comments   View file @795c8ff
1 Format: 1.0 1 Format: 1.0
2 Source: lib3270 2 Source: lib3270
3 -Version: 5.3-0 3 +Version: 5.4-0
4 Binary: lib3270 4 Binary: lib3270
5 Maintainer: Perry Werneck <perry.werneck@gmail.com> 5 Maintainer: Perry Werneck <perry.werneck@gmail.com>
6 Architecture: any 6 Architecture: any
@@ -8,6 +8,6 @@ Build-Depends: debhelper (&gt;= 7), autotools-dev, autoconf, automake, pkg-config, @@ -8,6 +8,6 @@ Build-Depends: debhelper (&gt;= 7), autotools-dev, autoconf, automake, pkg-config,
8 Standards-Version: 3.9.1.0 8 Standards-Version: 3.9.1.0
9 DEBTRANSFORM-RELEASE: 1 9 DEBTRANSFORM-RELEASE: 1
10 Files: 10 Files:
11 - 00000000000000000000000000000000 000000 lib3270-5.3.tar.bz2 11 + 00000000000000000000000000000000 000000 lib3270-5.4.tar.bz2
12 12
13 13
1 -lib3270 5.3 lib3270 (>= 5.3) 1 +lib3270 5.4 lib3270 (>= 5.4)
2 2
3 3
@@ -20,8 +20,8 @@ fi @@ -20,8 +20,8 @@ fi
20 git push 20 git push
21 21
22 git fetch origin 22 git fetch origin
23 -git checkout master  
24 -git merge origin/master 23 +#git checkout master
  24 +#git merge origin/master
25 25
26 git tag -f ${1} 26 git tag -f ${1}
27 git push -f --tags 27 git push -f --tags
@@ -5,13 +5,13 @@ @@ -5,13 +5,13 @@
5 <param name="changesgenerate">enable</param> 5 <param name="changesgenerate">enable</param>
6 <param name="changesauthor">perry.werneck@gmail.com</param> 6 <param name="changesauthor">perry.werneck@gmail.com</param>
7 <param name="url">https://github.com/PerryWerneck/lib3270.git</param> 7 <param name="url">https://github.com/PerryWerneck/lib3270.git</param>
8 - <param name="versionformat">@PARENT_TAG@</param> 8 + <param name="versionformat">@PARENT_TAG@+git%cd</param>
9 <param name="scm">git</param> 9 <param name="scm">git</param>
10 </service> 10 </service>
11 11
12 <!-- https://github.com/openSUSE/obs-service-extract_file --> 12 <!-- https://github.com/openSUSE/obs-service-extract_file -->
13 13
14 - <service name="extract_file"> 14 + <service name="extract_file">
15 <param name="archive">*.tar</param> 15 <param name="archive">*.tar</param>
16 <param name="files">*/rpm/lib3270.spec</param> 16 <param name="files">*/rpm/lib3270.spec</param>
17 </service> 17 </service>
rpm/lib3270.spec
  Diff comments   View file @795c8ff
@@ -21,6 +21,7 @@ Name: lib3270 @@ -21,6 +21,7 @@ Name: lib3270
21 Version: 5.3 21 Version: 5.3
22 Release: 0 22 Release: 0
23 Summary: TN3270 Access library 23 Summary: TN3270 Access library
  24 +Group: Development/Libraries/C and C++
24 License: LGPL-3.0-only 25 License: LGPL-3.0-only
25 URL: https://github.com/PerryWerneck/lib3270 26 URL: https://github.com/PerryWerneck/lib3270
26 Source: %{name}-%{version}.tar.xz 27 Source: %{name}-%{version}.tar.xz
@@ -55,6 +56,7 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ . @@ -55,6 +56,7 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ .
55 56
56 %package -n %{name}-%{_libvrs} 57 %package -n %{name}-%{_libvrs}
57 Summary: TN3270 Access library 58 Summary: TN3270 Access library
  59 +Group: Development/Libraries/C and C++
58 60
59 %description -n %{name}-%{_libvrs} 61 %description -n %{name}-%{_libvrs}
60 TN3270 access library, originally designed as part of the pw3270 application. 62 TN3270 access library, originally designed as part of the pw3270 application.
@@ -64,6 +66,7 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ . @@ -64,6 +66,7 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ .
64 %package devel 66 %package devel
65 Summary: TN3270 Access library development files 67 Summary: TN3270 Access library development files
66 Requires: %{name}-%{_libvrs} = %{version} 68 Requires: %{name}-%{_libvrs} = %{version}
  69 +Group: Development/Libraries/C and C++
67 70
68 %description devel 71 %description devel
69 Header files for the TN3270 access library. 72 Header files for the TN3270 access library.