Merge pull request #154 from librehat/master

change name to shadowsocks-libev.

Makefile.am

@@ -5,7 +5,7 @@ SUBDIRS = libcork libipset libasyncns libev src
 endif
 
 ACLOCAL_AMFLAGS = -I m4
-man_MANS = shadowsocks.8
+man_MANS = shadowsocks-libev.8
 
 pkgconfiglibdir = $(libdir)/pkgconfig
-pkgconfiglib_DATA = shadowsocks.pc
+pkgconfiglib_DATA = shadowsocks-libev.pc

Makefile.in

@@ -37,7 +37,7 @@ host_triplet = @host@
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/shadowsocks.pc.in $(top_srcdir)/configure COPYING \
+	$(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
@@ -54,7 +54,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = shadowsocks.pc
+CONFIG_CLEAN_FILES = shadowsocks-libev.pc
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -267,9 +267,9 @@ top_srcdir = @top_srcdir@
 @BUILD_WINCOMPAT_FALSE@SUBDIRS = libcork libipset libasyncns libev src
 @BUILD_WINCOMPAT_TRUE@SUBDIRS = libcork libipset libev src
 ACLOCAL_AMFLAGS = -I m4
-man_MANS = shadowsocks.8
+man_MANS = shadowsocks-libev.8
 pkgconfiglibdir = $(libdir)/pkgconfig
-pkgconfiglib_DATA = shadowsocks.pc
+pkgconfiglib_DATA = shadowsocks-libev.pc
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -323,7 +323,7 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-shadowsocks.pc: $(top_builddir)/config.status $(srcdir)/shadowsocks.pc.in
+shadowsocks-libev.pc: $(top_builddir)/config.status $(srcdir)/shadowsocks-libev.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:

configure

@@ -568,10 +568,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='shadowsocks'
-PACKAGE_TARNAME='shadowsocks'
+PACKAGE_NAME='shadowsocks-libev'
+PACKAGE_TARNAME='shadowsocks-libev'
 PACKAGE_VERSION='1.5.3'
-PACKAGE_STRING='shadowsocks 1.5.3'
+PACKAGE_STRING='shadowsocks-libev 1.5.3'
 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 1.5.3 to adapt to many kinds of systems.
+\`configure' configures shadowsocks-libev 1.5.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1355,7 +1355,7 @@ 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]
+  --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 +1377,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shadowsocks 1.5.3:";;
+     short | recursive ) echo "Configuration of shadowsocks-libev 1.5.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1494,7 +1494,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shadowsocks configure 1.5.3
+shadowsocks-libev configure 1.5.3
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2016,7 +2016,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 $as_me 1.5.3, which was
+It was created by shadowsocks-libev $as_me 1.5.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2836,7 +2836,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='shadowsocks'
+ PACKAGE='shadowsocks-libe'
  VERSION='1.5.3'
 
 
@@ -14984,7 +14984,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-ac_config_files="$ac_config_files shadowsocks.pc Makefile libcork/Makefile libipset/Makefile libasyncns/Makefile libev/Makefile src/Makefile"
+ac_config_files="$ac_config_files shadowsocks-libev.pc Makefile libcork/Makefile libipset/Makefile libasyncns/Makefile libev/Makefile src/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15533,7 +15533,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 $as_me 1.5.3, which was
+This file was extended by shadowsocks-libev $as_me 1.5.3, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15599,7 +15599,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 config.status 1.5.3
+shadowsocks-libev config.status 1.5.3
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -16008,7 +16008,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "shadowsocks.pc") CONFIG_FILES="$CONFIG_FILES shadowsocks.pc" ;;
+    "shadowsocks-libev.pc") CONFIG_FILES="$CONFIG_FILES shadowsocks-libev.pc" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "libcork/Makefile") CONFIG_FILES="$CONFIG_FILES libcork/Makefile" ;;
     "libipset/Makefile") CONFIG_FILES="$CONFIG_FILES libipset/Makefile" ;;

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], [1.5.3], [max.c.lv@gmail.com])
+AC_INIT([shadowsocks-libev], [1.5.3], [max.c.lv@gmail.com])
 AC_CONFIG_SRCDIR([src/encrypt.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(auto)
@@ -216,7 +216,7 @@ AC_CHECK_FUNCS([malloc memset socket])
 
 ACX_PTHREAD
 
-AC_CONFIG_FILES([ shadowsocks.pc
+AC_CONFIG_FILES([ shadowsocks-libev.pc
                  Makefile
                  libcork/Makefile
                  libipset/Makefile

debian/README.Debian

@@ -1,4 +1,4 @@
-shadowsocks for Debian
+shadowsocks-libev for Debian
 ----------------------
 
 <possible notes regarding this package - if none, delete this file>

debian/changelog

@@ -1,3 +1,9 @@
+shadowsocks-libev (1.5.3-2) unstable; urgency=low
+
+  * rename as shadowsocks-libev.
+
+ -- Symeon Huang <hzwhuang@gmail.com>  Sat, 15 Nov 2014 14:55:28 +0000
+
 shadowsocks (1.5.3-1) unstable; urgency=low
 
   * Fix log on Win32.

debian/control

@@ -1,4 +1,4 @@
-Source: shadowsocks
+Source: shadowsocks-libev
 Section: net
 Priority: extra
 Maintainer: Max Lv <max.c.lv@gmail.com>
@@ -8,8 +8,9 @@ Homepage: http://www.shadowsocks.org
 Vcs-Git: https://github.com/madeye/shadowsocks-libev.git
 Vcs-Browser: https://github.com/madeye/shadowsocks-libev
 
-Package: shadowsocks
+Package: shadowsocks-libev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: shadowsocks
 Description: A lightweight secured scoks5 proxy. 
     Shadowsocks-libev is a lightweight secured scoks5 proxy for embedded devices and low end boxes.

shadowsocks.pc.in → shadowsocks-libev.pc.in

@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: shadowsocks
+Name: shadowsocks-libev
 Description: a lightweight secured scoks5
 URL: http://shadowsocks.org
 Version: @VERSION@