Bug#515323: Depends on GTK 1.2

2009-03-14 Thread Javier Fernández-Sanguino Peña
On Fri, Mar 13, 2009 at 04:54:06PM -0400, Barry deFreese wrote:
 tags 515323 + patch

 thank you

 Hi,

 Attached is a patch that will build with Gtk 2 as well as some packaging  
 fixes.  Probably needs better testing as Spanish is not my first 
 language.

I've tested the patch and there are some issues with ISO-8859-1 encoding, I
get these:

(i2e:27958): Pango-WARNING **: Invalid UTF-8 string passed to
pango_layout_set_text()

(i2e:27958): Pango-WARNING **: Invalid UTF-8 string passed to
pango_layout_set_text()

(i2e:27958): Pango-WARNING **: Invalid UTF-8 string passed to
pango_layout_set_text()

And the accented characteres don't show up properly. I have fixed this but
still don't get the application to work properly (i.e. lookup words and
show their translations).

Regards

Javier


signature.asc
Description: Digital signature


Bug#515323: Depends on GTK 1.2

2009-03-14 Thread Javier Fernández-Sanguino Peña
On Fri, Mar 13, 2009 at 04:54:06PM -0400, Barry deFreese wrote:
 Attached is a patch that will build with Gtk 2 as well as some packaging  
 fixes.  Probably needs better testing as Spanish is not my first 
 language.

I have played with the patch a little bit and it does not work. I fixed the
issue with i2e not showing properly accented characters by converting the PO
file (for spanish) to UTF-8 and then fixing how the locale is set in the
program.

But I have been unable to make it work to get it to translate a simple word,
the changes for GTK+2 support break its functionality (it doesn't show
anything in the window frame and spouts a lot of gtk errors).

Since upstream is no longer active I'm tempted to ask for the removal of this
package. There are probably better alternatives out there (ktranslator in GUI
or translate in text-mode).

I'm going to tag this bug as help needed since I don't have the GTK
experience to fix this issue. If no help is forthcoming I will ask for its
removal.

Regards

Javier
diff -Nru i2e-0.5.1/debian/changelog i2e-0.5.1-gtk2/debian/changelog
--- i2e-0.5.1/debian/changelog	2009-03-14 18:14:34.0 +0100
+++ i2e-0.5.1-gtk2/debian/changelog	2009-03-14 13:43:11.0 +0100
@@ -1,3 +1,16 @@
+i2e (0.5.1-3) unstable; urgency=low
+
+  * Use patch provided by Barry deFreese (Debian QA):
+* Build with Gtk2. (Closes: #515323).
+  * Make clean not ignore errors.
+  * Bump debhelper build-dep to  5.0.0.
+  * Add debian/compat and set to 5.
+  * Bump Standards Version to 3.8.0.
++ Menu policy transition.
+  * Convert es.po file to UTF-8 
+
+ -- Javier Fernandez-Sanguino Pen~a j...@debian.org  Sat, 14 Mar 2009 13:43:06 +0100
+
 i2e (0.5.1-2) unstable; urgency=low
 
   * Lintian fixes:
diff -Nru i2e-0.5.1/debian/compat i2e-0.5.1-gtk2/debian/compat
--- i2e-0.5.1/debian/compat	1970-01-01 01:00:00.0 +0100
+++ i2e-0.5.1-gtk2/debian/compat	2009-03-14 13:23:06.0 +0100
@@ -0,0 +1 @@
+5
diff -Nru i2e-0.5.1/debian/control i2e-0.5.1-gtk2/debian/control
--- i2e-0.5.1/debian/control	2009-03-14 18:14:34.0 +0100
+++ i2e-0.5.1-gtk2/debian/control	2009-03-14 13:23:06.0 +0100
@@ -2,12 +2,12 @@
 Section: text
 Priority: optional
 Maintainer: Javier Fernandez-Sanguino Pen~a j...@computer.org
-Build-Depends: gettext, libgtk1.2-dev, debhelper ( 3.0.0)
-Standards-Version: 3.5.8.0
+Build-Depends: debhelper ( 5.0.0), gettext, libgtk2.0-dev
+Standards-Version: 3.8.0
 
 Package: i2e
 Architecture: any
-Depends: gettext,${shlibs:Depends}
+Depends: gettext,${shlibs:Depends}, ${misc:Depends}
 Description: English-Spanish translation dictionary
  English to Spanish (and viceversa) translation dictionary. 
  It can be used both in X and text mode and has a learning
diff -Nru i2e-0.5.1/debian/menu i2e-0.5.1-gtk2/debian/menu
--- i2e-0.5.1/debian/menu	2009-03-14 18:14:34.0 +0100
+++ i2e-0.5.1-gtk2/debian/menu	2009-03-14 13:23:06.0 +0100
@@ -1,6 +1,6 @@
 ?package(i2e):\
   needs=X11\
-  section=Apps/Text\
+  section=Applications/Text\
   description=English-Spanish dictionary\
   title=i2e\
   command=/usr/bin/i2e
diff -Nru i2e-0.5.1/debian/rules i2e-0.5.1-gtk2/debian/rules
--- i2e-0.5.1/debian/rules	2009-03-14 18:14:34.0 +0100
+++ i2e-0.5.1-gtk2/debian/rules	2009-03-14 13:23:06.0 +0100
@@ -22,7 +22,7 @@
 	rm -f build-stamp install-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 
 	dh_clean
 
@@ -34,7 +34,7 @@
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/i2e
 
 	touch install-stamp
 
diff -Nru i2e-0.5.1/i2e.c i2e-0.5.1-gtk2/i2e.c
--- i2e-0.5.1/i2e.c	2009-03-14 18:14:34.0 +0100
+++ i2e-0.5.1-gtk2/i2e.c	2009-03-14 15:30:43.0 +0100
@@ -43,7 +43,7 @@
 return;
   }
 
-  str = (char *)g_malloc( strlen( clip-data ) + 1 );
+  str = (char *)g_malloc( strlen((char *)clip-data ) + 1 );
   strcpy( str, (char *)clip-data );
   ptr = strtrim( str );
 
@@ -80,13 +80,14 @@
 /* sigue el estado del togglebutton traducir */
 static void cambiaTraducir( GtkWidget *widget, gpointer data )
 {
-  char *direccion[2] = { _( Spanish - English ), _( English - Spanish ) };
 
   parametros *datos = (parametros *)data;
-  datos-i2c = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ));
   datos-cambiado = TRUE;
-  gtk_label_set_text( GTK_LABEL( GTK_TOGGLE_BUTTON( widget )-button.bin.child ),
-  direccion[datos-i2c] );
+  if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget )) ) 
+
+  gtk_label_set_text( GTK_LABEL( GTK_TOGGLE_BUTTON( widget )-button.bin.child ), _( English - Spanish ));
+  else 
+  gtk_label_set_text( GTK_LABEL( GTK_TOGGLE_BUTTON( widget )-button.bin.child ), _( Spanish - English ));
 
   gtk_entry_select_region( GTK_ENTRY( datos-entrada ), 0,
   strlen( gtk_entry_get_text( GTK_ENTRY( datos-entrada ;
@@ -159,10 

Bug#515323: Depends on GTK 1.2

2009-03-13 Thread Barry deFreese

tags 515323 + patch

thank you

Hi,

Attached is a patch that will build with Gtk 2 as well as some packaging 
fixes.  Probably needs better testing as Spanish is not my first language.


Hope it helps.

Thanks,

Barry deFreese
Debian QA


diff -u i2e-0.5.1/debian/changelog i2e-0.5.1/debian/changelog
--- i2e-0.5.1/debian/changelog
+++ i2e-0.5.1/debian/changelog
@@ -1,3 +1,15 @@
+i2e (0.5.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build with Gtk2. (Closes: #515323).
+  * Make clean not ignore errors.
+  * Bump debhelper build-dep to  5.0.0.
+  * Add debian/compat and set to 5.
+  * Bump Standards Version to 3.8.0.
++ Menu policy transition.
+
+ -- Barry deFreese bdefre...@debian.org  Fri, 13 Mar 2009 15:40:44 -0400
+
 i2e (0.5.1-2) unstable; urgency=low
 
   * Lintian fixes:
diff -u i2e-0.5.1/debian/control i2e-0.5.1/debian/control
--- i2e-0.5.1/debian/control
+++ i2e-0.5.1/debian/control
@@ -2,12 +2,12 @@
 Section: text
 Priority: optional
 Maintainer: Javier Fernandez-Sanguino Pen~a j...@computer.org
-Build-Depends: gettext, libgtk1.2-dev, debhelper ( 3.0.0)
-Standards-Version: 3.5.8.0
+Build-Depends: debhelper ( 5.0.0), gettext, libgtk2.0-dev
+Standards-Version: 3.8.0
 
 Package: i2e
 Architecture: any
-Depends: gettext,${shlibs:Depends}
+Depends: gettext,${shlibs:Depends}, ${misc:Depends}
 Description: English-Spanish translation dictionary
  English to Spanish (and viceversa) translation dictionary. 
  It can be used both in X and text mode and has a learning
diff -u i2e-0.5.1/debian/rules i2e-0.5.1/debian/rules
--- i2e-0.5.1/debian/rules
+++ i2e-0.5.1/debian/rules
@@ -22,7 +22,7 @@
rm -f build-stamp install-stamp
 
# Add here commands to clean up after the build process.
-   -$(MAKE) clean
+   $(MAKE) clean
 
dh_clean
 
@@ -34,7 +34,7 @@
dh_installdirs
 
# Add here commands to install the package into debian/tmp.
-   $(MAKE) install DESTDIR=`pwd`/debian/tmp
+   $(MAKE) install DESTDIR=$(CURDIR)/debian/i2e
 
touch install-stamp
 
diff -u i2e-0.5.1/debian/menu i2e-0.5.1/debian/menu
--- i2e-0.5.1/debian/menu
+++ i2e-0.5.1/debian/menu
@@ -1,6 +1,6 @@
 ?package(i2e):\
   needs=X11\
-  section=Apps/Text\
+  section=Applications/Text\
   description=English-Spanish dictionary\
   title=i2e\
   command=/usr/bin/i2e
diff -u i2e-0.5.1/i2e.c i2e-0.5.1/i2e.c
--- i2e-0.5.1/i2e.c
+++ i2e-0.5.1/i2e.c
@@ -262,21 +262,30 @@
   gtk_widget_show( subtabla );  
 
   /* widget para el texto de la traduccion en la subtabla */
-  datos.salida = gtk_text_new( NULL, NULL );
-  gtk_text_set_editable( GTK_TEXT( datos.salida ), FALSE );
-  gtk_text_set_word_wrap( GTK_TEXT( datos.salida ), FALSE );
+/* BDD */
+/*  datos.salida = gtk_text_new( NULL, NULL ); */
+  datos.salida = gtk_text_view_new();
+/* BDD */
+/*  gtk_text_set_editable( GTK_TEXT( datos.salida ), FALSE ); */
+/*  gtk_text_set_word_wrap( GTK_TEXT( datos.salida ), FALSE ); */
+  gtk_text_view_set_editable( GTK_TEXT_VIEW( datos.salida ), FALSE );
+  gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( datos.salida ), GTK_WRAP_WORD );
   gtk_table_attach_defaults( GTK_TABLE( subtabla ), datos.salida, 0, 1, 0, 1);
   gtk_widget_show( datos.salida );
 
   /* scroll horizontal en la subtabla */
-  barra = gtk_hscrollbar_new( GTK_TEXT( datos.salida )-hadj );
+/* BDD */
+/*  barra = gtk_hscrollbar_new( GTK_TEXT( datos.salida )-hadj ); */
+  barra = gtk_hscrollbar_new( GTK_TEXT_VIEW( datos.salida )-hadjustment );
   GTK_WIDGET_UNSET_FLAGS( GTK_HSCROLLBAR( barra ), GTK_CAN_FOCUS );
   gtk_table_attach( GTK_TABLE( subtabla ), barra, 0, 1, 1, 2,
   GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0 );
   gtk_widget_show( barra ); 
 
   /* scroll vertical en la subtabla */
-  barra = gtk_vscrollbar_new( GTK_TEXT( datos.salida )-vadj );
+/* BDD */
+/*  barra = gtk_vscrollbar_new( GTK_TEXT( datos.salida )-vadj ); */
+  barra = gtk_vscrollbar_new( GTK_TEXT_VIEW( datos.salida )-vadjustment );
   GTK_WIDGET_UNSET_FLAGS( GTK_VSCROLLBAR( barra ), GTK_CAN_FOCUS );
   gtk_table_attach( GTK_TABLE( subtabla ), barra, 1, 2, 0, 1,
   GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0 );
diff -u i2e-0.5.1/Makefile i2e-0.5.1/Makefile
--- i2e-0.5.1/Makefile
+++ i2e-0.5.1/Makefile
@@ -9,22 +9,22 @@
 OBJS = i2e.o traduce.o mensaje.o aprende.o funciones.o
 
 i2e :  po/es.mo $(OBJS) Makefile
-   $(CC) $(CFLAG) $(OBJS) -o i2e `gtk-config --libs`
+   $(CC) $(CFLAG) $(OBJS) -o i2e `pkg-config --libs gtk+-2.0`
 
 i2e.o : i2e.c i2e.h 
-   $(CC) $(CFLAG) -c i2e.c -o i2e.o `gtk-config --cflags`
+   $(CC) $(CFLAG) -c i2e.c -o i2e.o `pkg-config --cflags gtk+-2.0`
 
 traduce.o : traduce.c i2e.h
-   $(CC) $(CFLAG) -c traduce.c -o traduce.o `gtk-config --cflags`
+   $(CC) $(CFLAG) -c traduce.c -o traduce.o `pkg-config --cflags gtk+-2.0`
 
 mensaje.o : mensaje.c i2e.h
-   $(CC) $(CFLAG) -c mensaje.c -o mensaje.o `gtk-config --cflags`
+   $(CC) $(CFLAG) -c mensaje.c -o 

Bug#515323: Depends on GTK 1.2

2009-02-15 Thread Moritz Muehlenhoff
Package: i2e
Severity: serious

i2e build-depends on libgtk1.2-dev, which will be removed for Squeeze.

Please port it to GTK 2 or request it's removal.

Cheers,
Moritz

-- System Information:
Debian Release: 5.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=C, lc_ctype=de_de.iso-8859...@euro (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash

Versions of packages i2e depends on:
ii  gettext   0.17-6 GNU Internationalization utilities
ii  libc6 2.7-18 GNU C Library: Shared libraries
ii  libglib1.2ldbl1.2.10-19  The GLib library of C routines
pn  libgtk1.2 none (no description available)
ii  libx11-6  2:1.1.5-2  X11 client-side library
ii  libxext6  2:1.0.4-1  X11 miscellaneous extension librar
ii  libxi62:1.1.4-1  X11 Input extension library

i2e recommends no packages.

i2e suggests no packages.



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#515323: Depends on GTK 1.2

2009-02-15 Thread Javier Fernández-Sanguino Peña

tags 515323 help
thanks

On Sun, Feb 15, 2009 at 05:24:52PM +0100, Moritz Muehlenhoff wrote:
 i2e build-depends on libgtk1.2-dev, which will be removed for Squeeze.

I will look at it, the maintainer is not updating this software any
more and I'm not a GTK wizard, so help in porting this would be appreciated.

Regards

Javier


signature.asc
Description: Digital signature