dasher r3674 - in trunk: . Doc/development Src/Gtk2 Src/Installer Src/InstallerTobii Src/InstallerW2K Src/Win32

From: pwelche svn gnome org
To: svn-commits-list gnome org
Subject: dasher r3674 - in trunk: . Doc/development Src/Gtk2 Src/Installer Src/InstallerTobii Src/InstallerW2K Src/Win32
Date: Sat, 14 Mar 2009 23:30:08 +0000 (UTC)
Author: pwelche
Date: Sat Mar 14 23:30:08 2009
New Revision: 3674
URL: http://svn.gnome.org/viewvc/dasher?rev=3674&view=rev

Log:
Prepare version 4.10 release candidate.


Modified:
   trunk/ChangeLog
   trunk/Doc/development/GUIDS.txt
   trunk/Doc/development/releasing.txt
   trunk/NEWS
   trunk/README
   trunk/Src/Gtk2/dasher_main.cpp
   trunk/Src/Installer/Dasher.wxs
   trunk/Src/Installer/Installer.wixproj
   trunk/Src/InstallerTobii/InstallerTobii.wixproj
   trunk/Src/InstallerW2K/InstallerW2K.wixproj
   trunk/Src/Win32/Dasher.rc
   trunk/configure.in

Modified: trunk/Doc/development/GUIDS.txt
==============================================================================
--- trunk/Doc/development/GUIDS.txt	(original)
+++ trunk/Doc/development/GUIDS.txt	Sat Mar 14 23:30:08 2009
@@ -46,5 +46,11 @@
 (Specialist installers not shipped for development release)
 
 4.9.0 (Standard)
+================
 Product ID: ABC998A2-E21A-4453-B104-FA1C20E0CFD8
-Upgrade Code: B258EB55-13B0-4b4d-91FE-FEFAE823E802
\ No newline at end of file
+Upgrade Code: B258EB55-13B0-4b4d-91FE-FEFAE823E802
+
+4.10.0 (Standard)
+================
+Product ID: 5ce7dc54-10e5-11de-bf4f-000e7b9b7395
+Upgrade Code: 881c50ca-10e6-11de-bf4f-000e7b9b7395

Modified: trunk/Doc/development/releasing.txt
==============================================================================
--- trunk/Doc/development/releasing.txt	(original)
+++ trunk/Doc/development/releasing.txt	Sat Mar 14 23:30:08 2009
@@ -25,6 +25,7 @@
      - Src/Installer/Dasher.wxs
 	 - Src/InstallerW2K/Dasher.wxs (Windows 2K compatibility version)
 	 - Src/InstallerTobii/Dasher.wxs (MyTobii customised installer)
+     - Src/Installer*/Installer*.wixproj
 
 4. Add an item to the ChangeLog and NEWS files
 

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Mar 14 23:30:08 2009
@@ -1,9 +1,16 @@
 ============
-Dasher 4.9.0
+Dasher 4.10.0
 ============
+  * Fix click modes where letters near the edge of the selection box to "leak"
+    out so they could not be selected.
   * Fix UTF-8 bug so e.g., Japanese and Hebrew work.
 
 ============
+Dasher 4.9.0
+============
+  * New development branch
+
+============
 Dasher 4.7.2
 ============
   * Bugfixes

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Sat Mar 14 23:30:08 2009
@@ -1,4 +1,4 @@
-Dasher Version 4.9.0
+Dasher Version 4.10.0
 --------------------
 Dasher is a zooming predictive text entry system, designed for situations
 where keyboard input is impractical (for instance, accessibility or PDAs). It

Modified: trunk/Src/Gtk2/dasher_main.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_main.cpp	(original)
+++ trunk/Src/Gtk2/dasher_main.cpp	Sat Mar 14 23:30:08 2009
@@ -1206,7 +1206,7 @@
   gtk_show_about_dialog(GTK_WINDOW(pPrivate->pMainWindow),
 			"authors", authors,
 			"comments", _("Dasher is a predictive text entry application"), 
-			"copyright", "Copyright \xC2\xA9 1998-2007 The Dasher Project", 
+			"copyright", "Copyright \xC2\xA9 1998-2009 The Dasher Project", 
 			"documenters", documenters,
 			"license", "GPL 2+",
 			"logo-icon-name", "dasher",

Modified: trunk/Src/Installer/Dasher.wxs
==============================================================================
--- trunk/Src/Installer/Dasher.wxs	(original)
+++ trunk/Src/Installer/Dasher.wxs	Sat Mar 14 23:30:08 2009
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='utf-8'?>
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 
-  <Product Name='Dasher 4.9' Id='ABC998A2-E21A-4453-B104-FA1C20E0CFD8'
-   Language='1033' Codepage='1252' Version='4.9.1' Manufacturer='Dasher'
-   UpgradeCode='B258EB55-13B0-4b4d-91FE-FEFAE823E802'>
+  <Product Name='Dasher 4.10' Id='5ce7dc54-10e5-11de-bf4f-000e7b9b7395'
+   Language='1033' Codepage='1252' Version='4.10.0' Manufacturer='Dasher'
+   UpgradeCode='881c50ca-10e6-11de-bf4f-000e7b9b7395'>
 
     <Package Keywords='Installer'
-     Description="Dasher 4.9 Installer"
+     Description="Dasher 4.10 Installer"
      Comments='This will install Dasher' Manufacturer='The Dasher Group.'
      InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
     <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
-    <Property Id='DiskPrompt' Value="Dasher 4.9 Installation [1]" />
+    <Property Id='DiskPrompt' Value="Dasher 4.10 Installation [1]" />
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='PFiles'>

Modified: trunk/Src/Installer/Installer.wixproj
==============================================================================
--- trunk/Src/Installer/Installer.wixproj	(original)
+++ trunk/Src/Installer/Installer.wixproj	Sat Mar 14 23:30:08 2009
@@ -4,7 +4,7 @@
     <ProductVersion>3.0</ProductVersion>
     <ProjectGuid>{bbe9e817-e2c5-4081-9612-0738e27cf55a}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Dasher 4.9</OutputName>
+    <OutputName>Dasher 4.10</OutputName>
     <OutputType>Package</OutputType>
     <WixToolPath>C:\Program Files\Windows Installer XML v3\bin\</WixToolPath>
   </PropertyGroup>

Modified: trunk/Src/InstallerTobii/InstallerTobii.wixproj
==============================================================================
--- trunk/Src/InstallerTobii/InstallerTobii.wixproj	(original)
+++ trunk/Src/InstallerTobii/InstallerTobii.wixproj	Sat Mar 14 23:30:08 2009
@@ -4,7 +4,7 @@
     <ProductVersion>3.0</ProductVersion>
     <ProjectGuid>{c4bfc988-da68-4f51-bab0-db5b7d5cd53b}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Dasher 4.6 (MyTobii)</OutputName>
+    <OutputName>Dasher 4.10 (MyTobii)</OutputName>
     <OutputType>Package</OutputType>
     <WixToolPath>$(ProgramFiles)\Windows Installer XML v3\bin\</WixToolPath>
   </PropertyGroup>
@@ -98,4 +98,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Src/InstallerW2K/InstallerW2K.wixproj
==============================================================================
--- trunk/Src/InstallerW2K/InstallerW2K.wixproj	(original)
+++ trunk/Src/InstallerW2K/InstallerW2K.wixproj	Sat Mar 14 23:30:08 2009
@@ -4,7 +4,7 @@
     <ProductVersion>3.0</ProductVersion>
     <ProjectGuid>{c2e1f683-e2b1-4445-9748-e67e1d5156fd}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>Dasher 4.6 (W2K)</OutputName>
+    <OutputName>Dasher 4.10 (W2K)</OutputName>
     <OutputType>Package</OutputType>
     <WixToolPath>$(ProgramFiles)\Windows Installer XML v3\bin\</WixToolPath>
   </PropertyGroup>
@@ -64,4 +64,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Src/Win32/Dasher.rc
==============================================================================
--- trunk/Src/Win32/Dasher.rc	(original)
+++ trunk/Src/Win32/Dasher.rc	Sat Mar 14 23:30:08 2009
@@ -132,9 +132,9 @@
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,185,130,50,14
     ICON            IDI_DASHER,IDC_MYICON,23,18,20,20
-    LTEXT           "Dasher 4.9.1",IDC_STATIC,67,18,168,10,SS_NOPREFIX
-    LTEXT           "Copyright (C) 1998-2008 The Dasher Project",IDC_STATIC,67,30,168,10
-    LTEXT           "dasher mrao cam ac uk",IDC_STATIC,67,63,168,10
+    LTEXT           "Dasher 4.10.0",IDC_STATIC,67,18,168,10,SS_NOPREFIX
+    LTEXT           "Copyright (C) 1998-2009 The Dasher Project",IDC_STATIC,67,30,168,10
+    LTEXT           "dasher inf phy cam ac uk",IDC_STATIC,67,63,168,10
     LTEXT           "http://www.dasher.org.uk/",IDC_STATIC,67,53,168,10
     LTEXT           "FAQ: http://www.metafaq.com/faq/dasher/",IDC_STATIC,67,86,168,10
     LTEXT           "",IDC_STATIC,67,112,168,1,NOT WS_GROUP
@@ -462,8 +462,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,9,1,0
- PRODUCTVERSION 4,9,1,0
+ FILEVERSION 4,10,0,0
+ PRODUCTVERSION 4,10,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x3L
@@ -481,12 +481,12 @@
             VALUE "Comments", "Dasher is an information efficient text-entry system controlled by a pointer. It is licensed under the GPL."
             VALUE "CompanyName", "Inference Group, Cavendish Laboratory, University of Cambridge"
             VALUE "FileDescription", "Dasher"
-            VALUE "FileVersion", "4, 9, 1, 0"
+            VALUE "FileVersion", "4, 10, 0, 0"
             VALUE "InternalName", "Dasher"
-            VALUE "LegalCopyright", "Copyright © 1998-2008 The Dasher Project"
+            VALUE "LegalCopyright", "Copyright © 1998-2009 The Dasher Project"
             VALUE "OriginalFilename", "dasher.exe"
             VALUE "ProductName", "Dasher"
-            VALUE "ProductVersion", "4, 9, 1, 0"
+            VALUE "ProductVersion", "4, 10, 0, 0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Mar 14 23:30:08 2009
@@ -1,5 +1,5 @@
 AC_PREREQ(2.56)
-AC_INIT([dasher],[4.9.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=dasher])
+AC_INIT([dasher],[4.10.0rc1],[http://bugzilla.gnome.org/enter_bug.cgi?product=dasher])
 AC_REVISION([$Id: configure.in,v])
 AC_CONFIG_SRCDIR([Src/main.cc])
 AC_CONFIG_HEADERS(config.h)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]