diff -Nru xcfa-5.0.2/debian/changelog xcfa-5.0.2/debian/changelog --- xcfa-5.0.2/debian/changelog 2022-01-29 01:43:32.000000000 +0000 +++ xcfa-5.0.2/debian/changelog 2023-10-29 11:00:37.000000000 +0000 @@ -1,3 +1,15 @@ +xcfa (5.0.2-4~ppa~mantic) mantic; urgency=medium + + * No-change-rebuild for mantic. + + -- tomx3 Sun, 29 Oct 2023 13:00:37 +0200 + +xcfa (5.0.2-3~ppa~lunar) lunar; urgency=medium + + * Add gnudb-fix. + + -- tomx3 Mon, 01 May 2023 15:14:23 +0200 + xcfa (5.0.2-2) unstable; urgency=medium * Team upload. diff -Nru xcfa-5.0.2/debian/control xcfa-5.0.2/debian/control --- xcfa-5.0.2/debian/control 2022-01-29 00:32:26.000000000 +0000 +++ xcfa-5.0.2/debian/control 2023-05-01 13:15:37.000000000 +0000 @@ -1,9 +1,7 @@ Source: xcfa Section: sound Priority: optional -Maintainer: Debian Multimedia Maintainers -Uploaders: - Alessio Treglia , +Maintainer: tomx3 Build-Depends: debhelper-compat (= 13), libasound2-dev, @@ -13,8 +11,6 @@ libvte-2.91-dev, Standards-Version: 4.6.0 Homepage: http://www.xcfa.tuxfamily.org/ -Vcs-Git: https://salsa.debian.org/multimedia-team/xcfa.git -Vcs-Browser: https://salsa.debian.org/multimedia-team/xcfa Package: xcfa Architecture: any diff -Nru xcfa-5.0.2/debian/patches/0002-gnudb.patch xcfa-5.0.2/debian/patches/0002-gnudb.patch --- xcfa-5.0.2/debian/patches/0002-gnudb.patch 1970-01-01 00:00:00.000000000 +0000 +++ xcfa-5.0.2/debian/patches/0002-gnudb.patch 2021-04-03 19:14:23.000000000 +0000 @@ -0,0 +1,119 @@ +Binärdateien a/po/es.gmo und b/po/es.gmo sind verschieden. +diff -upr a/po/es.po b/po/es.po +--- a/po/es.po 2015-05-16 14:51:07.000000000 +0200 ++++ b/po/es.po 2021-04-03 21:10:34.000000000 +0200 +@@ -1483,7 +1483,7 @@ msgstr " *.m3u et xspf: " + + #: glade/xcfa.glade:1287 + msgid "Editing tags Freedb" +-msgstr " Cambio de etiquetas de freedb " ++msgstr " Cambio de etiquetas de gnudb " + + #: glade/xcfa.glade:1302 + msgid "" +diff -upr a/src/cd_audio.c b/src/cd_audio.c +--- a/src/cd_audio.c 2015-02-07 17:33:06.000000000 +0100 ++++ b/src/cd_audio.c 2021-04-03 21:11:00.000000000 +0200 +@@ -2461,7 +2461,7 @@ void on_button_applique_change_clicked ( + // + void on_cdaudio_combobox_serveur_cd_realize (GtkWidget *widget, gpointer user_data) + { +- gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Auto: freedb"); ++ gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Auto: gnudb"); + gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Param CDDB"); + gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT(widget), "Param PROXY"); + +@@ -2488,7 +2488,7 @@ void on_button_init_cddp_clicked (GtkBut + if (NULL != Config.entry_cddp_server) { + g_free (Config.entry_cddp_server); Config.entry_cddp_server = NULL; + } +- Config.entry_cddp_server = g_strdup ("freedb.org"); ++ Config.entry_cddp_server = g_strdup ("gnudb.gnudb.org"); + gtk_entry_set_text (GTK_ENTRY(GTK_WIDGET(GLADE_GET_OBJECT("entry_cddb_server"))), Config.entry_cddp_server); + + } else if( SERVER_PROXY_PARAM == Config.ServeurCddb ) { +@@ -2545,7 +2545,7 @@ void on_combobox_serveur_cd_changed (Gtk + void on_entry_cddp_server_realize (GtkWidget *widget, gpointer user_data) + { + if (NULL == Config.entry_cddp_server) { +- Config.entry_cddp_server = g_strdup ("freedb.org"); ++ Config.entry_cddp_server = g_strdup ("gnudb.gnudb.org"); + } + if (NULL == Config.entry_proxy_server) { + Config.entry_proxy_server = g_strdup ("10.0.0.1"); +@@ -2573,7 +2573,7 @@ void on_entry_cddp_server_changed( GtkEd + g_free( Config.entry_cddp_server ); Config.entry_cddp_server = NULL; + } + if( *PtrServeur == '\0' ) { +- Config.entry_cddp_server = g_strdup ("freedb.org"); ++ Config.entry_cddp_server = g_strdup ("gnudb.gnudb.org"); + } else { + Config.entry_cddp_server = g_strdup ( PtrServeur ); + } +diff -upr a/src/cd_curl.c b/src/cd_curl.c +--- a/src/cd_curl.c 2015-02-05 19:19:13.000000000 +0100 ++++ b/src/cd_curl.c 2021-04-03 21:05:54.000000000 +0200 +@@ -70,7 +70,7 @@ + pour la valeur DiscId ( par exemple 6f11b918 ) + et la chaine complete a passer en parametre pour CURL: + +- ! http://freedb.org/~cddb/cddb.cgi?cmd=cddb+query+6f11b918+24+150+20835+32512+47955+62530+74420+89332+100575+113692+126522+133245+145330+159460+170647+186450+199462+219450+233727+247745+262270+276072+288807+310705+325995+4539&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6 ++ ! https://gnudb.gnudb.org/~cddb/cddb.cgi?cmd=cddb+query+6f11b918+24+150+20835+32512+47955+62530+74420+89332+100575+113692+126522+133245+145330+159460+170647+186450+199462+219450+233727+247745+262270+276072+288807+310705+325995+4539&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6 + + -- recuperation ( si disponibles ! ) des datas 210 pour le menu pop-up qui permettra un choix des autres bases: + +@@ -85,7 +85,7 @@ + + -- recup du complement d'informations de la base avec: + +- ! http://freedb.org/~cddb/cddb.cgi?cmd=cddb+read+jazz+6f11b918&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6 ++ ! https://gnudb.gnudb.org/~cddb/cddb.cgi?cmd=cddb+read+jazz+6f11b918&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6 + + -- Utilisation de: + +@@ -485,8 +485,8 @@ GString *CdCurl_make_line_request_for_qu + GString *Gstr = g_string_new( NULL ); + g_string_append_printf( + Gstr, +- // http://freedb.org/~cddb/cddb.cgi?cmd=cddb+query+6f11b918+24+150+20835+32512+47955+62530+74420+89332+100575+113692+126522+133245+145330+159460+170647+186450+199462+219450+233727+247745+262270+276072+288807+310705+325995+4539&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6 +- "http://freedb.org/~cddb/cddb.cgi?cmd=cddb+query+%s+%s&hello=private+free.the.cddb+%s+%s&proto=6", ++ // https://gnudb.gnudb.org/~cddb/cddb.cgi?cmd=cddb+query+6f11b918+24+150+20835+32512+47955+62530+74420+89332+100575+113692+126522+133245+145330+159460+170647+186450+199462+219450+233727+247745+262270+276072+288807+310705+325995+4539&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6 ++ "https://gnudb.gnudb.org/~cddb/cddb.cgi?cmd=cddb+query+%s+%s&hello=private+free.the.cddb+%s+%s&proto=6", + p_StrDiscID, + p_GStrCdDiscID, + PACKAGE, +@@ -501,8 +501,8 @@ GString *CdCurl_make_line_request_for_re + GString *Gstr = g_string_new( NULL ); + g_string_append_printf( + Gstr, +- // "http://freedb.org/~cddb/cddb.cgi?cmd=cddb+read+jazz+6f11b918&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6", +- "http://freedb.org/~cddb/cddb.cgi?cmd=cddb+read+%s+%s&hello=private+free.the.cddb+%s+%s&proto=6", ++ // "https://gnudb.gnudb.org/~cddb/cddb.cgi?cmd=cddb+read+jazz+6f11b918&hello=private+free.the.cddb+xcfa+4.0.4~beta7&proto=6", ++ "https://gnudb.gnudb.org/~cddb/cddb.cgi?cmd=cddb+read+%s+%s&hello=private+free.the.cddb+%s+%s&proto=6", + p_MusicType, + p_StrDiscID, + PACKAGE, +diff -upr a/src/cd_curl.h b/src/cd_curl.h +--- a/src/cd_curl.h 2015-01-21 22:51:41.000000000 +0100 ++++ b/src/cd_curl.h 2021-04-03 21:11:29.000000000 +0200 +@@ -31,7 +31,7 @@ + #include + + typedef enum { +- SERVER_CDDB_DEFAULT = 0, // freedb.org ++ SERVER_CDDB_DEFAULT = 0, // gnudb.gnudb.org + SERVER_CDDB_PARAM, // CDDB: NAME + SERVER_PROXY_PARAM // PROXY: NAME and PORT + } SERVER_CDDB; +diff -upr a/src/configuser.c b/src/configuser.c +--- a/src/configuser.c 2015-03-03 11:24:54.000000000 +0100 ++++ b/src/configuser.c 2021-04-03 21:09:10.000000000 +0200 +@@ -795,7 +795,7 @@ void config_save( void ) + fprintf( fp, "STRING_EXPANDER_MAC = %s\n", Config.StringExpanderMac ? Config.StringExpanderMac : "" ); + fprintf( fp, "STRING_EXPANDER_WAVPACK = %s\n", Config.StringExpanderWavpack ? Config.StringExpanderWavpack : "" ); + fprintf( fp, "SERVER_FREE_CDDB = %d\n", Config.ServeurCddb ); +- fprintf( fp, "STRING_ENTRY_CDDP_SERVER = %s\n", Config.entry_cddp_server != NULL ? Config.entry_cddp_server : "freedb.org" ); ++ fprintf( fp, "STRING_ENTRY_CDDP_SERVER = %s\n", Config.entry_cddp_server != NULL ? Config.entry_cddp_server : "gnudb.gnudb.org" ); + fprintf( fp, "STRING_ENTRY_PROXY_SERVER = %s\n", Config.entry_proxy_server != NULL ? Config.entry_proxy_server : "10.0.0.1" ); + fprintf( fp, "STRING_ENTRY_PROXY_PORT = %s\n", Config.entry_proxy_port != NULL ? Config.entry_proxy_port : "8080" ); + fprintf( fp, "STRING_NAME_FILE_M3U_XSPF = %s\n", Config.StringNameFile_m3u_xspf ? Config.StringNameFile_m3u_xspf : "" ); diff -Nru xcfa-5.0.2/debian/patches/series xcfa-5.0.2/debian/patches/series --- xcfa-5.0.2/debian/patches/series 2022-01-29 01:43:28.000000000 +0000 +++ xcfa-5.0.2/debian/patches/series 2023-05-01 13:15:37.000000000 +0000 @@ -1 +1,2 @@ 0001-fix-configure.ac.patch +0002-gnudb.patch diff -Nru xcfa-5.0.2/debian/rules xcfa-5.0.2/debian/rules --- xcfa-5.0.2/debian/rules 2022-01-29 01:40:32.000000000 +0000 +++ xcfa-5.0.2/debian/rules 2023-05-01 13:15:37.000000000 +0000 @@ -12,4 +12,4 @@ dh_installchangelogs ChangeLog override_dh_strip: - dh_strip --dbgsym-migration='xcfa-dbg (<< 5.0.2-2~)' + dh_strip --dbgsym-migration='xcfa-dbg (<< 5.0.2-4~)'