Package: xcdroast Version: 0.98+0alpha16-1.1 --- Please enter the report below this line. ---
--- System information. --- Architecture: i386 Kernel: Linux 2.6.32-5-686 Debian Release: squeeze/sid 500 unstable ftp.fr.debian.org --- Package information. --- Depends (Version) | Installed ==============================-+-============ debconf (>= 0.5) | 1.5.32 OR debconf-2.0 | libatk1.0-0 (>= 1.29.3) | 1.30.0-1 libc6 (>= 2.7) | 2.11.2-2 libcairo2 (>= 1.2.4) | 1.8.10-4 libfontconfig1 (>= 2.8.0) | 2.8.0-2.1 libfreetype6 (>= 2.2.1) | 2.3.11-1 libglib2.0-0 (>= 2.24.0) | 2.24.1-1 libgtk2.0-0 (>= 2.8.0) | 2.20.1-1 libpango1.0-0 (>= 1.14.0) | 1.28.1-1 wodim | 9:1.1.10-1 genisoimage (>= 4:2.0) | 9:1.1.10-1 icedax (>= 4:2.0) | 9:1.1.10-1 Package's Recommends field is empty. Suggests (Version) | Installed =========================-+-=========== cdparanoia | 3.10.2+debian-9
diff -ru debian/changelog debian.nmu/changelog --- debian/changelog 2010-07-11 23:55:30.000000000 +0200 +++ debian.nmu/changelog 2010-07-11 23:09:56.000000000 +0200 @@ -1,3 +1,14 @@ +xcdroast (0.98+0alpha16-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Updated patches removing fuzz and offsets. + * Restored patch 13_cdrecord_to_wodim.patch after adapting it to new upsteam + version 0.98+0alpha16. (Closes: Bug#523639, Bug#517411, Bug#526478) + * Removed patch 11__mkisofs_options.patch which was integrated by new upsteram + version 0.98+0alpha16. + + -- Abou Al Montacir <[email protected]> Sun, 11 Jul 2010 23:08:00 +0100 + xcdroast (0.98+0alpha16-1) unstable; urgency=low * New upstream version. diff -ru debian/patches/09_share_dir.patch debian.nmu/patches/09_share_dir.patch --- debian/patches/09_share_dir.patch 2010-07-11 23:55:30.000000000 +0200 +++ debian.nmu/patches/09_share_dir.patch 2010-07-11 20:55:23.000000000 +0200 @@ -8,7 +8,7 @@ diff -urNad trunk~/Makefile.in trunk/Makefile.in --- trunk~/Makefile.in 2006-05-06 15:54:43.000000000 +0200 +++ trunk/Makefile.in 2006-05-06 15:55:04.000000000 +0200 -@@ -108,6 +108,7 @@ +@@ -107,6 +107,7 @@ USE_NONROOTMODE = @USE_NONROOTMODE@ VERSION = @VERSION@ XCDRLIB_PREFIX = @XCDRLIB_PREFIX@ @@ -118,7 +118,7 @@ diff -urNad trunk~/src/Makefile.in trunk/src/Makefile.in --- trunk~/src/Makefile.in 2006-05-06 15:54:37.000000000 +0200 +++ trunk/src/Makefile.in 2006-05-06 15:55:04.000000000 +0200 -@@ -108,6 +108,7 @@ +@@ -107,6 +107,7 @@ USE_NONROOTMODE = @USE_NONROOTMODE@ VERSION = @VERSION@ XCDRLIB_PREFIX = @XCDRLIB_PREFIX@ @@ -126,7 +126,7 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ -@@ -134,7 +135,7 @@ +@@ -133,7 +134,7 @@ largefile.h language.h main.h xcdrdata.h xcdroast.h gettext.h @@ -135,7 +135,7 @@ xcdroast_LDFLAGS = $(EXTRA_LDFLAGS) xcdroast_LDADD = @LIBINTL@ @ALLOCA@ $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(AUDIO_LIBS) -@@ -159,7 +160,7 @@ +@@ -158,7 +159,7 @@ cddbtool_LDADD = $(GLIB_LIBS) xcdrwrap_SOURCES = xcdrwrap.c largefile.h xcdroast.h @@ -155,9 +155,9 @@ gchar rootconfig[MAXLINE]; gchar prefixdir[MAXLINE]; gint support_ontheflyaudio; -@@ -499,13 +500,13 @@ - gtk_exit(1); +@@ -486,13 +487,13 @@ } + dodebug(10, "Found version %s for %s\n", ver, CDDA2WAV); - g_snprintf(tmp,MAXLINE,"%s/%s", sharedir, WAVPLAY); + g_snprintf(tmp,MAXLINE,"%s/%s", libdir, WAVPLAY); @@ -173,7 +173,7 @@ check_executable(tmp,NULL,1); return isProDVD; -@@ -520,7 +521,7 @@ +@@ -507,7 +508,7 @@ gchar tmp[MAXLINE]; gint stat; @@ -182,7 +182,7 @@ check_executable(tmp,NULL,1); /* security check. If this fails then the wrapper is wrong */ -@@ -662,7 +663,7 @@ +@@ -649,7 +650,7 @@ nofail = 1; /* first check if the wrapper got the correct permissions */ @@ -191,7 +191,7 @@ wrap_uid = get_file_owner(tmp); wrap_gid = sgid_set(tmp); -@@ -764,7 +765,7 @@ +@@ -751,7 +752,7 @@ g_print("Options:\n"); g_print("\t-d <debug level>\n"); g_print("\t-c <config directory> (currently: %s)\n", configdir); @@ -200,7 +200,7 @@ /* g_print("\t-r <root config-file> (currently: %s)\n", rootconfig); */ g_print("\t-o : Disable multibyte font support\n"); g_print("\t-n : Disable cdrtools version check (use at own risk)\n"); -@@ -813,11 +814,17 @@ +@@ -800,11 +801,17 @@ writerreaderdevs = NULL; #ifdef PRE_LIBDIR @@ -221,7 +221,7 @@ #endif #ifdef CDRTOOLS_PREFIX -@@ -851,7 +858,7 @@ +@@ -838,7 +815,7 @@ break; */ case 'l': @@ -230,7 +230,7 @@ break; case 'a': -@@ -908,7 +915,7 @@ +@@ -895,7 +902,7 @@ dodebug(1, "debug level: %d\n", debug); dodebug(1, "configdir: %s\n", configdir); dodebug(1, "rootconfig: %s\n", rootconfig); @@ -250,7 +250,7 @@ extern gchar configdir[MAXLINE]; extern gchar prefixdir[MAXLINE]; extern GtkWidget *cddb_info_label; -@@ -7863,7 +7864,7 @@ +@@ -7860,7 +7861,7 @@ gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Deleting tracks...")); /* build of command line */ @@ -259,7 +259,7 @@ strcpy(cmd,orgcmd); length = g_list_length(delfiles); -@@ -8094,7 +8095,7 @@ +@@ -8091,7 +8092,7 @@ /* always verify in 512 bytes blocks */ g_snprintf(cmd2,MAXLINE,"%s/%s -b \"%s\" -", @@ -268,7 +268,7 @@ dodebug(1, "spawning: %s | %s\n",cmd,cmd2); dolog(2, "Verify data track %s\n", fname); -@@ -8224,7 +8225,7 @@ +@@ -8221,7 +8222,7 @@ strcpy(tmptmp,fname); g_snprintf(cmd2,MAXLINE,"%s/%s -a \"%s\" -", @@ -277,7 +277,7 @@ dodebug(1, "spawning: %s | %s\n",cmd,cmd2); dolog(2, "Verify audio track %s\n", fname); -@@ -8521,7 +8522,7 @@ +@@ -8518,7 +8519,7 @@ if (setupdata.cddb_use_http == 0) { g_snprintf(cmd,MAXLINE, "%s/%s -s \"%s\" -p %d -u \"%s\" -h \"%s\" -q \"%s\"", @@ -286,7 +286,7 @@ username, hostname, tmp); } else { /* we want to use http */ -@@ -8529,13 +8530,13 @@ +@@ -8526,13 +8527,13 @@ /* but no proxy */ g_snprintf(cmd,MAXLINE, "%s/%s -s \"%s\" -u \"%s\" -h \"%s\" -H -q \"%s\"", @@ -302,7 +302,7 @@ username, hostname, tmp_cddbproxy, setupdata.cddb_proxy_port, tmp); } -@@ -8593,8 +8594,8 @@ +@@ -8590,8 +8591,8 @@ FILE *fpin; /* allocate memory */ @@ -313,7 +313,7 @@ dodebug(1, "calling: %s\n", line); -@@ -10224,8 +10225,8 @@ +@@ -10226,8 +10227,8 @@ if (strncmp(line,"X-CD-Roast ", 11) == 0) { strcpy(xcdrver,line+11); } @@ -324,7 +324,7 @@ } if (strncmp(line,"prefixdir: ", 11) == 0) { strcpy(prefixver,line+11); -@@ -10254,9 +10255,9 @@ +@@ -10256,9 +10257,9 @@ tmp, xcdrver, XCDROAST_VERSION); ret = 1; } @@ -337,7 +337,7 @@ ret = 0; } if (strcmp(prefixver,prefixdir) != 0) { -@@ -10370,7 +10371,7 @@ +@@ -10372,7 +10373,7 @@ #endif /* set the correct permissions to the wrapper */ @@ -346,7 +346,7 @@ g_snprintf(tmp,MAXLINE,"%s root %s\n", cmd_chown, bin); strcat(ret,tmp); #if 0 -@@ -10456,7 +10457,7 @@ +@@ -10458,7 +10459,7 @@ } free_nonrootvalues(&nrs_vals); #endif @@ -411,7 +411,7 @@ diff -urNad trunk~/src/xcdroast.h trunk/src/xcdroast.h --- trunk~/src/xcdroast.h 2006-05-06 15:18:20.000000000 +0200 +++ trunk/src/xcdroast.h 2006-05-06 15:54:54.000000000 +0200 -@@ -174,6 +174,7 @@ +@@ -173,6 +173,7 @@ /* default paths/configfile */ #define PREFIX "/usr/local" #define LIBDIR "lib/xcdroast-0.98" @@ -430,7 +430,7 @@ static char prefixdir[MAXLINE]; static char rootconfig[MAXLINE]; static char username[MAXLINE]; -@@ -298,6 +299,7 @@ +@@ -294,6 +295,7 @@ } if (strncmp(cmd,"-V",MAXLINE) == 0) { printf("X-CD-Roast %s\n", XCDROAST_VERSION); @@ -438,7 +438,7 @@ printf("sharedir: %s\n", sharedir); printf("prefixdir: %s\n", prefixdir); -@@ -359,8 +361,8 @@ +@@ -353,8 +355,8 @@ return; } @@ -449,7 +449,7 @@ /* now check if this file does exist */ if (stat(ret,&buf) != 0) { -@@ -613,11 +615,13 @@ +@@ -607,11 +609,13 @@ seen_device_spec = 0; #ifdef PRE_LIBDIR @@ -497,16 +497,3 @@ strncpy(ret, tmp, MAXLINE); return ret; -@@ -2394,10 +2395,10 @@ - - /* use DVD version if installed and media type > 1GB */ - if (curset.isProDVD && curset.cdrtype > 1000) { -- g_snprintf(tmp,MAXLINE,"%s/%s %s", sharedir, WRAPPER, -+ g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, - "CDRECORDPRODVD"); - } else { -- g_snprintf(tmp,MAXLINE,"%s/%s %s", sharedir, WRAPPER, -+ g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, - "CDRECORD"); - } - strncpy(ret, tmp, MAXLINE); Seulement dans debian/patches: 11_mkisofs_options.patch Seulement dans debian/patches: 12_cdrecord_versions.patch diff -ru debian/patches/13_cdrecord_to_wodim.patch debian.nmu/patches/13_cdrecord_to_wodim.patch --- debian/patches/13_cdrecord_to_wodim.patch 2010-07-11 23:55:30.000000000 +0200 +++ debian.nmu/patches/13_cdrecord_to_wodim.patch 2010-07-11 23:37:54.000000000 +0200 @@ -67,8 +67,8 @@ fill_session_available(); /* force recalc of session size if dvd */ /* so he will get the multisession warning */ -- if (curset.cdrtype >= 1000 && curset.isProDVD == 1 && curset.multisession == 1) { -+ if (curset.cdrtype >= 1000 && curset.isDVD == 1 && curset.multisession == 1) { +- if (curset.cdrtype >= 1000 && ( curset.isProDVD & 1 ) && curset.multisession == 1) { ++ if (curset.cdrtype >= 1000 && ( curset.isDVD & 1 ) && curset.multisession == 1) { set_sessionsize_unknown(); } break; @@ -230,47 +230,27 @@ gchar ver[MAXLINE]; gchar link[MAXLINE]; gint stat; --gint out, isProDVD; -+gint out, isDVD; +-gint isProDVD; ++gint isDVD; - isProDVD = 0; + isDVD = 0; check_executable(UNAME,UNAME2,0); check_executable(DF,DF2,0); -@@ -417,7 +421,7 @@ +@@ -415,9 +419,9 @@ + dodebug(3, "%s is a link to %s\n", tmp, link); + #endif } - stat = check_version_cdrecord(CDRECORD_VERSION, 0, ver, &out); +- stat = check_version_cdrecord(CDRECORD_VERSION, ver, &isProDVD); ++ stat = check_version_cdrecord(CDRECORDDVD_VERSION, ver, &isDVD); if (stat == 1 && !noversioncheck) { - g_warning("Invalid cdrecord version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORD_VERSION); -+ g_warning("Invalid " CDRECORD_NAME " version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORD_VERSION); ++ g_warning("Invalid " CDRECORD_NAME " version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORDDVD_VERSION); gtk_exit(1); } if (stat == 2) { -@@ -425,8 +429,8 @@ - gtk_exit(1); - } - -- /* check optional installation of ProDVD version */ -- get_spawn_path(CDRECORDPRODVD,tmp); -+ /* check optional installation of (Pro)DVD version */ -+ get_spawn_path(CDRECORDDVD,tmp); - if (is_file(tmp)) { - if (check_islink(tmp, link)) { - #if 0 -@@ -435,9 +439,9 @@ - dodebug(3, "%s is a link to %s\n", tmp, link); - #endif - } -- stat = check_version_cdrecord(CDRECORD_PRODVD_VERSION, 1, ver, &isProDVD); -+ stat = check_version_cdrecord(CDRECORDDVD_VERSION, 1, ver, &isDVD); - if (stat == 1 && !noversioncheck) { -- g_warning("Invalid cdrecord-ProDVD version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORD_PRODVD_VERSION); -+ g_warning("Invalid " CDRECORDDVD_NAME " version %s found.\n\tExpecting at least version %s\n\tStart xcdroast with the -n option to override (not recommended!)", ver, CDRECORDDVD_VERSION); - gtk_exit(1); - } - } -@@ -509,7 +513,7 @@ +@@ -496,7 +500,7 @@ g_snprintf(tmp,MAXLINE,"%s/%s", libdir, CDDBTOOL); check_executable(tmp,NULL,1); @@ -279,7 +259,7 @@ } -@@ -702,7 +706,7 @@ +@@ -689,7 +693,7 @@ } /* check prodvd only when it is installed */ @@ -288,17 +268,16 @@ if (is_file(tmp)) { if (check_nonroot_mode_cdrtools(tmp) == 0) { nofail = 0; -@@ -769,7 +773,8 @@ +@@ -756,7 +760,7 @@ /* g_print("\t-r <root config-file> (currently: %s)\n", rootconfig); */ g_print("\t-o : Disable multibyte font support\n"); g_print("\t-n : Disable cdrtools version check (use at own risk)\n"); - g_print("\t-w : Don't use cdrecord-ProDVD, even when it is available.\n"); -+ if (strcmp(CDRECORD, CDRECORDDVD)) -+ g_print("\t-w : Don't use " CDRECORDDVD_NAME ", even when it is available.\n"); ++ g_print("\t-w : Don't use " CDRECORDDVD_NAME ", even when it is available.\n"); #if (defined(__MACH__) && defined(__APPLE__)) g_print("\t-a : Don't display the autodiskmount daemon handling at startup\n"); #else -@@ -797,7 +802,7 @@ +@@ -784,7 +888,7 @@ gchar *p1; gchar *alt_dev_string; gint c, usercnf, stat; @@ -307,7 +286,7 @@ if (!language) language = g_strdup(""); -@@ -807,7 +812,7 @@ +@@ -794,7 +798,7 @@ no_versioncheck = 0; support_ontheflyaudio = 0; c_locale_is_utf8 = 0; @@ -316,7 +295,7 @@ alt_dev_string = NULL; strncpy(configdir, CONFIGDIR, MAXLINE); g_snprintf(rootconfig, MAXLINE, "%s/%s", SYSCONFDIR, ROOTCONFIG); -@@ -874,7 +879,7 @@ +@@ -861,7 +865,7 @@ break; case 'w': @@ -325,7 +304,7 @@ break; case 'f': -@@ -974,17 +979,19 @@ +@@ -961,17 +965,17 @@ #endif dodebug(3, "Checking for helper binaries (noversioncheck = %d)\n", no_versioncheck); @@ -336,25 +315,21 @@ - if (ignoreProDVD) { - isProDVD = 0; - dodebug(1,"-> cdrecord.ProDVD detected but disabled\n"); -- } else { ++ if (isDVD) { ++ if (ignoreDVD) { ++ isDVD = 0; ++ dodebug(1,"-> " CDRECORDDVD_NAME " detected but disabled\n"); + } else { - dodebug(1,"-> cdrecord.ProDVD detected\n"); -+ if (strcmp(CDRECORD, CDRECORDDVD)) { -+ if (isDVD) { -+ if (ignoreDVD) { -+ isDVD = 0; -+ dodebug(1,"-> " CDRECORDDVD_NAME " detected but disabled\n"); -+ } else { -+ dodebug(1,"-> " CDRECORDDVD_NAME " detected\n"); -+ } -+ } else { -+ dodebug(1,"-> " CDRECORDDVD_NAME " not detected\n"); - } -- } else { ++ dodebug(1,"-> " CDRECORDDVD_NAME " detected\n"); + } + } else { - dodebug(1,"-> cdrecord.ProDVD not detected\n"); ++ dodebug(1,"-> " CDRECORDDVD_NAME " not detected\n"); } if (support_ontheflyaudio == 1) { dodebug(1, " Enabled support for on-the-fly audio\n"); -@@ -1025,7 +1032,7 @@ +@@ -1012,7 +1016,7 @@ tocfiles = (GList *) NULL; strcpy(xcdroast_version_loaded, ""); @@ -363,7 +338,7 @@ curset.support_ontheflyaudio = support_ontheflyaudio; /* load iso-options if available */ -@@ -1146,7 +1153,8 @@ +@@ -1133,7 +1137,8 @@ } #endif @@ -373,7 +348,7 @@ /* set key if we got one from the config-file */ if (strcmp(setupdata.ProDVDkey,"")) { -@@ -1159,6 +1167,7 @@ +@@ -1146,6 +1151,7 @@ #endif } } @@ -385,7 +360,7 @@ =================================================================== --- src/io.c.orig 2006-12-10 12:00:08.000000000 +0100 +++ src/io.c 2006-12-10 12:01:12.000000000 +0100 -@@ -694,7 +694,7 @@ +@@ -704,7 +704,7 @@ strncpy(tmp2,dev,MAXLINE); convert_escape(tmp2); @@ -394,7 +369,7 @@ strcat(line,tmp); dodebug(1, "calling: %s\n", line); -@@ -913,7 +913,7 @@ +@@ -923,7 +923,7 @@ /* traditional scanning first */ get_wrap_path_cdrecord(line); @@ -403,7 +378,7 @@ dodebug(1, "calling: %s\n", line); if ((fpin = popen(line,"r")) == NULL) { -@@ -964,7 +964,7 @@ +@@ -974,7 +974,7 @@ scsicount = 0; get_wrap_path_cdrecord(line); @@ -412,7 +387,7 @@ strcat(line, tmp); dodebug(1, "calling: %s\n", line); -@@ -1273,7 +1273,7 @@ +@@ -1283,7 +1283,7 @@ drvcount = 0; get_wrap_path_cdrecord(line); @@ -421,20 +396,7 @@ dodebug(1, "calling: %s\n", line); if ((fpin = popen(line,"r")) == NULL) { -@@ -1480,9 +1480,9 @@ - - if (!dev) return; - -- /* if prodvd available use it to get additional info */ -- if (curset.isProDVD) { -- get_wrap_path("CDRECORDPRODVD", tmp); -+ /* if (pro)dvd available use it to get additional info */ -+ if (curset.isDVD) { -+ get_wrap_path("CDRECORDDVD", tmp); - } else { - get_wrap_path("CDRECORD", tmp); - } -@@ -2100,9 +2100,11 @@ +@@ -2105,9 +2105,11 @@ g_snprintf(tmp,MAXLINE,"OPTION_SELECTIONMODE = %d\n",setupdata.option_selectionmode); fputs(tmp,fd); @@ -446,7 +408,7 @@ /* save geometry data? */ if (setupdata.option_savepos) { -@@ -2217,6 +2219,7 @@ +@@ -2222,6 +2224,7 @@ if (fgets(line,MAXLINE,fd) == NULL) break; @@ -454,7 +416,7 @@ /* special case here to protect pro-dvd-key */ if (strstr(line, "PRODVD_KEY") && strlen(line) > 50) { strncpy(tmp,line,50); -@@ -2225,6 +2228,7 @@ +@@ -2230,6 +2233,7 @@ } else { dodebug(10,"config: %s", line); } @@ -462,7 +424,7 @@ /* skip empty or hashed lines */ strip_string(line); -@@ -2504,6 +2508,7 @@ +@@ -2509,6 +2513,7 @@ if (strcmp("OPTION_SELECTIONMODE",id) == 0) { setupdata.option_selectionmode = atoi(value); } @@ -470,7 +432,7 @@ if (strcmp("PRODVD_KEY",id) == 0) { /* dont overwrite evtuelly set value with empty key */ if (strcmp(value,"") != 0) { -@@ -2511,6 +2516,7 @@ +@@ -2516,6 +2521,7 @@ setupdata.ProDVDkey = g_strdup(value); } } @@ -478,18 +440,7 @@ if (setupdata.option_savepos) { if (strcmp("GEOMETRY_MAINWINDOW_X",id) == 0) { setupdata.mainwindow.x = atoi(value); -@@ -5546,8 +5552,8 @@ - } - - /* build command line */ -- if (curset.isProDVD) { -- get_wrap_path("CDRECORDPRODVD", tmp3); -+ if (curset.isDVD) { -+ get_wrap_path("CDRECORDDVD", tmp3); - } else { - get_wrap_path("CDRECORD", tmp3); - } -@@ -5856,7 +5862,7 @@ +@@ -5857,7 +5863,7 @@ drvcount = 0; get_wrap_path_cdrecord(line); @@ -498,7 +449,7 @@ dodebug(1, "calling: %s\n", line); -@@ -5980,11 +5986,12 @@ +@@ -5981,11 +5987,12 @@ dialog_done = -1; } @@ -512,7 +463,7 @@ strncpy(tmp, "\nReceived ALARM from cdrecord-ProDVD. Aborting blank...\nInvalid ProDVD key?\n", MAXLINE); convert_for_gtk2_textwidget(tmp); -@@ -5993,6 +6000,7 @@ +@@ -5994,6 +6001,7 @@ read_done = 1; } } @@ -520,18 +471,7 @@ dodebug(10,"Finished in read_blank_out with status: %d\n", read_done); -@@ -6158,8 +6166,8 @@ - strcat(tmp3, tmp4); - } - -- if (curset.isProDVD) { -- get_wrap_path("CDRECORDPRODVD", tmp5); -+ if (curset.isDVD) { -+ get_wrap_path("CDRECORDDVD", tmp5); - } else { - get_wrap_path("CDRECORD", tmp5); - } -@@ -6367,14 +6375,16 @@ +@@ -6364,14 +6372,16 @@ dialog_done = -1; } @@ -549,7 +489,7 @@ dodebug(10,"Finished in read_write_out with status: %d\n", read_done); -@@ -6400,8 +6410,9 @@ +@@ -6397,8 +6407,9 @@ return; } @@ -560,7 +500,7 @@ if (strstr(line,"Last chance to quit")) { cdrtimer = gtk_timeout_add(1000, cdrtimer_callback, NULL); -@@ -6416,6 +6427,7 @@ +@@ -6413,6 +6424,7 @@ } } } @@ -568,7 +508,7 @@ /* skip all lines that contain "seconds." */ if (n > 8) { -@@ -6706,6 +6718,7 @@ +@@ -6703,6 +6715,7 @@ } @@ -576,7 +516,7 @@ /* display an error when useing prodvd and cdrecord aborts */ static void display_invalid_prodvdkey() { -@@ -6714,6 +6727,7 @@ +@@ -6711,6 +6724,7 @@ show_dialog(ICO_WARN, _("cdrecord-ProDVD terminated.\n\nMost likely because you have entered\nan invalid key. Please check if it is correct."), T_OK, NULL, NULL, 0); } } @@ -584,7 +524,7 @@ /* call cdrecord to write some tracks */ -@@ -6962,10 +6976,12 @@ +@@ -6959,10 +6971,12 @@ if (read_done != 0 || read_output_ctrl == 5) { gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); @@ -597,7 +537,7 @@ return 1; } else { /* all ok */ -@@ -7560,10 +7576,12 @@ +@@ -7557,10 +7571,12 @@ if (read_done != 0 || read_output_ctrl == 5) { gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); @@ -610,7 +550,7 @@ return 1; } else { /* all ok */ -@@ -7729,10 +7747,12 @@ +@@ -7726,10 +7744,12 @@ if (read_done != 0 || read_output_ctrl == 5) { gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); @@ -623,7 +563,7 @@ return 1; } else { /* all ok */ -@@ -9882,10 +9902,12 @@ +@@ -9879,10 +9899,12 @@ if (read_done != 0 || read_output_ctrl == 5) { gtk_label_set_text(GTK_LABEL(readtrack_info_label), _("Error writing tracks")); gtk_label_set_text(GTK_LABEL(readtrack_small_info),_("Write-Error:")); @@ -636,12 +576,12 @@ return 1; } else { /* all ok */ -@@ -9899,21 +9921,21 @@ +@@ -9896,17 +9922,17 @@ /* check the version of cdrecord */ /* return 1 if not correct (to old) */ --gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isProDVD) { -+gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isDVD) { +-gint check_version_cdrecord(gchar *match, gchar *found, gint *isProDVD) { ++gint check_version_cdrecord(gchar *match, gchar *found, gint *isDVD) { gchar line[MAXLINE]; gchar vline[MAXLINE]; gchar ver[MAXLINE]; @@ -651,27 +591,31 @@ - *isProDVD = 0; + *isDVD = 0; strcpy(ver,""); - if (dvd) { -- get_wrap_path("CDRECORDPRODVD",line); -+ get_wrap_path("CDRECORDDVD",line); - } else { - get_wrap_path("CDRECORD",line); - } + get_wrap_path("CDRECORD",line); - strcat(line," -version 2>/dev/null"); + strcat(line," -version 2>&1"); dodebug(1, "calling: %s\n", line); if ((fpin = popen(line,"r")) == NULL) { -@@ -9954,7 +9976,7 @@ +@@ -9926,7 +9952,7 @@ + } + if (strstr(line, "This version is an unofficial (modified) version with DVD support")) { + dodebug(1, "WARNING: Inoffical cdrecord version found!\n", line); +- *isProDVD = 1; ++ *isDVD = 1; + } + } + +@@ -9951,7 +9977,7 @@ } else { - p = strstr(vline, "Cdrecord-ProDVD-Clone"); + p = strstr(vline, "ProDVD"); if (p != NULL) { - *isProDVD = 1; + *isDVD = 1; - p = strtok(p+22, " "); + p = strtok(p, " "); if (p != NULL) { - strcpy(ver,p); -@@ -9968,6 +9990,9 @@ + p = strtok(NULL, " "); +@@ -9968,6 +9994,9 @@ p = strtok(NULL, " "); if (p) { strcpy(ver,p); @@ -681,7 +625,7 @@ } } } -@@ -10034,9 +10059,9 @@ +@@ -10034,9 +10063,9 @@ /* now line contains the version string of mkisofs */ /* try to extract the version number */ @@ -693,7 +637,7 @@ if (p != NULL) { strcpy(ver,p); } -@@ -10137,7 +10162,7 @@ +@@ -10139,7 +10167,7 @@ strcpy(ver,""); get_wrap_path("READCD",line); @@ -702,7 +646,7 @@ dodebug(1, "calling: %s\n", line); if ((fpin = popen(line,"r")) == NULL) { -@@ -10164,9 +10189,9 @@ +@@ -10166,9 +10195,9 @@ /* now line contains the version string of readcd */ /* try to extract the version number */ @@ -727,17 +671,17 @@ side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD")); side_t_btn3 = gtk_button_new_with_label (_("Create CD")); } else { -@@ -582,18 +582,20 @@ +@@ -584,19 +584,19 @@ */ /* warn about non-existing LFS support in dvd mode */ -- if (curset.isProDVD == 1 && sizeof(off_t) != 8) { -+ if (curset.isDVD == 1 && sizeof(off_t) != 8) { +- if ((curset.isProDVD & 1) && sizeof(off_t) != 8) { ++ if ((curset.isDVD & 1) && sizeof(off_t) != 8) { show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0); } -+#ifndef CDRECORDDVD_IS_FREE /* if we are in DVD mode, check if the security-key is set */ + #if 0 - if (curset.isProDVD == 1) { + if (curset.isDVD == 1) { keyenv = getenv("CDR_SECURITY"); @@ -746,7 +690,7 @@ } } -+#endif + #endif dolog(1,"Starting X-CD-Roast\n"); @@ -754,12 +698,12 @@ =================================================================== --- src/main.h.orig 2006-12-10 12:00:08.000000000 +0100 +++ src/main.h 2006-12-10 12:01:12.000000000 +0100 -@@ -193,7 +193,7 @@ +@@ -194,7 +194,7 @@ gint start_master_action(); gint start_onthefly_master_action(gint write_devnr); --gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isProDVD); -+gint check_version_cdrecord(gchar *match, gint dvd, gchar *found, gint *isDVD); +-gint check_version_cdrecord(gchar *match, gchar *found, gint *isProDVD); ++gint check_version_cdrecord(gchar *match, gchar *found, gint *isDVD); gint check_version_mkisofs(gchar *match, gchar *found); gint check_version_cdda2wav(gchar *match, gchar *found); gint check_version_readcd(gchar *match, gchar *found); @@ -789,7 +733,7 @@ =================================================================== --- src/setup.c.orig 2006-12-10 12:00:09.000000000 +0100 +++ src/setup.c 2006-12-10 12:01:12.000000000 +0100 -@@ -133,8 +133,10 @@ +@@ -135,8 +135,10 @@ g_free(bak_setupdata.cddb_proxy_host); setupdata.logfile = g_strdup(bak_setupdata.logfile); g_free(bak_setupdata.logfile); @@ -800,23 +744,23 @@ /* restore and free also writerreader structure copy */ if (bak_writerreader) { -@@ -264,6 +266,7 @@ +@@ -270,6 +272,7 @@ /* check_tilde(tmp); */ setupdata.logfile = g_strdup(tmp); +#ifndef CDRECORDDVD_IS_FREE g_free(setupdata.ProDVDkey); - n = gtk_text_get_length(GTK_TEXT(prodvdkey_txt)); - buf = gtk_editable_get_chars(GTK_EDITABLE(prodvdkey_txt),0,n); -@@ -282,6 +285,7 @@ - #else + setupdata.ProDVDkey = g_strdup(""); + #if 0 +@@ -291,6 +294,7 @@ putenv(security_key); #endif + #endif +#endif /* save the current window size if we are asked to */ if (setupdata.option_savepos) { -@@ -306,8 +310,8 @@ +@@ -315,8 +319,8 @@ dolog(2, "Confirm setup\n"); /* some lasts checks and warnings */ @@ -827,7 +771,7 @@ if (ret == 1) { /* abort */ return; -@@ -331,7 +335,9 @@ +@@ -340,7 +344,9 @@ return; /* free memory of backup-config */ @@ -837,7 +781,7 @@ g_free(bak_setupdata.logfile); g_free(bak_setupdata.cddb_host); g_free(bak_setupdata.cddb_proxy_host); -@@ -1138,7 +1144,7 @@ +@@ -1147,7 +1153,7 @@ gtk_box_pack_start(GTK_BOX(vbox2),tbl,FALSE,TRUE,0); gtk_widget_show(tbl); @@ -846,23 +790,23 @@ l1 = rightjust_gtk_label_new(_("CD Writer Device:")); } else { l1 = rightjust_gtk_label_new(_("CD/DVD Writer Device:")); -@@ -2738,6 +2744,7 @@ +@@ -2750,6 +2756,7 @@ define_tooltip(check, _("When enabled, then multiple selections in lists are handled like the lists in Windows (hold CTRL-Key to select more than one entry and use SHIFT to select a whole range of entries).")); - + #if 0 +#ifndef CDRECORDDVD_IS_FREE f1 = gtk_frame_new(_("cdrecord-ProDVD key")); set_font_and_color_frame(f1,BOLDFONT,NULL); gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,10); -@@ -2780,6 +2787,7 @@ +@@ -2792,6 +2799,7 @@ gtk_widget_set_sensitive(l1, FALSE); gtk_widget_set_sensitive(txt, FALSE); } +#endif // !defined(CDRECORDDVD_IS_FREE) + #endif } - -@@ -3184,7 +3192,7 @@ +@@ -3197,7 +3205,7 @@ gtk_container_add (GTK_CONTAINER (f1), tbl); gtk_widget_show(tbl); @@ -871,7 +815,7 @@ check = gtk_check_button_new_with_label(_("change CD Writer Device")); } else { check = gtk_check_button_new_with_label(_("change CD/DVD Writer Device")); -@@ -3206,7 +3214,7 @@ +@@ -3219,7 +3227,7 @@ gtk_widget_show(check); define_tooltip(check, _("If enabled, then the user is allowed the change the write parameters for the CD Writer (e.g. Speed and FIFO-Buffer-Size).")); @@ -880,7 +824,7 @@ check = gtk_check_button_new_with_label(_("change CD Reader Device")); } else { check = gtk_check_button_new_with_label(_("change CD/DVD Reader Device")); -@@ -3288,7 +3296,9 @@ +@@ -3301,7 +3309,9 @@ bak_setupdata.cddb_host = g_strdup(setupdata.cddb_host); bak_setupdata.cddb_proxy_host = g_strdup(setupdata.cddb_proxy_host); bak_setupdata.logfile = g_strdup(setupdata.logfile); @@ -890,7 +834,7 @@ /* backup the dynamic part of the readerwriter structure too */ bak_writerreader = g_new0(writerreader_bak_t *, MAXDEVICES); -@@ -3373,7 +3383,7 @@ +@@ -3386,7 +3396,7 @@ gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1); draw_scsi_scan(f1); @@ -926,17 +870,15 @@ =================================================================== --- src/xcdroast.h.orig 2006-12-10 12:00:12.000000000 +0100 +++ src/xcdroast.h 2006-12-10 12:10:20.000000000 +0100 -@@ -112,11 +112,19 @@ +@@ -112,10 +112,18 @@ then in $PREFIX (e.g. /usr/bin/cdrecord instead of /usr/local/lib/xcdroast-0.98/bin/cdrecord) */ -#define CDRECORD "bin/cdrecord" --#define CDRECORDPRODVD "bin/cdrecord.prodvd" -#define CDDA2WAV "bin/cdda2wav" -#define READCD "bin/readcd" -#define MKISOFS "bin/mkisofs" +#define CDRECORD "bin/wodim" -+#define CDRECORDDVD "bin/wodim" +#define CDDA2WAV "bin/icedax" +#define READCD "bin/readom" +#define MKISOFS "bin/genisoimage" @@ -951,16 +893,16 @@ /* MINIMUM required versions. Greater versions are now silently accepted. -@@ -124,11 +132,11 @@ +@@ -123,11 +131,11 @@ IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */ - #define CDRECORD_VERSION "1.11a34" + #define CDRECORD_VERSION "2.01" -#define CDRECORD_PRODVD_VERSION "2.01a11" -+#define CDRECORDDVD_VERSION "2.01.01" ++#define CDRECORDDVD_VERSION "2.01.01a03-dvd" #define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01a13" --#define MKISOFS_VERSION "1.15a17" --#define CDDA2WAV_VERSION "1.11a34" --#define READCD_VERSION "1.11a34" +-#define MKISOFS_VERSION "2.01" +-#define CDDA2WAV_VERSION "2.01" +-#define READCD_VERSION "2.01" +#define MKISOFS_VERSION "1.1.0" +#define CDDA2WAV_VERSION "1.1.0" +#define READCD_VERSION "1.1.0" @@ -971,27 +913,12 @@ =================================================================== --- src/xcdrwrap.c.orig 2006-12-10 12:00:09.000000000 +0100 +++ src/xcdrwrap.c 2006-12-10 12:01:12.000000000 +0100 -@@ -277,8 +277,8 @@ - strcpy(ret, CDRECORD); - return ret; - } -- if (strncmp(cmd,"CDRECORDPRODVD",MAXLINE) == 0) { -- strcpy(ret, CDRECORDPRODVD); -+ if (strncmp(cmd,"CDRECORDDVD",MAXLINE) == 0) { -+ strcpy(ret, CDRECORDDVD); - return ret; - } - if (strncmp(cmd,"CDDA2WAV",MAXLINE) == 0) { -@@ -314,9 +314,9 @@ +@@ -310,7 +310,7 @@ #endif /* show found paths of helper apps */ get_spawn_path(CDRECORD, tmp, 1); - printf("cdrecord found at: %s\n", tmp); -- get_spawn_path(CDRECORDPRODVD, tmp, 1); -- printf("cdrecord-ProDVD found at: %s\n", tmp); + printf(CDRECORD_NAME " found at: %s\n", tmp); -+ get_spawn_path(CDRECORDDVD, tmp, 1); -+ printf(CDRECORDDVD_NAME " found at: %s\n", tmp); get_spawn_path(CDDA2WAV, tmp, 1); printf("cdda2wav found at: %s\n", tmp); get_spawn_path(READCD, tmp, 1); @@ -1008,26 +935,7 @@ gchar *get_wrap_path(gchar *cmd, gchar *ret) { gchar tmp[MAXLINE]; -@@ -2388,15 +2388,15 @@ - } - - /* reroute the cdrecord command through the wrapper */ --/* determine automatically if proDVD version is needed or not */ -+/* determine automatically if (pro)DVD version is needed or not */ - - gchar *get_wrap_path_cdrecord(gchar *ret) { - gchar tmp[MAXLINE]; - - /* use DVD version if installed and media type > 1GB */ -- if (curset.isProDVD && curset.cdrtype > 1000) { -+ if (curset.isDVD && curset.cdrtype > 1000) { - g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, -- "CDRECORDPRODVD"); -+ "CDRECORDDVD"); - } else { - g_snprintf(tmp,MAXLINE,"%s/%s %s", libdir, WRAPPER, - "CDRECORD"); -@@ -2411,7 +2411,7 @@ +@@ -2404,7 +2404,7 @@ gint get_gracetime() { @@ -1036,7 +944,7 @@ /* use 10 seconds for prodvd, because the keycheck can take a while... */ return 10; -@@ -3522,7 +3522,7 @@ +@@ -3512,7 +3512,7 @@ /* return whether we have a empty CD-R or DVD-R in the drive */ /* we are sure that there IS a medium there - but we dont know which type */ @@ -1045,7 +953,7 @@ gchar *return_media_type(gint devnr) { gchar drvflags[MAXLINE], drvmodes[MAXLINE]; -@@ -3532,7 +3532,7 @@ +@@ -3522,7 +3522,7 @@ isdvd = 0; i = get_writerreaderdevs_index(devnr); diff -ru debian/patches/14_atapi_to_oldatapi.patch debian.nmu/patches/14_atapi_to_oldatapi.patch --- debian/patches/14_atapi_to_oldatapi.patch 2010-07-11 23:55:30.000000000 +0200 +++ debian.nmu/patches/14_atapi_to_oldatapi.patch 2010-07-11 21:11:53.000000000 +0200 @@ -3,7 +3,7 @@ =================================================================== --- a/src/io.c 2009-02-23 13:44:21.000000000 +0100 +++ b/src/io.c 2009-02-23 13:44:22.000000000 +0100 -@@ -994,7 +994,11 @@ +@@ -995,7 +995,11 @@ /* add the found devices to the writerreader structure */ count = 0; diff -ru debian/patches/15_no_readcd_version.patch debian.nmu/patches/15_no_readcd_version.patch --- debian/patches/15_no_readcd_version.patch 2010-07-11 23:55:30.000000000 +0200 +++ debian.nmu/patches/15_no_readcd_version.patch 2010-07-11 21:12:10.000000000 +0200 @@ -3,7 +3,7 @@ =================================================================== --- a/src/io.c 2009-02-23 13:44:22.000000000 +0100 +++ b/src/io.c 2009-02-23 13:44:22.000000000 +0100 -@@ -10149,6 +10149,10 @@ +@@ -10175,6 +10175,10 @@ g_error("popen error\n"); } @@ -14,7 +14,7 @@ strcpy(line,""); for (;;) { if (fgets(line,MAXLINE,fpin) == NULL) -@@ -10191,6 +10195,7 @@ +@@ -10217,6 +10221,7 @@ strcpy(found,ver); return 1; } diff -ru debian/patches/series debian.nmu/patches/series --- debian/patches/series 2010-07-11 23:55:30.000000000 +0200 +++ debian.nmu/patches/series 2010-07-11 20:58:42.000000000 +0200 @@ -1,9 +1,8 @@ 06_man.patch 07_case_cmp.patch 08_desktop.patch -#09_share_dir.patch +09_share_dir.patch 10_cddbtool.patch -#11_mkisofs_options.patch -p0 -#13_cdrecord_to_wodim.patch -p0 +13_cdrecord_to_wodim.patch -p0 14_atapi_to_oldatapi.patch 15_no_readcd_version.patch
signature.asc
Description: This is a digitally signed message part
