r4869 - in software/ui: . debian src

Enrico Zini enrico at alioth.debian.org
Sun Dec 9 10:59:12 UTC 2007


Author: enrico
Date: 2007-12-09 10:59:11 +0000 (Sun, 09 Dec 2007)
New Revision: 4869

Added:
   software/ui/debian/changelog
   software/ui/debian/copyright
   software/ui/debian/docs
   software/ui/debian/goplay.desktop
   software/ui/debian/goplay.xpm
   software/ui/debian/install
   software/ui/debian/menu
Modified:
   software/ui/
   software/ui/README
   software/ui/debian/control
   software/ui/debian/rules
   software/ui/src/GamesOptions.h
   software/ui/src/common.h
   software/ui/src/filter.cpp
   software/ui/src/goplay.cpp
   software/ui/src/pkgbrowser.cpp
Log:
Merged changes done by Miriam outside of the svn repo


Property changes on: software/ui
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-12-08 20:07:23.335000038 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

   + timestamp: 2007-12-09 10:59:06.201999903 +0000
committer: enrico at enricozini.org
properties: 
	branch-nick: goplay

Name: bzr:file-ids
   - 
   + debian/goplay.xpm	goplay.xpm-20071209105641-jkkfgwmuzv3f9hqd-6
debian/copyright	copyright-20071209105641-jkkfgwmuzv3f9hqd-2
debian/changelog	changelog-20071209105641-jkkfgwmuzv3f9hqd-1
debian/docs	docs-20071209105641-jkkfgwmuzv3f9hqd-3
debian/goplay.desktop	goplay.desktop-20071209105641-jkkfgwmuzv3f9hqd-4
debian/install	install-20071209105641-jkkfgwmuzv3f9hqd-5
debian/menu	menu-20071209105641-jkkfgwmuzv3f9hqd-7

Name: bzr:revision-id:v3-single-software/ui
   - 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa

   + 108 enrico at enricozini.org-20071208200723-y4vsdj5bsmuf0uqa
109 enrico at enricozini.org-20071209105906-z4sjyyyni51a3cnj


Modified: software/ui/README
===================================================================
--- software/ui/README	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/README	2007-12-09 10:59:11 UTC (rev 4869)
@@ -1,8 +1,8 @@
 About GoPlay!
 -------------
 
-GoPlay! is a Graphical User Interface (GUI) that uses DebTags for easily
-finding games in Debian. The program uses FLTK for handling the widgets, and
+GoPlay! is a Graphical User Interface (GUI) that uses DebTags for finding games
+in Debian easily. The program uses FLTK for handling the widgets, and
 libept as the backend for retrieving the data.
 
 GoPlay! has been developed by Miriam Ruiz and Enrico Zini, and can be
@@ -21,7 +21,7 @@
 program; if not, write to the Free Software Foundation, Inc., 51 Franklin St,
 Fifth Floor, Boston, MA  02110-1301 USA
 
-See LICENSE for mor details.
+See LICENSE for more details.
 
 Building instructions
 ---------------------

Added: software/ui/debian/changelog
===================================================================
--- software/ui/debian/changelog	                        (rev 0)
+++ software/ui/debian/changelog	2007-12-09 10:59:11 UTC (rev 4869)
@@ -0,0 +1,6 @@
+goplay (0.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Fri, 24 Aug 2007 13:21:17 +0000
+

Modified: software/ui/debian/control
===================================================================
--- software/ui/debian/control	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/debian/control	2007-12-09 10:59:11 UTC (rev 4869)
@@ -1,14 +1,19 @@
 Source: goplay
 Section: admin
-Priority: optional
-Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Uploaders: Enrico Zini <enrico at debian.org>
-Build-Depends: c++abi2-dev, cdbs, debhelper (>> 4.1), dh-buildinfo, pkg-config, libept-dev (>= 0.5.10), libept-dev (<< 0.6), libwibble-dev (>= 0.1.9), libwibble-dev (<< 0.2), libfltk1.1-dev, fluid
-Standards-Version: 3.7.2.2
+Priority: extra
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org> 
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Enrico Zini <enrico at debian.org>
+Build-Depends: debhelper (>= 5), autotools-dev,
+ c++abi2-dev, dh-buildinfo, pkg-config,
+ libept-dev (>= 0.5.10), libept-dev (<< 0.6),
+ libwibble-dev (>= 0.1.9), libwibble-dev (<< 0.2),
+ libfltk1.1-dev, fluid
+Standards-Version: 3.7.2
 
 Package: goplay
-Section: admin
 Architecture: any
-Depends: ept-cache, debtags, ${shlibs:Depends}, ${misc:Depends} ${perl:Depends}
-Description: Hi Miriam!
- Dum da da dum da dum...
+Depends: ept-cache, debtags, games-thumbnails, ${shlibs:Depends}, ${misc:Depends}
+Description: Debian game browser
+ GoPlay! is a Graphical User Interface (GUI) that uses DebTags for easily
+ finding games in Debian. The program uses FLTK for handling the widgets,
+ and libept as the backend for retrieving the data.

Added: software/ui/debian/copyright
===================================================================
--- software/ui/debian/copyright	                        (rev 0)
+++ software/ui/debian/copyright	2007-12-09 10:59:11 UTC (rev 4869)
@@ -0,0 +1,34 @@
+This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
+Fri, 24 Aug 2007 13:21:17 +0000.
+
+Upstream Authors: 
+
+  Enrico Zini <enrico at debian.org>
+  Miriam Ruiz <little_miry at yahoo.es>
+
+Copyright: 
+
+  Copyright (C) 2007  Enrico Zini <enrico at debian.org>
+  Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+ 
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+ 
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
+is licensed under the GPL, see above.

Added: software/ui/debian/docs
===================================================================
--- software/ui/debian/docs	                        (rev 0)
+++ software/ui/debian/docs	2007-12-09 10:59:11 UTC (rev 4869)
@@ -0,0 +1,2 @@
+FAQ
+README

Added: software/ui/debian/goplay.desktop
===================================================================
--- software/ui/debian/goplay.desktop	                        (rev 0)
+++ software/ui/debian/goplay.desktop	2007-12-09 10:59:11 UTC (rev 4869)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=GoPlay!
+GenericName=goplay
+Comment=Debian game browser
+Icon=goplay
+Exec=goplay
+Terminal=false
+Categories=Utility;

Added: software/ui/debian/goplay.xpm
===================================================================
--- software/ui/debian/goplay.xpm	                        (rev 0)
+++ software/ui/debian/goplay.xpm	2007-12-09 10:59:11 UTC (rev 4869)
@@ -0,0 +1,224 @@
+/* XPM */
+static char * goplay_xpm[] = {
+"32 32 189 2",
+"  	c None",
+". 	c #FF8100",
+"+ 	c #FF8200",
+"@ 	c #FFBA00",
+"# 	c #FFC000",
+"$ 	c #FFE600",
+"% 	c #FEFA01",
+"& 	c #FEAD02",
+"* 	c #F36418",
+"= 	c #E55735",
+"- 	c #DE3143",
+"; 	c #E34C38",
+"> 	c #E53733",
+", 	c #D70651",
+"' 	c #D70750",
+") 	c #D80D4F",
+"! 	c #E35338",
+"~ 	c #E8722E",
+"{ 	c #EC8527",
+"] 	c #EA772A",
+"^ 	c #E33038",
+"/ 	c #D80850",
+"( 	c #D90E4D",
+"_ 	c #E45338",
+": 	c #F7CF10",
+"< 	c #FFFE00",
+"[ 	c #FFFF00",
+"} 	c #FFC700",
+"| 	c #FB7408",
+"1 	c #D80A4E",
+"2 	c #F7860F",
+"3 	c #FFFD00",
+"4 	c #FFB100",
+"5 	c #FF8000",
+"6 	c #EA412A",
+"7 	c #D8094F",
+"8 	c #FF8300",
+"9 	c #FF8400",
+"0 	c #FFBF00",
+"a 	c #FFF900",
+"b 	c #FFD200",
+"c 	c #FFCE00",
+"d 	c #EC7A26",
+"e 	c #D70751",
+"f 	c #E23D3A",
+"g 	c #FFE200",
+"h 	c #FFE800",
+"i 	c #FFE900",
+"j 	c #FFA500",
+"k 	c #FFE100",
+"l 	c #FEF802",
+"m 	c #DD2E44",
+"n 	c #DA184B",
+"o 	c #EA8228",
+"p 	c #FEF902",
+"q 	c #FFF600",
+"r 	c #FF9600",
+"s 	c #FF9E00",
+"t 	c #FEFC01",
+"u 	c #F1A91C",
+"v 	c #E66731",
+"w 	c #E9772C",
+"x 	c #EF9C20",
+"y 	c #FBE608",
+"z 	c #EC8C25",
+"A 	c #EE9522",
+"B 	c #FDF104",
+"C 	c #FFB500",
+"D 	c #DB1448",
+"E 	c #ED6123",
+"F 	c #FFBC00",
+"G 	c #FFE300",
+"H 	c #FFFB00",
+"I 	c #EC8A26",
+"J 	c #ED9123",
+"K 	c #FCF004",
+"L 	c #FEFB01",
+"M 	c #FAE00A",
+"N 	c #F5C413",
+"O 	c #FEF503",
+"P 	c #FFD400",
+"Q 	c #FF8500",
+"R 	c #FF9F00",
+"S 	c #DE2341",
+"T 	c #DC2348",
+"U 	c #FDF204",
+"V 	c #F4BD15",
+"W 	c #ED8F24",
+"X 	c #E8742D",
+"Y 	c #FFF100",
+"Z 	c #FF9200",
+"` 	c #FFBD00",
+" .	c #FFF000",
+"..	c #DD2D44",
+"+.	c #E35438",
+"@.	c #E66631",
+"#.	c #FCED06",
+"$.	c #FDF004",
+"%.	c #FEF703",
+"&.	c #FAE209",
+"*.	c #E45836",
+"=.	c #FFFC00",
+"-.	c #FFA900",
+";.	c #FFB200",
+">.	c #DD2C44",
+",.	c #E86E2F",
+"'.	c #FEFA02",
+").	c #E25039",
+"!.	c #F8D70D",
+"~.	c #D70850",
+"{.	c #F1AD1A",
+"].	c #FFCA00",
+"^.	c #FF9100",
+"/.	c #FFD900",
+"(.	c #DD2A45",
+"_.	c #EB8528",
+":.	c #DE3342",
+"<.	c #FCEF05",
+"[.	c #FBE708",
+"}.	c #F2B219",
+"|.	c #DA194B",
+"1.	c #FACE0A",
+"2.	c #FF8B00",
+"3.	c #DC1747",
+"4.	c #EC8826",
+"5.	c #E45936",
+"6.	c #F3B518",
+"7.	c #FEF702",
+"8.	c #DC2646",
+"9.	c #EB8328",
+"0.	c #FDA604",
+"a.	c #E63E32",
+"b.	c #F2AF1A",
+"c.	c #E03F3E",
+"d.	c #F9DA0C",
+"e.	c #EA7E2A",
+"f.	c #E1483C",
+"g.	c #FEBC01",
+"h.	c #FFA200",
+"i.	c #F4C014",
+"j.	c #E24B3A",
+"k.	c #F8D40E",
+"l.	c #F6C612",
+"m.	c #E24E39",
+"n.	c #E35138",
+"o.	c #FCEC06",
+"p.	c #FFEE00",
+"q.	c #FF8900",
+"r.	c #FFD300",
+"s.	c #F8D30E",
+"t.	c #E8722D",
+"u.	c #DE3442",
+"v.	c #E34F38",
+"w.	c #E45B35",
+"x.	c #E03E3E",
+"y.	c #E0413E",
+"z.	c #EF9E1F",
+"A.	c #FFB400",
+"B.	c #F5BF14",
+"C.	c #F2B218",
+"D.	c #F3B418",
+"E.	c #FFDC00",
+"F.	c #FFC100",
+"G.	c #FFBB00",
+"H.	c #FFDB00",
+"I.	c #FFF700",
+"J.	c #FF9C00",
+"K.	c #DD1A44",
+"L.	c #FEBD02",
+"M.	c #FFED00",
+"N.	c #FF8700",
+"O.	c #FFE000",
+"P.	c #FFF800",
+"Q.	c #EC7C25",
+"R.	c #FF8D00",
+"S.	c #FFA700",
+"T.	c #FFC600",
+"U.	c #DA154A",
+"V.	c #EA7A2B",
+"W.	c #FEF603",
+"X.	c #FFC400",
+"Y.	c #FF8600",
+"Z.	c #F48614",
+"`.	c #E9752C",
+" +	c #FBA207",
+".+	c #FCD606",
+"++	c #E9452B",
+"@+	c #DA0F4B",
+"#+	c #FF8800",
+"                                                                ",
+"                          . +                                   ",
+"                          @ #                                   ",
+"                        + $ % &                                 ",
+"                        * = - ; > ,                             ",
+"                      ' ' , , , , , , , , ,                     ",
+"                  , , , , ) ! ~ { ] ^ / , , ,                   ",
+"                , , , ( _ : < [ [ [ } | ' , , ,                 ",
+"                , , 1 2 < [ [ [ [ [ 3 4 5 6 7 , ,     8 8 9 5   ",
+"              , , ,   0 [ [ [ [ [ [ [ a b c d e , f g $ h i j 5 ",
+"            , , ,   8 k [ [ [ [ [ [ [ [ [ [ l m n o p [ [ q r   ",
+"            , 1   + s a [ [ t u v w x y [ [ [ z e A B [ < C     ",
+"          D , E F G H [ [ < I J K [ L M % [ [ N , I O [ P 9     ",
+"      Q R S T U [ [ [ [ [ V W < [ [ [ [ [ [ [ M , X [ Y Z       ",
+"5 . `  .3 ..+.[ [ [ [ [ [ @.#.[ [ [ [ [ $.%.[ &., *.=.-.        ",
+"  5 ;.q [ >.,.[ [ [ [ [ '.).'.[ [ [ [ [ L t [ !.~.{.].          ",
+"      ^./.(._.[ [ [ [ [ t :.<.[ [ [ [ p [.[ [ }.|.1.2.          ",
+"        8 3.4.[ [ [ [ [ [ 5.6.[ [ '.U '.K [ 7.8.9.0.            ",
+"          , a.].H [ [ [ O b.c.<.[ B d.[ [ '.e.f.% g.            ",
+"          , 7   h.h [ [ '.i.I j.k.< [ '.l.m.n.o.[ p.q.          ",
+"            ,     q.r.[ [ < s.t.u.v.w.x.y.z.l [ [ < A.          ",
+"            , ,     # [ [ [ [ B B.C.D.M '.[ [ [ [ [ h Q         ",
+"            , ,     # [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ < -.        ",
+"              , ,   # [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ [ E.        ",
+"              , ,   # [ [ [ [ [ [ a F.G.H.I.< [ [ [ [ H J.      ",
+"                , K.L.[ [ [ [ [ M.J.      N.h.# O.P.< [ c       ",
+"                  e Q.< [ [ [ E.R.                R.S.T.b Q     ",
+"                    U.V.W.=.X.Y.                        5 5     ",
+"                    Z.>.`. +.                                   ",
+"                    @ .+++ at +                                    ",
+"                    Q #+                                        ",
+"                    5                                           "};

Added: software/ui/debian/install
===================================================================
--- software/ui/debian/install	                        (rev 0)
+++ software/ui/debian/install	2007-12-09 10:59:11 UTC (rev 4869)
@@ -0,0 +1,3 @@
+data/* usr/share/goplay/
+debian/*.xpm usr/share/pixmaps/
+debian/*.desktop usr/share/applications/

Added: software/ui/debian/menu
===================================================================
--- software/ui/debian/menu	                        (rev 0)
+++ software/ui/debian/menu	2007-12-09 10:59:11 UTC (rev 4869)
@@ -0,0 +1,3 @@
+?package(goplay):needs="x11" section="Applications/Data Management" \
+	title="GoPlay!" command="/usr/bin/goplay" \
+	icon="/usr/share/pixmaps/goplay.xpm"

Modified: software/ui/debian/rules
===================================================================
--- software/ui/debian/rules	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/debian/rules	2007-12-09 10:59:11 UTC (rev 4869)
@@ -1,8 +1,78 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-# Store build information
-common-binary-post-install-arch common-binary-post-install-indep::
-	dh_buildinfo
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	test configure || sh autogen.sh
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+	$(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f config.sub config.guess
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	$(MAKE) DESTDIR=$(CURDIR)/debian/goplay install
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install
+	dh_installmenu
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	test -e /usr/bin/dh_buildinfo && dh_buildinfo
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 

Modified: software/ui/src/GamesOptions.h
===================================================================
--- software/ui/src/GamesOptions.h	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/src/GamesOptions.h	2007-12-09 10:59:11 UTC (rev 4869)
@@ -38,8 +38,8 @@
 		usage = "[options and arguments]";
 		description = "Debian game browser";
 		longDescription =
-			"This is the long description.\n"
-			"It can be edited in the file GamesOptions.h\n";
+			"GoPlay! is a Graphical User Interface (GUI) that uses DebTags"
+			" for finding games in Debian easily.\n";
 
 		out_verbose = add<BoolOption>("verbose", 'v', "verbose", "",
 						"enable verbose output");

Modified: software/ui/src/common.h
===================================================================
--- software/ui/src/common.h	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/src/common.h	2007-12-09 10:59:11 UTC (rev 4869)
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef DATADIR
-#define DATADIR "./data"
+#define DATADIR "/usr/share/goplay"
 #endif
 
 #ifndef HTMLDIR

Modified: software/ui/src/filter.cpp
===================================================================
--- software/ui/src/filter.cpp	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/src/filter.cpp	2007-12-09 10:59:11 UTC (rev 4869)
@@ -60,10 +60,10 @@
 	tagdata.SetTag(&yellow_tags, "rating:theme::horror");
 	tagdata.SetTag(&red_tags,    "rating:theme::cruelty");
 
-	std::cerr << "Green Tags: "; tagdata.Print(&green_tags);
-	std::cerr << "Yellow Tags: "; tagdata.Print(&yellow_tags);
-	std::cerr << "Red Tags: "; tagdata.Print(&red_tags);
-	std::cerr << "Black Tags: "; tagdata.Print(&black_tags);
+	//std::cerr << "Green Tags: "; tagdata.Print(&green_tags);
+	//std::cerr << "Yellow Tags: "; tagdata.Print(&yellow_tags);
+	//std::cerr << "Red Tags: "; tagdata.Print(&red_tags);
+	//std::cerr << "Black Tags: "; tagdata.Print(&black_tags);
 }
 
 PackageFilter::~PackageFilter()

Modified: software/ui/src/goplay.cpp
===================================================================
--- software/ui/src/goplay.cpp	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/src/goplay.cpp	2007-12-09 10:59:11 UTC (rev 4869)
@@ -48,6 +48,7 @@
 
 #include <FL/Fl.H>
 #include <FL/Fl_PNG_Image.H>
+#include <FL/fl_ask.H>
 
 namespace std {
 
@@ -143,16 +144,10 @@
 		return "";
 }
 
-//static const char *VoidString = "";
+static char *VoidString = "";
 
 static void UpdateUILists(GamesUI& ui)
 {
-	// Defining this here, non-const, because fltk's interface want non-const
-	// strings and I did not have time to check whether it would attempt to
-	// modify the parameter or not.  Likely not, and thus a
-	// const_cast<char*>(VoidString) would probably have been better.
-	// --Enrico
-	char VoidString[1] = "";
 	Engine& engine = *ui.engine;
 	const char* oldType = ReadFlChoice(*ui.TypeSelection);
 	const char* oldIface = ReadFlChoice(*ui.InterfaceSelection);
@@ -409,6 +404,7 @@
 		cerr << endl;
 		cerr << endl;
 		cerr << "It could be that your Apt Xapian index is missing: you can create it by running ept-cache reindex as root." << endl;
+		fl_alert("Error: It could be that your Apt Xapian index is missing: you can create it by running ept-cache reindex as root.");
 	} catch (Xapian::DatabaseVersionError& e) {
 		cerr << "Xapian " << e.get_type() << ": " << e.get_msg();
 		if (!e.get_context().empty())
@@ -416,6 +412,7 @@
 		cerr << endl;
 		cerr << endl;
 		cerr << "Please recreate the database by removing /var/lib/apt-xapian and running ept-cache reindex as root." << endl;
+		fl_alert("Error: Please recreate the database by removing /var/lib/apt-xapian and running ept-cache reindex as root.");
 	} catch (Xapian::Error& e) {
 		cerr << "Xapian " << e.get_type() << ": " << e.get_msg();
 		if (!e.get_context().empty())

Modified: software/ui/src/pkgbrowser.cpp
===================================================================
--- software/ui/src/pkgbrowser.cpp	2007-12-09 10:56:30 UTC (rev 4868)
+++ software/ui/src/pkgbrowser.cpp	2007-12-09 10:59:11 UTC (rev 4869)
@@ -95,7 +95,7 @@
 		{
 			char uri[SIZE_URI];
 			int i;
-			for (i = 0; *src && (strchr(legalchars, *src) || *src < 0) && i < SIZE_URI-1; i++)
+			for (i = 0; *src && (strchr(legalchars, *src) || (*src & 128)) && i < SIZE_URI-1; i++)
 				uri[i] = *src++;
 			if (strchr(".?!", uri[i-1])) { --i; --src; } // Probably the end of a sentence
 			uri[i] = 0;




More information about the Pkg-games-commits mailing list