Skip to content

Commit

Permalink
Merge pull request #21 from ggtakec/master
Browse files Browse the repository at this point in the history
Updated files for release 1.0.67
  • Loading branch information
ggtakec authored Jan 17, 2019
2 parents 36864d5 + 4e69006 commit 65e529d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
chmpx (1.0.67) unstable; urgency=low

* Fixed misspelling, and etc - #20
* Added check using cppcheck - #19
* Reflected the spelling check result for all sources - #18

-- Takeshi Nakatani <[email protected]> Thu, 17 Jan 2019 10:06:43 +0900

chmpx (1.0.66) unstable; urgency=low

* Fixed build warning about comparison of pointer with integer
Expand Down
6 changes: 3 additions & 3 deletions buildutils/chmpx.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,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: k2hash%{?_isa} >= 1.0.68, libfullock%{?_isa} >= 1.0.33
BuildRequires: git-core gcc-c++ make libtool k2hash-devel%{?_isa} >= 1.0.68, libfullock-devel%{?_isa} >= 1.0.33
Requires: k2hash%{?_isa} >= 1.0.69, libfullock%{?_isa} >= 1.0.35
BuildRequires: git-core gcc-c++ make libtool k2hash-devel >= 1.0.69, libfullock-devel >= 1.0.35

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

%description devel
Development package for building with @PACKAGE_NAME@ shared library.
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: net
Priority: optional
Maintainer: @DEV_NAME@ <@DEV_EMAIL@>
Build-Depends: @DEBHELPER_DEP@, k2hash-dev (>= 1.0.68), libfullock-dev (>= 1.0.33), libyaml-dev
Build-Depends: @DEBHELPER_DEP@, k2hash-dev (>= 1.0.69), libfullock-dev (>= 1.0.35), libyaml-dev
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}), k2hash-dev (>= 1.0.68), libfullock-dev (>= 1.0.33), libyaml-dev
Depends: ${misc:Depends}, @PACKAGE_NAME@ (= ${binary:Version}), k2hash-dev (>= 1.0.69), libfullock-dev (>= 1.0.35), libyaml-dev
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: net
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, k2hash (>= 1.0.68), libfullock (>= 1.0.33)
Depends: ${shlibs:Depends}, ${misc:Depends}, k2hash (>= 1.0.69), libfullock (>= 1.0.35)
Description: @SHORTDESC@
@DEBLONGDESC@
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ 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([k2hash], [libk2hash >= 1.0.68], [], [AC_MSG_ERROR(not found k2hash package)])])
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([k2hash], [libk2hash >= 1.0.69], [], [AC_MSG_ERROR(not found k2hash 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 65e529d

Please sign in to comment.