diff --git a/.gitignore b/.gitignore index 5b033ca6267d9b62e4564c0558c9e80325e08b2e..9bc9b148178fbfd64027a6bd293032c1eacd3d4d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ config.guess config.* depcomp install-sh -INSTALL missing stamp-h1 ltmain.sh diff --git a/AUTHORS b/AUTHORS index ba49877300c52895aee036fee2e96c75fec83416..e57ef475a1329aaef72989941d7a1be71872de44 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,20 +1,23 @@ Current authors --------------- -Guillaume Roguez - Adrien Béraud - -Emmanuel Lepage - Alexandre Lision - +Guillaume Roguez +Edric Milaret +Eloi BAIL +Emmanuel Lepage Stepan Salenikovich Former authors -------------- +Philippe Groarke + - audio fixes + - windows port startup + Tristan Matthews + - Many portions of code Emmanuel Milou - ALSA implementation ( replaces portaudio ) @@ -38,22 +41,22 @@ Guillaume Carmel-Archambault - Change sip library to pjsip - - Support multiple accounts registration - - Add chinese translation - - Many portions of test and debugging + - Support multiple accounts registration + - Add chinese translation + - Many portions of test and debugging Polytechnic School of Montreal: - - Jean-Francois Blanchard-Dionne - - Ala Eddine Limame - - Alexis S. Bourrelle - - Marilyne Mercier - - Jean Tessier + - Jean-Francois Blanchard-Dionne + - Ala Eddine Limame + - Alexis S. Bourrelle + - Marilyne Mercier + - Jean Tessier - Video layer implementation - Video conference Pierre-Luc Beaudoin - - Many portions of code - - GTK client implementation + - Many portions of code + - GTK client implementation Yan Morin - zeroconf integration diff --git a/CODING b/CODING index 1ac0af8923237457abe3167ebfc03067a55edc63..696968e5de84a9019924a6b233813bb65a6c3a14 100644 --- a/CODING +++ b/CODING @@ -1,13 +1,12 @@ = Coding standards = Please follow our coding standards when developing -http://projects.savoirfairelinux.net/wiki/sflphone/Coding_Standards - +http://projects.savoirfairelinux.com/projects/ring-daemon/wiki/Daemon_Coding_Rules = Gerrit workflow = We are now using Gerrit as a code review tool. -Wiki documentation: https://projects.savoirfairelinux.com/projects/ring/wiki/WorkingWithGerrit +Wiki documentation: http://projects.savoirfairelinux.com/projects/ring/wiki/WorkingWithGerrit == commit messages == @@ -16,7 +15,7 @@ Use Issue: followed by the ticket number == commit-msg hook == You may want to install the commit-msg hook that inserts a Change-Id on commit messages: -$ gitdir=$(git rev-parse --git-dir); scp -p -P 29420 username@gerrit-sflphone.savoirfairelinux.com:hooks/commit-msg ${gitdir}/hooks/ +$ gitdir=$(git rev-parse --git-dir); scp -p -P 29420 username@gerrit-ring.savoirfairelinux.com:hooks/commit-msg ${gitdir}/hooks/ Other documentation source: diff --git a/ChangeLog b/ChangeLog index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..642e3492c5f75c1c0648f9258a693f779c35bf2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,4 @@ +2.0.0 (2015-03-31) +------------------ + +First DRing release (formely SFLPhone - released as 1.4.1) diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000000000000000000000000000000000000..007e9396d0a2492cd2d6e17d42f359655dfe0b5e --- /dev/null +++ b/INSTALL @@ -0,0 +1,370 @@ +Installation Instructions +************************* + +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: + + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. diff --git a/Makefile.am b/Makefile.am index ceac6d1d950143d06648b40eb425aa2bac203dfb..939db31e1d55e167a55d70579608444b376f082a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,13 +37,13 @@ EXTRA_DIST = m4/libtool.m4 \ contrib/src coverage: - $(AM_V_at)lcov --directory $(top_builddir) --capture --output-file sflphone-coverage.info + $(AM_V_at)lcov --directory $(top_builddir) --capture --output-file dring-coverage.info $(MKDIR_P) html-output - genhtml -o html-output sflphone-coverage.info + genhtml -o html-output dring-coverage.info coverage-clean: $(AM_V_at)lcov --directory $(top_builddir) --zerocounters - $(AM_V_at)rm -rf sflphone-coverage.info + $(AM_V_at)rm -rf dring-coverage.info $(AM_V_at)rm -rf html-output $(AM_V_at)find -name '*.gcda' -exec rm -f {} + $(AM_V_at)find -name '*.gcno' -exec rm -f {} + diff --git a/NEWS b/NEWS index 4246258de44ff2fe0f7840ff7322c04360699497..f761319d22ef461aad85c176359550712e279f42 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +DRing (2.0.0) / 2015-03-31 + * Project renaming + * First release under this name + * Ring account (DHT) introduced + * Complete SIP/SDP protocol handling re-write + * Encrypted communication through TLS/SRTP + * NAT-traversal: ICE, UPnP + * UI are separate repository + * And a lot more... + SFLphoned (1.0.2) / 2012-07-02 * Stable version * Update Contact header from 200 OK diff --git a/README b/README index 0c9ad69fe3fe13c1fb5acc3c4586457bed27d3f6..067c976d4e56c0b15e1808327fbfa7fb9b1d0484 100644 --- a/README +++ b/README @@ -34,27 +34,31 @@ Ring is a Voice-over-IP software phone. We want it to be: - user friendly (fast, sleek, easy to learn interface) - professional grade (transfers, holds, optimal audio quality) - fully compatible with Asterisk (SIP and IAX protocols) +- de-centralized call (P2P-DHT) - customizable As the SIP/audio daemon and the user interface are separate processes, -it is easy to provide different user interfaces. SFLPhone comes with -a GTK graphical user interface and even scripts to control the daemon from +it is easy to provide different user interfaces. Ring comes with +various graphical user interfaces and even scripts to control the daemon from the shell. -SFLPhone is currently used by the support team of Savoir-Faire Linux Inc. +Ring is currently used by the support team of Savoir-Faire Linux Inc. More information is available on the project homepage: - http://www.sflphone.org/ + http://www.ring.cx/ + +This source tree contains the daemon application only, DRing, that handles +the business logic of Ring. UI are located in differents repositories. +Check our client subprojects here: +https://projects.savoirfairelinux.com/projects/ring Short description of content of source tree ------------------------------------------- -- src/ is the core of SFLphone. It contains main.cpp, the entry point and - managerimpl.cpp. - The ManagerImpl class is the intermediary between all the layers of the daemon. -- src/client/dbus, the D-Bus xml interfaces, and c++ bindings -- src/client/android, the JNI interfaces (Java bindings) +- src/ is the core of DRing. +- bin/ contains applications main code. +- bin/dbus, the D-Bus xml interfaces, and c++ bindings About Savoir-Faire Linux @@ -64,25 +68,21 @@ Savoir-Faire Linux is a consulting company based in Montreal, Quebec. For more information, please check out our website: http://www.savoirfairelinux.com/ + How to compile on Linux ----------------------- -# Compile the dependencies +1) Compile the dependencies first + cd ../contrib/ mkdir native cd native ../bootstrap make -# Then the daemon -cd ../../daemon -./autogen.sh -./configure -make -make install +2) Then the dring application -# And the GNOME client -cd ring-client-gnome +cd ../../ ./autogen.sh ./configure make @@ -93,17 +93,19 @@ Done ! More details available here: https://projects.savoirfairelinux.com/projects/ring/wiki/How_to_build + How to compile on OSX --------------------- + # These first steps are only necessary if you don't use a package manager. -cd daemon/extras/tools +cd extras/tools ./bootstrap make export PATH=$PATH:/location/of/ring/daemon/extras/tools/build/bin # Or, use your favorite package manager to install the necessary tools (macports or brew). -automake libtool check gettext libtoolize ... +automake libtool check gettext libtoolize yasm ... # Compile the dependencies cd contrib @@ -113,7 +115,7 @@ cd native make -j # Then the daemon -cd ../../daemon +cd ../../ ./autogen.sh ./configure --without-alsa --without-pulse --without-dbus --disable-video make @@ -123,51 +125,19 @@ add to ./configure: --prefix= Do a little dance! + Common Issues ------------- +------------- -autopoint not found: When using Homebrew, autopoint is not find even when +autopoint not found: When using Homebrew, autopoint is not found even when gettext is installed, because symlinks are not created. Run: 'brew link --force gettext' to fix it. -How to cross-compile for Windows 64bit (from Linux) ---------------------------------------------------- - -# First, make sure you can compile the linux version. -# Install a few tools. -sudo apt-get install mingw-w64 cmake build-essential g++ automake autoconf -gnu-standards autoconf-doc libtool gettext autoconf-archive pkg-config - -# On certain distributions, mingw-w64 doesn't select POSIX threads by default. -You need to use the POSIX version. To do so, run the following commands and -select POSIX threads. -sudo update-alternatives --config x86_64-w64-mingw32-gcc -sudo update-alternatives --config x86_64-w64-mingw32-g++ - -# Compile the dependencies -cd ring/daemon/contrib/ -mkdir win64 && cd win64 -../bootstrap --host=x86_64-w64-mingw32 -make -# make -j seems to have problems!? - -Cross fingers and pray to the great cross-compiler in the sky! -... -Profit! - -# Compile the daemon -./autogen.sh -./configure --host=x86_64-w64-mingw32 - --without-alsa - --without-pulse - --without-dbus - --disable-video -make Clang compatibility (developers only) ------------------------------------- -It is possible to compile sflphone with Clang by setting CC and CXX variables +It is possible to compile dring with Clang by setting CC and CXX variables to 'clang' and 'clang++' respectively when calling ./configure. Currently it is not possible to use the DBus interface mechanism, and the @@ -175,29 +145,30 @@ interaction between daemon and client will not work; for each platform where dbus is not available the client should implement all the methods in the *_stub.cpp files. -SIP/IAx2 accounts + +SIP accounts --------------------- -You may register an existing SIP/IAX2 account through the account wizard in both +You may register an existing SIP account through the account wizard in both clients (KDE and GNOME). By doing this, you will be able to call other accounts known to this server. -Contributing to SFLPhone +Contributing to Ring ------------------------ Of course we love patches. And contributions. And spring rolls. -Development website: http://projects.savoirfairelinux.net/wiki/sflphone +Development website: http://projects.savoirfairelinux.com/projects/ring/wiki Do not hesitate to join us and post comments, suggestions, questions -and general feedback on the SFLphone mailing-list: -http://lists.savoirfairelinux.net/mailman/listinfo/sflphone +and general feedback on the Ring mailing-list: +http://lists.savoirfairelinux.net/mailman/listinfo/ring Bug reports: -https://projects.savoirfairelinux.com/projects/ring/wiki/BugReports +http://projects.savoirfairelinux.com/projects/ring/wiki/BugReports IRC (on #freenode): #sflphone - -- The SFLPhone Team + -- The Ring Team diff --git a/TODO b/TODO deleted file mode 100644 index ea479bc2c549c5d91e0f96c9fb6ab6101f568c3e..0000000000000000000000000000000000000000 --- a/TODO +++ /dev/null @@ -1,8 +0,0 @@ -For project core: ----------------- -Management Config like about:config in Mozilla -Management of exceptions -Remove all warnings in compilation - -Improvement of STUN (done?) -Better handling for an reINVITE request. (done?) diff --git a/astylerc b/astylerc index d38cbbf0f6ed52b6e978ad7e191d9ca8f4102945..86203e5287f7490d487e135b73e9703de3f6e6e3 100644 --- a/astylerc +++ b/astylerc @@ -1,9 +1,9 @@ -# Filename: sflphone-common/astylerc +# Filename: astylerc # Purpose: config file for astyle -# http://astyle.sourceforge.net/astyle.html +# http://astyle.sourceforge.net/astyle.html # Author: Emmanuel Milou -# Savoir-faire Linux Inc -# http://www.sflphone.org +# Savoir-faire Linux Inc +# http://www.ring.cx style=stroustrup # stroustrup style http://astyle.sourceforge.net/astyle.html#_style=stroustrup indent=spaces=4 # Use spaces instead of tabs for indentation diff --git a/autogen.sh b/autogen.sh index 6980c6c34d9c42abfb0dcf4f962b2642e80f2425..b0d90830879d162a0c1ac7eac83490ca034dee1f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -24,7 +24,7 @@ fi # Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663 mkdir -p m4 -HOOKS_DIR="../.git/hooks" +HOOKS_DIR=".git/hooks" # install pre-commit hook for doing clean commits if [ -d "$HOOKS_DIR" ]; then diff --git a/configure.ac b/configure.ac index caa071e431f426c855b64e0c65ba873407b6d571..fb75c5fab0df58bb49d83d260ce1530e79c8a89c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,9 @@ dnl Ring - configure.ac for automake 1.9 and autoconf 2.59 dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.65]) -AC_INIT([Ring],[2.0.0],[sflphoneteam@savoirfairelinux.com],[ring]) +AC_INIT([Ring],[2.0.0],[ring@lists.savoirfairelinux.net],[ring]) -AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014]]) +AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2015]]) AC_REVISION([$Revision$]) dnl Where to find configure files