Skip to content

Commit

Permalink
Merge pull request #26 from ggtakec/master
Browse files Browse the repository at this point in the history
Updated files for release 1.0.69
  • Loading branch information
ggtakec authored Jan 17, 2019
2 parents a5dc320 + 594e307 commit bbc5207
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
k2hash (1.0.69) trusty; urgency=low

* Fixed incorporation of multibyte characters - #25
* Added check using cppcheck - #24
* Reflected the spelling check result for all sources - #23
* Remove dead code - #21

-- Takeshi Nakatani <[email protected]> Thu, 17 Jan 2019 09:15:44 +0900

k2hash (1.0.68) trusty; urgency=low

* Updated common build tool files
Expand Down
6 changes: 3 additions & 3 deletions buildutils/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: @PACKAGE_NAME@
Section: database
Priority: optional
Maintainer: @DEV_NAME@ <@DEV_EMAIL@>
Build-Depends: @DEBHELPER_DEP@, libfullock-dev (>= 1.0.33)
Build-Depends: @DEBHELPER_DEP@, libfullock-dev (>= 1.0.35)
Depends: ${misc:Depends}
Standards-Version: 3.9.8
Homepage: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
Expand All @@ -12,14 +12,14 @@ Vcs-Browser: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
Package: @PACKAGE_NAME@-dev
Section: devel
Architecture: amd64
Depends: ${misc:Depends}, @PACKAGE_NAME@ (= ${binary:Version}), libfullock-dev (>= 1.0.33)
Depends: ${misc:Depends}, @PACKAGE_NAME@ (= ${binary:Version}), libfullock-dev (>= 1.0.35)
Description: @SHORTDESC@ (development)
Development package for building with @PACKAGE_NAME@ shared library.
This package has header files and symbols for it.

Package: @PACKAGE_NAME@
Section: database
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, libfullock (>= 1.0.33)
Depends: ${shlibs:Depends}, ${misc:Depends}, libfullock (>= 1.0.35)
Description: @SHORTDESC@
@DEBLONGDESC@
6 changes: 3 additions & 3 deletions buildutils/k2hash.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ License: @PKGLICENSE@
@RPMPKG_GROUP@
URL: https://@GIT_DOMAIN@/@GIT_ORG@/@PACKAGE_NAME@
Source0: https://@GIT_DOMAIN@/@GIT_ORG@/@PACKAGE_NAME@/archive/%{gittag}/%{name}-%{version}.tar.gz
Requires: libfullock%{?_isa} >= 1.0.33
BuildRequires: git-core gcc-c++ make libtool libfullock-devel%{?_isa} >= 1.0.33
Requires: libfullock%{?_isa} >= 1.0.35
BuildRequires: git-core gcc-c++ make libtool libfullock-devel >= 1.0.35

%description
@LONGDESC@
Expand Down Expand Up @@ -102,7 +102,7 @@ rm -rf %{buildroot}
#
%package devel
Summary: @SHORTDESC@ (development)
Requires: %{name}%{?_isa} = %{version}-%{release}, libfullock-devel%{?_isa} >= 1.0.33
Requires: %{name}%{?_isa} = %{version}-%{release}, libfullock-devel%{?_isa} >= 1.0.35

%description devel
Development package for building with @PACKAGE_NAME@ shared library.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ AC_ARG_ENABLE(check-depend-libs,
esac]
)
AS_IF([test ${check_depend_libs} = 1], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.33], [], [AC_MSG_ERROR(not found libfullock package)])])
AS_IF([test ${check_depend_libs} = 1], [PKG_CHECK_MODULES([fullock], [libfullock >= 1.0.35], [], [AC_MSG_ERROR(not found libfullock package)])])

#
# CFLAGS/CXXFLAGS
Expand Down

0 comments on commit bbc5207

Please sign in to comment.