From d4781f93590b3462543a6237a7ec1a94d3e26f6c Mon Sep 17 00:00:00 2001 From: Max Lv Date: Mon, 17 Nov 2014 14:16:18 +0800 Subject: [PATCH] bump version and fix #157 --- .gitignore | 6 +++--- Makefile.in | 4 ++-- configure | 25 +++++++++++++------------ configure.ac | 2 +- debian/changelog | 6 ++++++ debian/control | 2 ++ 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index c4fce78d..c7a95b15 100644 --- a/.gitignore +++ b/.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 diff --git a/Makefile.in b/Makefile.in index f68c01d3..ca1f4ada 100644 --- a/Makefile.in +++ b/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 diff --git a/configure b/configure index ef4c45ca..6fa8c269 100755 --- a/configure +++ b/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 . # @@ -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\\" diff --git a/configure.ac b/configure.ac index 7c74d87c..0445ddb5 100755 --- a/configure.ac +++ b/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) diff --git a/debian/changelog b/debian/changelog index 7fb7ca27..46c8d032 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +shadowsocks-libev (1.6.0-1) unstable; urgency=low + + * Solve conflicts with other shadowsocks portings. + + -- Max Lv Mon, 17 Nov 2014 14:10:21 +0800 + shadowsocks-libev (1.5.3-2) unstable; urgency=low * rename as shadowsocks-libev. diff --git a/debian/control b/debian/control index 76257d4b..4fe24f30 100644 --- a/debian/control +++ b/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.