Rename executable from linphone-3 to linphone.

diff --git a/Makefile.am b/Makefile.am
index 84c1e019ffbed7901184147d479d002969208232..66d01711dd89c2b2cee09cfff096700dbeab99e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ ZIP_EXCLUDED=include lib \
 
 SDK_ZIPFILE=$(shell cd $(top_builddir) && pwd)/lib$(PACKAGE)-win32-$(VERSION).zip
 SDK_EXCLUDED= \
-       bin/linphone-3.exe \
+       bin/linphone.exe \
        lib/*.la \
        share/linphone \
        share/pixmaps \

diff --git a/gtk/.gitignore b/gtk/.gitignore
index 398d60f0292e25e0d683a8a59fdd15ef828e2fbf..b1b1529c6bb6c5037d1cd92f6898f6cb7fa236fb 100644 (file)
--- a/gtk/.gitignore
+++ b/gtk/.gitignore
@@ -1,4 +1,4 @@
-linphone-3
+linphone
 .libs
 .deps
 linphone.res

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a2c38b342abe92aa482aa0c952f1943359676bcd..58f5306596b972c31ac4c72e8dd6f45268d7ba25 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -27,9 +27,9 @@ if BUILD_GTK_UI
 
 BUILT_SOURCES=version_date.h
 
-bin_PROGRAMS=linphone-3
+bin_PROGRAMS=linphone
 
-linphone_3_SOURCES=    \
+linphone_SOURCES=      \
                        main.c \
                        propertybox.c \
                        friendlist.c \
@@ -45,7 +45,7 @@ linphone_3_SOURCES=   \
                        loginframe.c \
                        linphone.h 
 
-linphone_3_LDADD=$(ORTP_LIBS) \
+linphone_LDADD=$(ORTP_LIBS) \
                $(MEDIASTREAMER_LIBS) \
                $(top_builddir)/coreapi/liblinphone.la \
                        $(LIBGTK_LIBS) $(INTLLIBS) 
@@ -56,10 +56,10 @@ if BUILD_WIN32
 linphone.res:  $(LINPHONE_ICO_RC_FILE) $(LINPHONE_ICO_FILE)
        windres $(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
 
-linphone_3_LDADD+=linphone.res -lwininet
-linphone_3_LDFLAGS=-Wl,--export-all-symbols -mwindows
+linphone_LDADD+=linphone.res -lwininet
+linphone_LDFLAGS=-Wl,--export-all-symbols -mwindows
 else
-linphone_3_LDFLAGS=-export-dynamic
+linphone_LDFLAGS=-export-dynamic
 endif
 
 uidir=$(datadir)/linphone

diff --git a/linphone.iss.in b/linphone.iss.in
index b7726f542e7d807e1272053c9c7dc4c22271ad34..b0cbd08f048121c5d815db0f04a39429c7727fa6 100644 (file)
--- a/linphone.iss.in
+++ b/linphone.iss.in
@@ -30,19 +30,19 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 #include "linphone-win32.filelist"\r
 \r
 [Icons]\r
-Name: "{group}\Linphone"; Filename: "{app}\bin\linphone-3.exe" ; WorkingDir: "{app}"\r
-Name: "{userdesktop}\Linphone"; Filename: "{app}\bin\linphone-3.exe"; WorkingDir: "{app}" ; Tasks: desktopicon\r
+Name: "{group}\Linphone"; Filename: "{app}\bin\linphone.exe" ; WorkingDir: "{app}"\r
+Name: "{userdesktop}\Linphone"; Filename: "{app}\bin\linphone.exe"; WorkingDir: "{app}" ; Tasks: desktopicon\r
 \r
 [Registry]\r
 Root: HKCR; Subkey: "sip";\r
 Root: HKCR; Subkey: "sip"; ValueData: "URL: SIP protocol" ; ValueType:string\r
 Root: HKCR; Subkey: "sip"; ValueName: "EditFlags"; ValueData: "02 00 00 00" ; ValueType:binary\r
 Root: HKCR; Subkey: "sip"; ValueName: "URL Protocol" ;  ValueType:string\r
-Root: HKCR; Subkey: "sip\DefaultIcon"; ValueData: "{app}\bin\linphone-3.exe"; ValueType:string ; Flags:uninsdeletekey\r
+Root: HKCR; Subkey: "sip\DefaultIcon"; ValueData: "{app}\bin\linphone.exe"; ValueType:string ; Flags:uninsdeletekey\r
 Root: HKCR; Subkey: "sip\shell"\r
 Root: HKCR; Subkey: "sip\shell\open"\r
-Root: HKCR; Subkey: "sip\shell\open\command"; ValueType:string ; ValueData: "{app}\bin\linphone-3.exe --workdir {app} --call %1"; Flags:uninsdeletekey\r
+Root: HKCR; Subkey: "sip\shell\open\command"; ValueType:string ; ValueData: "{app}\bin\linphone.exe --workdir {app} --call %1"; Flags:uninsdeletekey\r
 \r
 [Run]\r
-Filename: "{app}\bin\linphone-3.exe"; Description: "{cm:LaunchProgram,Linphone}"; WorkingDir: "{app}" ; Flags: nowait postinstall skipifsilent\r
+Filename: "{app}\bin\linphone.exe"; Description: "{cm:LaunchProgram,Linphone}"; WorkingDir: "{app}" ; Flags: nowait postinstall skipifsilent\r
 \r

diff --git a/linphone.kdevelop b/linphone.kdevelop
index 27eac222671a9610f08fa5a8a7aa5dcfe87bba0d..2cb0437f5a571e3d97bdda68bda0f7b3c56bff29 100644 (file)
--- a/linphone.kdevelop
+++ b/linphone.kdevelop
@@ -16,7 +16,7 @@
   <kdevcustomproject>
     <run>
       <directoryradio>executable</directoryradio>
-      <mainprogram>gtk-glade/linphone-3</mainprogram>
+      <mainprogram>gtk-glade/linphone</mainprogram>
       <programargs/>
       <globaldebugarguments/>
       <globalcwd/>

diff --git a/scripts/builder-mingw.mk b/scripts/builder-mingw.mk
index 7363218af95bebf6cf4d39c603a68d41f6d107b8..0a9937cc3e41a17054bdf16f33deacab3d1eee89 100644 (file)
--- a/scripts/builder-mingw.mk
+++ b/scripts/builder-mingw.mk
@@ -11,7 +11,7 @@ MSX264_ZIP=$(WORKDIR)/msx264.zip
 INSTALL_ROOT=$(WORKDIR)/root\r
 FILELIST=$(WORKDIR)/linphone-bundle.filelist\r
 \r
-LINPHONE_VERSION=strings $(INSTALL_ROOT)/bin/linphone-3.exe |grep linphone_ident | sed 's/linphone_ident_string=//'\r
+LINPHONE_VERSION=strings $(INSTALL_ROOT)/bin/linphone.exe |grep linphone_ident | sed 's/linphone_ident_string=//'\r
 \r
 $(WORKDIR):\r
        mkdir -p $(WORKDIR)\r

diff --git a/share/linphone.desktop.in b/share/linphone.desktop.in
index 7a490a74d038a4b0bcd0f0330254dfc29c568ba6..d8ab62a5b246ea23ef3aa667e200bb4a1266ce83 100644 (file)
--- a/share/linphone.desktop.in
+++ b/share/linphone.desktop.in
@@ -4,7 +4,7 @@ Comment=Linphone is a web-phone
 Comment[fr]=Linphone est un web-phone.
 Comment[de]=Linphone ist ein web-phone.
 Type=Application
-Exec=linphone-3
+Exec=linphone
 Icon=@prefix@/share/pixmaps/linphone/linphone.png
 Terminal=false
-Categories=Network;Telephony;
\ No newline at end of file
+Categories=Network;Telephony;