Browse Source

bump version and fix #157

pull/158/head
Max Lv 10 years ago
parent
commit
d4781f9359
6 changed files with 27 additions and 18 deletions
  1. 6
      .gitignore
  2. 4
      Makefile.in
  3. 25
      configure
  4. 2
      configure.ac
  5. 6
      debian/changelog
  6. 2
      debian/control

6
.gitignore

@ -16,13 +16,13 @@ ss*
stamp-h1
.libs
.pc
debian/shadowsocks/
debian/shadowsocks-libev/
debian/patches/
debian/files
debian/shadowsocks.substvars
debian/shadowsocks-libev.substvars
debian/*.debhelper*
.dirstamp
shadowsocks.pc
shadowsocks-libev.pc
# Ignore garbage of OS X
*.DS_Store

4
Makefile.in

@ -37,8 +37,8 @@ host_triplet = @host@
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/shadowsocks-libev.pc.in $(top_srcdir)/configure COPYING \
INSTALL auto/ar-lib auto/compile auto/config.guess \
$(srcdir)/shadowsocks-libev.pc.in $(top_srcdir)/configure \
COPYING INSTALL auto/ar-lib auto/compile auto/config.guess \
auto/config.sub auto/depcomp auto/install-sh auto/ltmain.sh \
auto/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

25
configure

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for shadowsocks 1.5.3.
# Generated by GNU Autoconf 2.68 for shadowsocks-libev 1.6.0.
#
# Report bugs to <max.c.lv@gmail.com>.
#
@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='shadowsocks-libev'
PACKAGE_TARNAME='shadowsocks-libev'
PACKAGE_VERSION='1.5.3'
PACKAGE_STRING='shadowsocks-libev 1.5.3'
PACKAGE_VERSION='1.6.0'
PACKAGE_STRING='shadowsocks-libev 1.6.0'
PACKAGE_BUGREPORT='max.c.lv@gmail.com'
PACKAGE_URL=''
@ -1307,7 +1307,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures shadowsocks-libev 1.5.3 to adapt to many kinds of systems.
\`configure' configures shadowsocks-libev 1.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1355,7 +1355,8 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/shadowsocks-libev]
--docdir=DIR documentation root
[DATAROOTDIR/doc/shadowsocks-libev]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@ -1377,7 +1378,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of shadowsocks-libev 1.5.3:";;
short | recursive ) echo "Configuration of shadowsocks-libev 1.6.0:";;
esac
cat <<\_ACEOF
@ -1494,7 +1495,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
shadowsocks-libev configure 1.5.3
shadowsocks-libev configure 1.6.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@ -2016,7 +2017,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by shadowsocks-libev $as_me 1.5.3, which was
It was created by shadowsocks-libev $as_me 1.6.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@ -2836,8 +2837,8 @@ fi
# Define the identity of the package.
PACKAGE='shadowsocks-libe'
VERSION='1.5.3'
PACKAGE='shadowsocks-libev'
VERSION='1.6.0'
cat >>confdefs.h <<_ACEOF
@ -15533,7 +15534,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by shadowsocks-libev $as_me 1.5.3, which was
This file was extended by shadowsocks-libev $as_me 1.6.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -15599,7 +15600,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
shadowsocks-libev config.status 1.5.3
shadowsocks-libev config.status 1.6.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"

2
configure.ac

@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.67])
AC_INIT([shadowsocks-libev], [1.5.3], [max.c.lv@gmail.com])
AC_INIT([shadowsocks-libev], [1.6.0], [max.c.lv@gmail.com])
AC_CONFIG_SRCDIR([src/encrypt.c])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(auto)

6
debian/changelog

@ -1,3 +1,9 @@
shadowsocks-libev (1.6.0-1) unstable; urgency=low
* Solve conflicts with other shadowsocks portings.
-- Max Lv <max.c.lv@gmail.com> Mon, 17 Nov 2014 14:10:21 +0800
shadowsocks-libev (1.5.3-2) unstable; urgency=low
* rename as shadowsocks-libev.

2
debian/control

@ -9,6 +9,8 @@ Vcs-Git: https://github.com/madeye/shadowsocks-libev.git
Vcs-Browser: https://github.com/madeye/shadowsocks-libev
Package: shadowsocks-libev
Replaces: shadowsocks (<< 1.5.3-2)
Breaks: shadowsocks (<< 1.5.3-2)
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A lightweight secured scoks5 proxy.

Loading…
Cancel
Save