Skip to content

Commit

Permalink
Merge pull request #8 from ggtakec/master
Browse files Browse the repository at this point in the history
Updated files for release 1.0.26
  • Loading branch information
ggtakec authored Dec 6, 2018
2 parents 8ce1572 + 0e620ae commit b08d53f
Show file tree
Hide file tree
Showing 17 changed files with 832 additions and 180 deletions.
88 changes: 53 additions & 35 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#
# FULLOCK - Fast User Level LOCK library by Yahoo! JAPAN
# k2htpdtor for K2HASH TRANSACTION PLUGIN.
#
# Copyright 2015 Yahoo! JAPAN corporation.
# Copyright 2015 Yahoo Japan Corporation.
#
# FULLOCK is fast locking library on user level by Yahoo! JAPAN.
# FULLOCK is following specifications.
# K2HASH TRANSACTION PLUGIN is programable I/F for processing
# transaction data from modifying K2HASH data.
#
# For the full copyright and license information, please view
# the LICENSE file that was distributed with this source code.
# the license file that was distributed with this source code.
#
# AUTHOR: Takeshi Nakatani
# CREATE: Wed 7 Dec 2016
# CREATE: Mon Mar 9 2015
# REVISION:
#

Expand All @@ -20,41 +20,59 @@ sudo: required

dist: trusty

env:
global:
- PCUSER=antpickax
- PCREPO=current
- PCDLREPO=stable
matrix:
- OS=centos
TAG=centos7
DISTTAG=el/7
INSTPKG="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems libyaml-devel chmpx-devel nss-devel"
- OS=centos
TAG=centos6
DISTTAG=el/6
INSTPKG="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems libyaml-devel chmpx-devel nss-devel"
- OS=fedora
TAG=28
DISTTAG=fedora/28
INSTPKG="git autoconf automake gcc gcc-c++ gdb make libtool pkgconfig redhat-rpm-config rpm-build ruby-devel rubygems libyaml-devel chmpx-devel nss-devel"
- OS=ubuntu
TAG=18.04
DISTTAG=ubuntu/bionic
INSTPKG="git autoconf autotools-dev gcc g++ make gdb dh-make fakeroot dpkg-dev devscripts libtool pkg-config ruby-dev rubygems rubygems-integration libyaml-dev chmpx-dev gnutls-dev"
- OS=debian
TAG=stretch
DISTTAG=debian/stretch
INSTPKG="git autoconf autotools-dev gcc g++ make gdb dh-make fakeroot dpkg-dev devscripts libtool pkg-config ruby-dev rubygems rubygems-integration libyaml-dev chmpx-dev gnutls-dev"

cache: apt

git:
submodules: false
services:
- docker

before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq git autoconf autotools-dev gcc g++ make gdb dh-make fakeroot dpkg-dev devscripts libtool pkg-config libssl-dev libyaml-dev
- git clone https://github.com/yahoojapan/fullock.git
- cd fullock
- ./autogen.sh
- ./configure --prefix=/usr
- make
- sudo make install
- cd ..
- git clone https://github.com/yahoojapan/k2hash.git
- cd k2hash
- ./autogen.sh
- ./configure --prefix=/usr
- make
- sudo make install
- cd ..
- git clone https://github.com/yahoojapan/chmpx.git
- cd chmpx
- ./autogen.sh
- ./configure --prefix=/usr
- make
- sudo make install
- cd ..
- sudo apt-get update -qq
- echo 'DOCKER_OPTS="-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock -s devicemapper"' | sudo tee /etc/default/docker > /dev/null
- sudo service docker restart
- sleep 5
- sudo docker image pull ${OS}:${TAG}

script:
- ./autogen.sh
- ./configure --prefix=/usr
- make
- "cd tests && make check-TESTS"
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export PCTOKEN=dummy_token_for_pr; else export PCTOKEN=${PACKAGECLOUD_TOKEN}; fi'
- sudo docker container run
--rm=true
-e TRAVIS_TAG=${TRAVIS_TAG}
-e FORCE_BUILD_PKG=${FORCE_BUILD_PKG}
-e USE_PC_REPO=${USE_PC_REPO}
-e BUILD_NUMBER=${BUILD_NUMBER}
-e DEBFULLNAME=${DEBFULLNAME}
-e DEBEMAIL=${DEBEMAIL}
-e CONFIGREOPT=${CONFIGREOPT}
-e K2HATTR_ENC_TYPE=${K2HATTR_ENC_TYPE}
-v `pwd`:/k2htp_dtor:rw ${OS}:${TAG}
/bin/sh -c "/k2htp_dtor/buildutils/travis_builder.sh -${OS} -pctoken ${PCTOKEN} -pcuser ${PCUSER} -pcrepo ${PCREPO} -pcdlrepo ${PCDLREPO} -pcdist ${DISTTAG} ${INSTPKG}"

#
# VIM modelines
Expand Down
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
k2htpdtor (1.0.26) trusty; urgency=low

* Changed to strict packaging and changed documents

-- Takeshi Nakatani <[email protected]> Thu, 06 Dec 2018 15:36:40 +0900

k2htpdtor (1.0.25) trusty; urgency=low

* Fixed destructing code for corresponding to SIOF, etc
Expand Down
9 changes: 4 additions & 5 deletions README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
k2htp_dtor
-------------
-----------

k2htpdtor is for K2HASH TRANSACTION PLUGIN.

Expand All @@ -10,12 +10,11 @@ This k2htp_dtor project is the base templates for building K2HASH
TRANSACTION PLUGIN.

### Documents
- https://github.com/yahoojapan/k2htp_dtor/wiki
- Github Pages - https://k2htpdtor.antpick.ax/
- Github Wiki - https://github.com/yahoojapan/k2htp_dtor/wiki
- AntPickax - https://antpick.ax/

### License
This software is released under the MIT License, see the license file.

### AntPickax
k2htpdtor is one of [AntPickax](https://yahoojapan.github.io/AntPickax/) products.

Copyright(C) 2015 Yahoo Japan Corporation.
16 changes: 14 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
k2htp_dtor
-------------
----------
[![Build Status](https://travis-ci.org/yahoojapan/k2htp_dtor.svg?branch=master)](https://travis-ci.org/yahoojapan/k2htp_dtor)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/yahoojapan/k2htp_dtor/master/COPYING)
[![GitHub forks](https://img.shields.io/github/forks/yahoojapan/k2htp_dtor.svg)](https://github.com/yahoojapan/k2htp_dtor/network)
[![GitHub stars](https://img.shields.io/github/stars/yahoojapan/k2htp_dtor.svg)](https://github.com/yahoojapan/k2htp_dtor/stargazers)
[![GitHub issues](https://img.shields.io/github/issues/yahoojapan/k2htp_dtor.svg)](https://github.com/yahoojapan/k2htp_dtor/issues)
[![debian packages](https://img.shields.io/badge/deb-packagecloud.io-844fec.svg)](https://packagecloud.io/antpickax/stable)
[![RPM packages](https://img.shields.io/badge/rpm-packagecloud.io-844fec.svg)](https://packagecloud.io/antpickax/stable)

k2htpdtor is for K2HASH TRANSACTION PLUGIN.

Expand All @@ -11,7 +17,13 @@ This k2htp_dtor project is the base templates for building K2HASH
TRANSACTION PLUGIN.

### Documents
- https://github.com/yahoojapan/k2htp_dtor/wiki
- [Document top page](https://k2htpdtor.antpick.ax/)
- [Github wiki page](https://github.com/yahoojapan/k2htp_dtor/wiki)
- [About AntPickax](https://antpick.ax/)

### Packages
- [RPM packages(packagecloud.io)](https://packagecloud.io/antpickax/stable)
- [Debian packages(packagecloud.io)](https://packagecloud.io/antpickax/stable)

### License
This software is released under the MIT License, see the license file.
Expand Down
9 changes: 5 additions & 4 deletions buildutils/control.in
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
Source: @PACKAGE_NAME@
Section: libs
Priority: extra
Priority: optional
Maintainer: @DEV_NAME@ <@DEV_EMAIL@>
Build-Depends: debhelper (>= 9), autotools-dev, k2hash-dev (>= 1.0.63), libfullock-dev (>= 1.0.30), chmpx-dev (>= 1.0.63)
Standards-Version: 3.9.5
Build-Depends: @DEBHELPER_DEP@, k2hash-dev (>= 1.0.67), libfullock-dev (>= 1.0.32), chmpx-dev (>= 1.0.64)
Depends: ${misc:Depends}
Standards-Version: 3.9.8
Homepage: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@
Vcs-Git: git://@GIT_DOMAIN@/@GIT_ORG@/@[email protected]
Vcs-Browser: https://@GIT_DOMAIN@/@GIT_ORG@/@GIT_REPO@

Package: @PACKAGE_NAME@
Section: libs
Architecture: amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, ${misc:Pre-Depends}, k2hash (>= 1.0.63), libfullock (>= 1.0.30), chmpx (>= 1.0.63)
Depends: ${shlibs:Depends}, ${misc:Depends}, k2hash (>= 1.0.67), libfullock (>= 1.0.32), chmpx (>= 1.0.64)
Description: @SHORTDESC@
@DEBLONGDESC@
92 changes: 69 additions & 23 deletions buildutils/debian_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,28 @@
func_usage()
{
echo ""
echo "Usage: $1 [-buildnum <build number>] [-nodebuild] [-rootdir] [-product <product name>] [-y] [additional debuild options]"
echo "Usage: $1 [-buildnum <build number>] [-nodebuild] [-rootdir] [-product <product name>] [-class <class name>] [-y] [additional debuild options]"
echo " -buildnum specify build number for packaging(default 1)"
echo " -nodebuild stops before do debuild command."
echo " -rootdir layout \"debian\" directory for packaging under source top directory"
echo " -product specify product name(use PACKAGE_NAME in Makefile s default)"
echo " -class specify package class name(optional)"
echo " -y runs no interacitive mode."
echo " additional debuild options this script run debuild with \"-uc -us\", can specify additional options."
echo " -h print help"
echo ""
}

func_get_default_class()
{
dh_make -h 2>/dev/null | grep '\--multi' >/dev/null 2>&1
if [ $? -eq 0 ]; then
echo "multi"
else
echo "library"
fi
}

PRGNAME=`basename $0`
MYSCRIPTDIR=`dirname $0`
MYSCRIPTDIR=`cd ${MYSCRIPTDIR}; pwd`
Expand All @@ -53,6 +65,7 @@ IS_ROOTDIR=0
DH_MAKE_AUTORUN_OPTION=""
BUILD_NUMBER=1
DEBUILD_OPT=""
PKGCLASSNAME=`func_get_default_class`
while [ $# -ne 0 ]; do
if [ "X$1" = "X" ]; then
break
Expand Down Expand Up @@ -84,6 +97,14 @@ while [ $# -ne 0 ]; do
fi
PACKAGE_NAME=$1

elif [ "X$1" = "X-class" ]; then
shift
if [ $# -eq 0 ]; then
echo "ERROR: -class option needs parameter." 1>&2
exit 1
fi
PKGCLASSNAME=$1

elif [ "X$1" = "X-y" ]; then
IS_INTERACTIVE=0
DH_MAKE_AUTORUN_OPTION="-y"
Expand Down Expand Up @@ -137,8 +158,8 @@ fi
#
# Make dist package by make dist
#
${SRCTOP}/autogen.sh || exit 1
${SRCTOP}/configure || exit 1
${SRCTOP}/autogen.sh || exit 1
${SRCTOP}/configure ${CONFIGREOPT} || exit 1
PACKAGE_VERSION=`${MYSCRIPTDIR}/make_variables.sh -pkg_version`
PACKAGE_MAJOR_VER=`${MYSCRIPTDIR}/make_variables.sh -major_number`

Expand Down Expand Up @@ -177,39 +198,49 @@ cd ${EXPANDDIR} || exit 1
#
# initialize debian directory
#
dh_make -f ${BUILDDEBDIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz --createorig -m ${DH_MAKE_AUTORUN_OPTION} || exit 1
dh_make -f ${BUILDDEBDIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}.tar.gz --createorig --${PKGCLASSNAME} ${DH_MAKE_AUTORUN_OPTION} || exit 1

#
# remove unnecessary template files
#
rm -rf ${EXPANDDIR}/debian/*.ex ${EXPANDDIR}/debian/*.EX ${EXPANDDIR}/debian/${PACKAGE_NAME}-doc.* ${EXPANDDIR}/debian/README.* ${EXPANDDIR}/debian/docs
rm -rf ${EXPANDDIR}/debian/*.ex ${EXPANDDIR}/debian/*.EX ${EXPANDDIR}/debian/${PACKAGE_NAME}-doc.* ${EXPANDDIR}/debian/README.* ${EXPANDDIR}/debian/docs ${EXPANDDIR}/debian/*.install

#
# adding some lines into rules file
#
echo "" >> ${EXPANDDIR}/debian/rules || exit 1
echo "# for ${PACKAGE_NAME} and ${PACKAGE_DEV_NAME} packages" >> ${EXPANDDIR}/debian/rules || exit 1
echo "override_dh_auto_install:" >> ${EXPANDDIR}/debian/rules || exit 1
echo " dh_auto_install --destdir=debian/${PACKAGE_NAME}" >> ${EXPANDDIR}/debian/rules || exit 1
echo " dh_auto_install --destdir=debian/${PACKAGE_DEV_NAME}" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_NAME}/usr/include ]; then rm -rf debian/${PACKAGE_NAME}/usr/include; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/pkgconfig ]; then rm -rf debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/pkgconfig; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_DEV_NAME}/usr/bin ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/bin; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_DEV_NAME}/usr/share/man ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/share/man; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.a ]; >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.a; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.la ]; >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.la; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.a >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.a; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.la >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.la; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.so* >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.so*; fi" >> ${EXPANDDIR}/debian/rules || exit 1
mv ${EXPANDDIR}/debian/rules ${EXPANDDIR}/debian/rules.base
head -1 ${EXPANDDIR}/debian/rules.base > ${EXPANDDIR}/debian/rules || exit 1
sed '/^#/d' ${EXPANDDIR}/debian/rules.base | sed '/^$/{N; /^\n$/D;}' >> ${EXPANDDIR}/debian/rules || exit 1
echo "" >> ${EXPANDDIR}/debian/rules || exit 1
echo "# for ${PACKAGE_NAME} and ${PACKAGE_DEV_NAME} packages" >> ${EXPANDDIR}/debian/rules || exit 1
echo "override_dh_auto_install:" >> ${EXPANDDIR}/debian/rules || exit 1
echo " dh_auto_install --destdir=debian/${PACKAGE_NAME}" >> ${EXPANDDIR}/debian/rules || exit 1
echo " dh_auto_install --destdir=debian/${PACKAGE_DEV_NAME}" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_NAME}/usr/include ]; then rm -rf debian/${PACKAGE_NAME}/usr/include; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/pkgconfig ]; then rm -rf debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/pkgconfig; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_DEV_NAME}/usr/bin ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/bin; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " if [ -d debian/${PACKAGE_DEV_NAME}/usr/share/man ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/share/man; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.a >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.a; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.la >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.la; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.so >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_NAME}/usr/lib/x86_64-linux-gnu/*.so; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.a >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.a; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.la >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.la; fi" >> ${EXPANDDIR}/debian/rules || exit 1
echo " ls debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.so.* >/dev/null 2>&1; if [ $? -eq 0 ]; then rm -rf debian/${PACKAGE_DEV_NAME}/usr/lib/x86_64-linux-gnu/*.so.*;fi" >> ${EXPANDDIR}/debian/rules || exit 1

if [ "X${CONFIGREOPT}" != "X" ]; then
echo "" >> ${EXPANDDIR}/debian/rules || exit 1
echo "override_dh_auto_configure:" >> ${EXPANDDIR}/debian/rules || exit 1
echo " dh_auto_configure -- ${CONFIGREOPT}" >> ${EXPANDDIR}/debian/rules || exit 1
fi

#
# create links file for library
#
FOUND_LIB_LINES=`find ./ -name Makefile.am -exec grep ${LIB_BASENAME} {} \; 2>/dev/null`
if [ "X${FOUND_LIB_LINES}" != "X" ]; then
LIBRARY_LIBTOOL_VERSION=`${MYSCRIPTDIR}/make_variables.sh -lib_version_for_link 2>/dev/null` || exit 1
echo "usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so.${LIBRARY_LIBTOOL_VERSION} usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so" > ${EXPANDDIR}/debian/${PACKAGE_NAME}.links || exit 1
echo "usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so.${LIBRARY_LIBTOOL_VERSION} usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so.${PACKAGE_MAJOR_VER}" >> ${EXPANDDIR}/debian/${PACKAGE_NAME}.links || exit 1
echo "usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so.${LIBRARY_LIBTOOL_VERSION} usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so" >> ${EXPANDDIR}/debian/${PACKAGE_DEV_NAME}.links || exit 1
echo "usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so.${LIBRARY_LIBTOOL_VERSION} usr/lib/x86_64-linux-gnu/${LIB_BASENAME}.so.${PACKAGE_MAJOR_VER}" >> ${EXPANDDIR}/debian/${PACKAGE_NAME}.links || exit 1
fi

#
Expand All @@ -225,12 +256,27 @@ cp ${MYSCRIPTDIR}/control ${EXPANDDIR}/debian/control || exit 1
#
# copy changelog with converting build number
#
IS_OS_UBUNTU=0
if [ -f /etc/lsb-release ]; then
grep [Uu]buntu /etc/lsb-release >/dev/null 2>&1
if [ $? -eq 0 ]; then
IS_OS_UBUNTU=1
fi
fi
CHLOG_ORG_MENT=`cat ChangeLog | grep "^ --" | head -1`
CHLOG_NEW_MENT=`cat ${EXPANDDIR}/debian/changelog | grep "^ --" | head -1`
if [ "X${BUILD_NUMBER}" = "X" ]; then
cat ChangeLog | sed "s/${CHLOG_ORG_MENT}/${CHLOG_NEW_MENT}/g" > ${EXPANDDIR}/debian/changelog || exit 1
if [ ${IS_OS_UBUNTU} -eq 1 ]; then
cat ChangeLog | sed "s/${CHLOG_ORG_MENT}/${CHLOG_NEW_MENT}/g" > ${EXPANDDIR}/debian/changelog || exit 1
else
cat ChangeLog | sed "s/${CHLOG_ORG_MENT}/${CHLOG_NEW_MENT}/g" | sed 's/ trusty;/ unstable;/g' > ${EXPANDDIR}/debian/changelog || exit 1
fi
else
cat ChangeLog | sed "s/${PACKAGE_VERSION}/${PACKAGE_VERSION}-${BUILD_NUMBER}/g" | sed "s/${CHLOG_ORG_MENT}/${CHLOG_NEW_MENT}/g" > ${EXPANDDIR}/debian/changelog || exit 1
if [ ${IS_OS_UBUNTU} -eq 1 ]; then
cat ChangeLog | sed "s/${PACKAGE_VERSION}/${PACKAGE_VERSION}-${BUILD_NUMBER}/g" | sed "s/${CHLOG_ORG_MENT}/${CHLOG_NEW_MENT}/g" > ${EXPANDDIR}/debian/changelog || exit 1
else
cat ChangeLog | sed "s/${PACKAGE_VERSION}/${PACKAGE_VERSION}-${BUILD_NUMBER}/g" | sed "s/${CHLOG_ORG_MENT}/${CHLOG_NEW_MENT}/g" | sed 's/ trusty;/ unstable;/g' > ${EXPANDDIR}/debian/changelog || exit 1
fi
fi

#
Expand Down
Loading

0 comments on commit b08d53f

Please sign in to comment.