r18080 - in /desktop/experimental/dasher/debian: changelog control control.in dasher-data.install dasher.install patches/01_missing-includes.patch patches/02_gcc-4.3.patch patches/03_no-cairo.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Dec 31 15:28:23 UTC 2008 

Author: joss
Date: Wed Dec 31 15:28:22 2008
New Revision: 18080

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18080
Log:
* New upstream release.
* Standards version is 3.8.0.
* 01_missing-includes.patch, 02_gcc-4.3.patch: updated for the new 
  version.
* 03_no-cairo.patch: dropped, merged upstream.
* Move /usr/share/omf to dasher-data.
* Bump dasher-data conflict accordingly.

Removed:
    desktop/experimental/dasher/debian/patches/03_no-cairo.patch
Modified:
    desktop/experimental/dasher/debian/changelog
    desktop/experimental/dasher/debian/control
    desktop/experimental/dasher/debian/control.in
    desktop/experimental/dasher/debian/dasher-data.install
    desktop/experimental/dasher/debian/dasher.install
    desktop/experimental/dasher/debian/patches/01_missing-includes.patch
    desktop/experimental/dasher/debian/patches/02_gcc-4.3.patch

Modified: desktop/experimental/dasher/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/dasher/debian/changelog?rev=18080&op=diff
==============================================================================
--- desktop/experimental/dasher/debian/changelog (original)
+++ desktop/experimental/dasher/debian/changelog Wed Dec 31 15:28:22 2008
@@ -1,8 +1,18 @@
-dasher (4.7.3-2) UNRELEASED; urgency=low
-
+dasher (4.9.0-1) experimental; urgency=low
+
+  [ Loic Minier ]
   * Let dasher-data depend on ${misc:Depends}.
 
- -- Loic Minier <lool at dooz.org>  Sun, 28 Dec 2008 20:49:33 +0100
+  [ Josselin Mouette ]
+  * New upstream release.
+  * Standards version is 3.8.0.
+  * 01_missing-includes.patch, 02_gcc-4.3.patch: updated for the new 
+    version.
+  * 03_no-cairo.patch: dropped, merged upstream.
+  * Move /usr/share/omf to dasher-data.
+  * Bump dasher-data conflict accordingly.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 31 Dec 2008 16:23:44 +0100
 
 dasher (4.7.3-1) unstable; urgency=low
 

Modified: desktop/experimental/dasher/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/dasher/debian/control?rev=18080&op=diff
==============================================================================
--- desktop/experimental/dasher/debian/control (original)
+++ desktop/experimental/dasher/debian/control Wed Dec 31 15:28:22 2008
@@ -30,7 +30,7 @@
                libatk1.0-dev,
                gnome-doc-utils (>= 0.3.2),
                libcanna1g-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: dasher
 Architecture: any
@@ -62,7 +62,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: dasher
-Conflicts: dasher (<< 3.2.18)
+Conflicts: dasher (<< 4.9.0)
 Description: Data files for dasher
  Dasher is an information-efficient text-entry interface, driven by natural
  continuous pointing gestures. Dasher is a competitive text-entry system

Modified: desktop/experimental/dasher/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/dasher/debian/control.in?rev=18080&op=diff
==============================================================================
--- desktop/experimental/dasher/debian/control.in (original)
+++ desktop/experimental/dasher/debian/control.in Wed Dec 31 15:28:22 2008
@@ -30,7 +30,7 @@
                libatk1.0-dev,
                gnome-doc-utils (>= 0.3.2),
                libcanna1g-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: dasher
 Architecture: any
@@ -62,7 +62,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: dasher
-Conflicts: dasher (<< 3.2.18)
+Conflicts: dasher (<< 4.9.0)
 Description: Data files for dasher
  Dasher is an information-efficient text-entry interface, driven by natural
  continuous pointing gestures. Dasher is a competitive text-entry system

Modified: desktop/experimental/dasher/debian/dasher-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/dasher/debian/dasher-data.install?rev=18080&op=diff
==============================================================================
--- desktop/experimental/dasher/debian/dasher-data.install (original)
+++ desktop/experimental/dasher/debian/dasher-data.install Wed Dec 31 15:28:22 2008
@@ -1,4 +1,5 @@
-debian/tmp/usr/share/dasher 	/usr/share
-debian/tmp/usr/share/icons 	/usr/share
-debian/tmp/usr/share/locale	/usr/share
-debian/tmp/usr/share/gnome	/usr/share
+debian/tmp/usr/share/dasher
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/gnome
+debian/tmp/usr/share/omf

Modified: desktop/experimental/dasher/debian/dasher.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/dasher/debian/dasher.install?rev=18080&op=diff
==============================================================================
--- desktop/experimental/dasher/debian/dasher.install (original)
+++ desktop/experimental/dasher/debian/dasher.install Wed Dec 31 15:28:22 2008
@@ -1,5 +1,3 @@
-debian/tmp/usr/bin /usr
-debian/tmp/usr/share/man /usr/share
-debian/tmp/usr/share/omf /usr/share
-debian/tmp/usr/share/applications /usr/share
-
+debian/tmp/usr/bin
+debian/tmp/usr/share/man
+debian/tmp/usr/share/applications

Modified: desktop/experimental/dasher/debian/patches/01_missing-includes.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/dasher/debian/patches/01_missing-includes.patch?rev=18080&op=diff
==============================================================================
--- desktop/experimental/dasher/debian/patches/01_missing-includes.patch (original)
+++ desktop/experimental/dasher/debian/patches/01_missing-includes.patch Wed Dec 31 15:28:22 2008
@@ -1,25 +1,3 @@
-diff -urpN dasher-4.4.1/Src/DasherCore/Alphabet/AlphIO.h dasher-4.4.1.new/Src/DasherCore/Alphabet/AlphIO.h
---- dasher-4.4.1/Src/DasherCore/Alphabet/AlphIO.h	2007-03-12 17:43:12.000000000 +0330
-+++ dasher-4.4.1.new/Src/DasherCore/Alphabet/AlphIO.h	2007-04-29 07:45:29.000000000 +0330
-@@ -13,6 +13,7 @@
- //#include "Alphabet.h"
- #include "GroupInfo.h"
- 
-+#include <cstdlib>
- #include <string>
- #include <map>
- #include <vector>
-diff -urpN dasher-4.4.1/Src/DasherCore/ColourIO.h dasher-4.4.1.new/Src/DasherCore/ColourIO.h
---- dasher-4.4.1/Src/DasherCore/ColourIO.h	2007-03-12 17:43:12.000000000 +0330
-+++ dasher-4.4.1.new/Src/DasherCore/ColourIO.h	2007-04-29 07:46:04.000000000 +0330
-@@ -11,6 +11,7 @@
- 
- #include "DasherTypes.h"
- 
-+#include <cstdlib>
- #include <string>
- #include <map>
- #include <vector>
 diff -urpN dasher-4.4.1/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp dasher-4.4.1.new/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp
 --- dasher-4.4.1/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp	2007-03-12 17:43:12.000000000 +0330
 +++ dasher-4.4.1.new/Src/DasherCore/LanguageModelling/DictLanguageModel.cpp	2007-04-29 07:44:22.000000000 +0330
@@ -53,3 +31,23 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  
+--- dasher-4.9.0/Src/DasherCore/Alphabet/AlphIO.h.orig	2008-04-21 21:04:09.000000000 +0200
++++ dasher-4.9.0/Src/DasherCore/Alphabet/AlphIO.h	2008-12-31 16:16:00.801889206 +0100
+@@ -26,6 +26,7 @@
+ #include "GroupInfo.h"
+ 
+ #include <expat.h>
++#include <cstdlib>
+ #include <string>
+ #include <map>
+ #include <vector>
+--- dasher-4.9.0/Src/DasherCore/ColourIO.h.orig	2008-04-21 21:04:10.000000000 +0200
++++ dasher-4.9.0/Src/DasherCore/ColourIO.h	2008-12-31 16:19:05.073891584 +0100
+@@ -12,6 +12,7 @@
+ #include "DasherTypes.h"
+ 
+ #include <expat.h>
++#include <cstdlib>
+ #include <string>
+ #include <map>
+ #include <vector>

Modified: desktop/experimental/dasher/debian/patches/02_gcc-4.3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/dasher/debian/patches/02_gcc-4.3.patch?rev=18080&op=diff
==============================================================================
--- desktop/experimental/dasher/debian/patches/02_gcc-4.3.patch (original)
+++ desktop/experimental/dasher/debian/patches/02_gcc-4.3.patch Wed Dec 31 15:28:22 2008
@@ -1,16 +1,3 @@
-diff --git a/Src/Gtk2/dasher_action_speech.cpp b/Src/Gtk2/dasher_action_speech.cpp
-index b260eab..aae4040 100644
---- a/Src/Gtk2/dasher_action_speech.cpp
-+++ b/Src/Gtk2/dasher_action_speech.cpp
-@@ -8,6 +8,8 @@
- #include <glib/gi18n.h>
- #include <gnome-speech/gnome-speech.h>
- #include <libbonobo.h>
-+
-+#include <cstring>
- //#include <libintl.h>
- //#include <string.h>
- 
 diff --git a/Src/Gtk2/dasher_editor.cpp b/Src/Gtk2/dasher_editor.cpp
 index 992b6fe..5634214 100644
 --- a/Src/Gtk2/dasher_editor.cpp

More information about the pkg-gnome-commits mailing list