diff -u youtranslate-1.1.9/debian/changelog youtranslate-1.1.9/debian/changelog --- youtranslate-1.1.9/debian/changelog +++ youtranslate-1.1.9/debian/changelog @@ -1,3 +1,20 @@ +youtranslate (1.1.9-0ubuntu1.7.10.1) hardy; urgency=low + + * Stable Release Upgrade (LP: #239719): + - Add dpatch. + - Fix FTBFS: + - Replace "mono-gmcs" build-dependency with "mono-mcs". + - debian/patches/02_fix_ftbfs.dpatch: + - Replace gtk-sharp with gtk-sharp-2.0 and glade-sharp with + glade-sharp-2.0 in Makefile.youtranslate, as else it won't + find their .pc files. + - debian/patches/01_update-service-providers.dpatch: + - Update the service provider information as the websites changed + and this program didn't work anymore, and remove WordLingo and + Systran because they can't be used over GET anymore (LP: #236483). + + -- Siegfried-Angel Gevatter Pujals Fri, 04 Jul 2008 01:10:18 +0200 + youtranslate (1.1.9-0ubuntu1) gutsy; urgency=low * Initial release - orig tarball remade in order to add COPYING.lib file diff -u youtranslate-1.1.9/debian/rules youtranslate-1.1.9/debian/rules --- youtranslate-1.1.9/debian/rules +++ youtranslate-1.1.9/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 - +include /usr/share/dpatch/dpatch.make CFLAGS = -Wall -g @@ -22,7 +22,7 @@ build: build-stamp -build-stamp: +build-stamp: patch-stamp dh_testdir # Add here commands to compile the package. @@ -32,7 +32,8 @@ touch $@ -clean: +clean: clean1 unpatch +clean1: dh_testdir dh_testroot rm -f build-stamp configure-stamp diff -u youtranslate-1.1.9/debian/control youtranslate-1.1.9/debian/control --- youtranslate-1.1.9/debian/control +++ youtranslate-1.1.9/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Cyril LAVIER -Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2.0-cil, libgtk2.0-cil, mono-gmcs (>=1.1.8) | c-sharp-2.0-compiler, cli-common-dev (>= 0.4.4) +Build-Depends: debhelper (>= 5), libgtk2.0-dev, libglade2.0-cil, libgtk2.0-cil, mono-mcs (>= 1.1.8), cli-common-dev (>= 0.4.4), dpatch Standards-Version: 3.7.2 Package: youtranslate reverted: --- youtranslate-1.1.9/Makefile.youtranslate +++ youtranslate-1.1.9.orig/Makefile.youtranslate @@ -35,8 +35,8 @@ RESOURCES_BUILD = $(foreach res,$(RESOURCES), $(addprefix -resource:,$(res)),$(notdir $(res))) PKG_REFERENCES = \ +gtk-sharp \ +glade-sharp -gtk-sharp-2.0 \ -glade-sharp-2.0 PKG_REFERENCES_BUILD = $(addprefix -pkg:, $(PKG_REFERENCES)) reverted: --- youtranslate-1.1.9/youtranslate.exe.config +++ youtranslate-1.1.9.orig/youtranslate.exe.config @@ -1,3 +0,0 @@ - - - only in patch2: unchanged: --- youtranslate-1.1.9.orig/debian/patches/01_update-service-providers.dpatch +++ youtranslate-1.1.9/debian/patches/01_update-service-providers.dpatch @@ -0,0 +1,360 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_update-service-providers.dpatch by Siegfried-A. Gevatter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Update the service provider information as the websites changed +## DP: and this program didn't work anymore, and remove WordLingo and +## DP: Systran because they can't be used over GET anymore (LP: #236483). + +@DPATCH@ +diff -urNad youtranslate-1.1.9~/yTLargeTRanslator.cs youtranslate-1.1.9/yTLargeTRanslator.cs +--- youtranslate-1.1.9~/yTLargeTRanslator.cs 2006-11-05 14:09:59.000000000 +0100 ++++ youtranslate-1.1.9/yTLargeTRanslator.cs 2008-07-04 01:32:06.000000000 +0200 +@@ -35,9 +35,6 @@ + [Widget] Gtk.Image imgLogo; + [Widget] Gtk.RadioButton radioProvider1; + [Widget] Gtk.RadioButton radioProvider2; +- [Widget] Gtk.RadioButton radioProvider3; +- [Widget] Gtk.RadioButton radioProvider4; +- [Widget] Gtk.RadioButton radioProvider5; + [Widget] Gtk.CheckButton chkStartIco; + [Widget] Gtk.CheckButton chkAllDesk; + //private yTService currentService; +@@ -86,15 +83,6 @@ + case 2: + radioProvider2.Active = true; + break; +- case 3: +- radioProvider3.Active = true; +- break; +- case 4: +- radioProvider4.Active = true; +- break; +- case 5: +- radioProvider5.Active = true; +- break; + } + } + +@@ -108,9 +96,6 @@ + cmdCancel.Clicked+=buttonHandler; + radioProvider1.Clicked+=radioHandler; + radioProvider2.Clicked+=radioHandler; +- radioProvider3.Clicked+=radioHandler; +- radioProvider4.Clicked+=radioHandler; +- radioProvider5.Clicked+=radioHandler; + chkStartIco.Toggled+=checkHandler; + chkAllDesk.Toggled+=checkHandler; + imgLogo.FromPixbuf = new Gdk.Pixbuf(null,"yTLogo.png"); +@@ -131,9 +116,6 @@ + RadioButton b = (RadioButton) o; + if(b==radioProvider1) selectedProvider=1; + else if(b==radioProvider2) selectedProvider=2; +- else if(b==radioProvider3)selectedProvider=3; +- else if(b==radioProvider4)selectedProvider=4; +- else if(b==radioProvider5)selectedProvider=5; + } + + +@@ -149,4 +131,4 @@ + } + + +-} +\ No newline at end of file ++} +diff -urNad youtranslate-1.1.9~/yTProvider.cs youtranslate-1.1.9/yTProvider.cs +--- youtranslate-1.1.9~/yTProvider.cs 2006-11-05 14:09:59.000000000 +0100 ++++ youtranslate-1.1.9/yTProvider.cs 2008-07-04 01:35:21.000000000 +0200 +@@ -25,10 +25,7 @@ + ID | Name + -------------------------- + 1 | Google +- 2 | BabelFish (Altavista) +- 3 | Systran +- 4 | WorldLingo +- 5 | Babel Fish (Yahoo) ++ 2 | Yahoo! Babel Fish + -------------------------- + */ + +@@ -63,18 +60,34 @@ + _MainUrl = "http://www.google.com"; + _LangSep = "|"; + _OpenTag1 = ""; + _AvailableServices = "zh_en#nl_en#nl_fr#fr_en#fr_de#fr_el#"+ + "fr_it#fr_pt#fr_nl#fr_es#de_en#de_fr#"+ + "el_en#el_fr#it_en#it_fr#ja_en#ko_en#"+ +@@ -82,68 +95,6 @@ + "en_nl#en_fr#en_de#en_el#en_it#en_ja#"+ + "en_ko#en_pt#en_ru#en_es"; + break; +- case 3: // Systran +- _Name = "Systran"; +- _MainUrl = "http://www.systranbox.com"; +- _LangSep = "_"; +- _OpenTag1 = "translation"; +- _OpenTag2 = "ual\">"; +- _CloseTag = ""; +- _AvailableServices = "zh_en#nl_en#nl_fr#fr_en#fr_de#fr_el#"+ +- "fr_it#fr_pt#fr_nl#fr_es#de_en#de_fr#"+ +- "el_en#el_fr#it_en#it_fr#ja_en#ko_en#"+ +- "pt_en#pt_fr#ru_en#es_en#es_fr#en_zh#"+ +- "en_nl#en_fr#en_de#en_el#en_it#en_ja#"+ +- "en_ko#en_pt#en_ru#en_es#sv_en#ar_en#"+ +- "en_sv#en_ar"; +- break; +- case 4: // WorldLingo +- _Name = "WorldLingo"; +- _MainUrl = "http://www.WorldLingo.com"; +- _LangSep = "_"; +- _OpenTag1 = "wl_result"; +- _OpenTag2 = ">"; +- _CloseTag = ""; +- _AvailableServices = "en_zh#en_nl#en_fr#en_de#en_el#en_it#"+ +- "en_ja#en_ko#en_pt#en_ru#en_es#"+ +- "zh_en#zh_nl#zh_fr#zh_de#zh_el#zh_it#"+ +- "zh_ja#zh_ko#zh_pt#zh_ru#zh_es#"+ +- "nl_en#nl_zh#nl_fr#nl_de#nl_el#nl_it#"+ +- "nl_ja#nl_ko#nl_pt#nl_ru#nl_es#"+ +- "fr_en#fr_zh#fr_nl#fr_de#fr_el#fr_it#"+ +- "fr_ja#fr_ko#fr_pt#fr_ru#fr_es#"+ +- "de_en#de_zh#de_nl#de_fr#de_el#de_it#"+ +- "de_ja#de_ko#de_pt#de_ru#de_es#"+ +- "el_en#el_zh#el_nl#el_fr#el_de#el_it#"+ +- "el_ja#el_ko#el_pt#el_ru#el_es#"+ +- "it_en#it_zh#it_nl#it_fr#it_de#it_el#"+ +- "it_ja#it_ko#it_pt#it_ru#it_es#"+ +- "ja_en#ja_zh#ja_nl#ja_fr#ja_de#ja_el#"+ +- "ja_it#ja_ko#ja_pt#ja_ru#ja_es#"+ +- "ko_en#ko_zh#ko_nl#ko_fr#ko_de#ko_el#"+ +- "ko_it#ko_ja#ko_pt#ko_ru#ko_es#"+ +- "pt_en#pt_zh#pt_nl#pt_fr#pt_de#pt_el#"+ +- "pt_it#pt_ja#pt_ko#pt_ru#pt_es#"+ +- "ru_en#ru_zh#ru_nl#ru_fr#ru_de#ru_el#"+ +- "ru_it#ru_ja#ru_ko#ru_pt#ru_es#"+ +- "es_en#es_zh#es_nl#es_fr#es_de#es_el#"+ +- "es_it#es_ja#es_ko#es_pt#es_ru"; +- break; +- case 5: // BabelFish (Yahoo) +- _Name = "BabelFish Yahoo"; +- _MainUrl = "http://it.search.yahoo.com"; +- _LangSep = "_"; +- _OpenTag1 = ""; +- _AvailableServices = "zh_en#en_zh#en_nl#en_fr#en_de#en_el#"+ +- "en_it#en_ja#en_ko#en_pt#en_ru#en_es#"+ +- "nl_en#nl_fr#fr_nl#fr_en#fr_de#fr_el#"+ +- "fr_it#fr_pt#fr_es#de_en#de_fr#el_en#"+ +- "el_fr#it_en#it_fr#ja_en#ko_en#pt_en#"+ +- "pt_fr#ru_en#es_en#es_fr"; +- +- break; + } + } + +@@ -163,25 +114,13 @@ + string resUrl=_MainUrl; + switch(_ID) { + case 1: // Google +- resUrl+="/translate_t?text="+textToTransalte+ +- "&langpair="+langFrom+_LangSep+langTo+"&ie=utf8&oe=utf8"; +- break; +- case 2: // BabelFish (Altavista) +- resUrl+="/babelfish/tr?urltext="+textToTransalte+ +- "&lp="+langFrom+_LangSep+langTo+"&enc=utf8"; +- break; +- case 3: // Systran +- resUrl+="/systran/box?systran_charset=utf-8&ttype=text&systran_text="+textToTransalte+ +- "&systran_lp="+langFrom+_LangSep+langTo+""; ++ resUrl+="/translate_t?text="+textToTransalte+"&langpair="+ ++ langFrom+_LangSep+langTo+"&ie=utf8&oe=utf8"; + break; +- case 4: // WorldLingo +- resUrl+="/wl/translate?wl_text="+textToTransalte+ +- "&wl_srclang="+langFrom+"&wl_trglang="+langTo+"&wl_ucp=1"; +- break; +- case 5: // BabelFish (Yahoo) +- resUrl+="/language/translate?doit=done&tt=text&intl=1&text="+textToTransalte+ +- "&lp="+langFrom+_LangSep+langTo+""; +- break; ++ case 2: // Yahoo! Babel Fish ++ resUrl+="/translate_txt?ei=UTF-8&trtext="+textToTransalte+ ++ "&lp="+langFrom+_LangSep+langTo+""; ++ break; + } + return resUrl; + } +@@ -210,4 +149,4 @@ + } + // Public Properties :: end + +-} +\ No newline at end of file ++} +diff -urNad youtranslate-1.1.9~/yTToolWin.cs youtranslate-1.1.9/yTToolWin.cs +--- youtranslate-1.1.9~/yTToolWin.cs 2006-11-05 14:09:59.000000000 +0100 ++++ youtranslate-1.1.9/yTToolWin.cs 2008-07-04 01:36:04.000000000 +0200 +@@ -33,9 +33,6 @@ + [Widget] Gtk.Image imgLogo; + [Widget] Gtk.RadioButton radioProvider1; + [Widget] Gtk.RadioButton radioProvider2; +- [Widget] Gtk.RadioButton radioProvider3; +- // [Widget] Gtk.RadioButton radioProvider4; (G2.16) +- [Widget] Gtk.RadioButton radioProvider5; + [Widget] Gtk.SpinButton spinLarge; + [Widget] Gtk.CheckButton chkStartIco; + [Widget] Gtk.CheckButton chkAllDesk; +@@ -95,15 +92,6 @@ + case 2: + radioProvider2.Active = true; + break; +- case 3: +- radioProvider3.Active = true; +- break; +-/* case 4: +- radioProvider4.Active = true; +- break; +-*/ case 5: +- radioProvider5.Active = true; +- break; + } + } + +@@ -117,9 +105,6 @@ + cmdCancel.Clicked+=buttonHandler; + radioProvider1.Clicked+=radioHandler; + radioProvider2.Clicked+=radioHandler; +- radioProvider3.Clicked+=radioHandler; +- //radioProvider4.Clicked+=radioHandler; +- radioProvider5.Clicked+=radioHandler; + chkStartIco.Toggled+=checkHandler; + chkAllDesk.Toggled+=checkHandler; + imgLogo.FromPixbuf = new Gdk.Pixbuf(null,"yTLogo.png"); +@@ -140,9 +125,6 @@ + RadioButton b = (RadioButton) o; + if(b==radioProvider1) selectedProvider=1; + else if(b==radioProvider2) selectedProvider=2; +- else if(b==radioProvider3)selectedProvider=3; +- //else if(b==radioProvider4)selectedProvider=4; +- else if(b==radioProvider5)selectedProvider=5; + } + + private void buttonHandler(object o, EventArgs args){ +@@ -158,4 +140,4 @@ + } + + +-} +\ No newline at end of file ++} +diff -urNad youtranslate-1.1.9~/yTUserPrefs.cs youtranslate-1.1.9/yTUserPrefs.cs +--- youtranslate-1.1.9~/yTUserPrefs.cs 2006-11-05 14:09:59.000000000 +0100 ++++ youtranslate-1.1.9/yTUserPrefs.cs 2008-07-04 01:37:01.000000000 +0200 +@@ -62,6 +62,12 @@ + } + } + xr.Close(); ++ if (_providerID > 2) { ++ // Ensure that the provider still exists, as some were removed. ++ // If we wouldn't do this, many existing users would get a crash ++ // if they don't change the provider just after the update. ++ _providerID = 1; ++ } + } + catch(Exception e){ + saveBookmarks(true); +@@ -124,4 +130,4 @@ + } + // Public Properties :: end + +-} +\ No newline at end of file ++} +diff -urNad youtranslate-1.1.9~/yt.glade youtranslate-1.1.9/yt.glade +--- youtranslate-1.1.9~/yt.glade 2006-11-05 14:10:28.000000000 +0100 ++++ youtranslate-1.1.9/yt.glade 2008-07-04 01:31:20.000000000 +0200 +@@ -262,7 +262,7 @@ + + True + True +- BabelFish ++ Yahoo! Babel Fish + True + True + radioProvider1 +@@ -273,36 +273,6 @@ + 1 + + +- +- +- True +- True +- Systran +- True +- True +- radioProvider1 +- +- +- False +- False +- 2 +- +- +- +- +- True +- True +- BabelFish Yahoo +- True +- True +- radioProvider1 +- +- +- False +- False +- 3 +- +- + + + only in patch2: unchanged: --- youtranslate-1.1.9.orig/debian/patches/00list +++ youtranslate-1.1.9/debian/patches/00list @@ -0,0 +1,2 @@ +01_update-service-providers.dpatch +02_fix_ftbfs.dpatch only in patch2: unchanged: --- youtranslate-1.1.9.orig/debian/patches/02_fix_ftbfs.dpatch +++ youtranslate-1.1.9/debian/patches/02_fix_ftbfs.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_fix_ftbfs.dpatch by Siegfried-A. Gevatter +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch the Makefile so that it finds the required .pc files. + +@DPATCH@ +diff -urNad youtranslate-1.1.9~/Makefile.youtranslate youtranslate-1.1.9/Makefile.youtranslate +--- youtranslate-1.1.9~/Makefile.youtranslate 2006-10-30 14:01:54.000000000 +0100 ++++ youtranslate-1.1.9/Makefile.youtranslate 2008-07-04 01:47:09.000000000 +0200 +@@ -35,8 +35,8 @@ + RESOURCES_BUILD = $(foreach res,$(RESOURCES), $(addprefix -resource:,$(res)),$(notdir $(res))) + + PKG_REFERENCES = \ +-gtk-sharp \ +-glade-sharp ++gtk-sharp-2.0 \ ++glade-sharp-2.0 + + PKG_REFERENCES_BUILD = $(addprefix -pkg:, $(PKG_REFERENCES)) +