[Debburn-changes] r412 - in cdrkit/trunk: . cdrecord debian libscg
Eduard Bloch
blade at alioth.debian.org
Mon Nov 20 23:35:46 CET 2006
Author: blade
Date: 2006-11-20 23:35:45 +0100 (Mon, 20 Nov 2006)
New Revision: 412
Removed:
cdrkit/trunk/cdrecord/COPYING
cdrkit/trunk/cdrecord/LICENSE
cdrkit/trunk/cdrecord/LIMITATIONS
Modified:
cdrkit/trunk/Changelog
cdrkit/trunk/VERSION
cdrkit/trunk/cdrecord/cdrecord.c
cdrkit/trunk/cdrecord/drv_mmc.c
cdrkit/trunk/cdrecord/scsi_cdr.c
cdrkit/trunk/debian/changelog
cdrkit/trunk/libscg/scsitransp.c
Log:
Merged todays changes from old trunk herein, @ r411
Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/Changelog 2006-11-20 22:35:45 UTC (rev 412)
@@ -1,4 +1,4 @@
-cdrkit (1.0pre5+cleanup) UNRELEASED; urgency=low
+cdrkit (1.1.x) UNRELEASED; urgency=low
[ Eduard Bloch ]
* replacement of libdeflt and config parser rewrite; more user-friendly,
@@ -10,21 +10,8 @@
-- Eduard Bloch <blade at debian.org> Wed, 6 Sep 2006 22:05:30 +0200
+cdrkit (1.0) RELEASED; urgency=low
-
-
-
-
-
-
-
-
-
-
-
-
-cdrkit (1.0pre5) RELEASED; urgency=low
-
[ Eduard Bloch ]
* mapping of ATAPI: -> ATA: method on linux-2.6 and some code beautification
* added a atexit handler to stop the FIFO process more reliably, since
@@ -35,8 +22,16 @@
[ Dennis Vshivkov ]
* sorted display of files when needed
- -- Eduard Bloch <blade at debian.org> Wed, 15 Nov 2006 12:30:01 +0100
+ [ Joerg Jaspert]
+ * Remove all the printing of useless messages. This is based on GPLed
+ code, so we follow the letter of the GPL as it is interpreted by 99%
+ of the world, including its authors. Especially as Joerg was never able
+ to give us any clear explanation what other license he may think
+ cdrtools had, despite us asking multiple times. So we have no other
+ choice than to take whats written down, and thats GPL.
+ -- Joerg Jaspert <joerg at debian.org> Mon, 20 Nov 2006 19:25:10 +0100
+
cdrkit (1.0pre5) RELEASED; urgency=low
[ Eduard Bloch ]
Modified: cdrkit/trunk/VERSION
===================================================================
--- cdrkit/trunk/VERSION 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/VERSION 2006-11-20 22:35:45 UTC (rev 412)
@@ -1 +1 @@
-1.0pre5
+1.0
Deleted: cdrkit/trunk/cdrecord/COPYING
===================================================================
--- cdrkit/trunk/cdrecord/COPYING 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/cdrecord/COPYING 2006-11-20 22:35:45 UTC (rev 412)
@@ -1,16 +0,0 @@
-This software is under GPL but you should read the following clarifications:
-
-
-- You may not modify certain copyright messages in cdrecord.c
-
- See cdrecord.c for further information.
-
-
-- You may (with a few exceptions) not modify the location of the
- configuration file /etc/default/cdrecord.
-
- See defaults.c for further information.
-
-Please note that this is just the way I interpret the GPL and as this
-is my software, users should follow my interpretation of the GPL and not
-use their own different interpretations.
Deleted: cdrkit/trunk/cdrecord/LICENSE
===================================================================
--- cdrkit/trunk/cdrecord/LICENSE 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/cdrecord/LICENSE 2006-11-20 22:35:45 UTC (rev 412)
@@ -1,16 +0,0 @@
-This software is under GPL but you should read the following clarifications:
-
-
-- You may not modify certain copyright messages in cdrecord.c
-
- See cdrecord.c for further information.
-
-
-- You may (with a few exceptions) not modify the location of the
- configuration file /etc/default/cdrecord.
-
- See defaults.c for further information.
-
-Please note that this is just the way I interpret the GPL and as this
-is my software, users should follow my interpretation of the GPL and not
-use their own different interpretations.
Deleted: cdrkit/trunk/cdrecord/LIMITATIONS
===================================================================
--- cdrkit/trunk/cdrecord/LIMITATIONS 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/cdrecord/LIMITATIONS 2006-11-20 22:35:45 UTC (rev 412)
@@ -1,16 +0,0 @@
-This software is under GPL but you should read the following clarifications:
-
-
-- You may not modify certain copyright messages in cdrecord.c
-
- See cdrecord.c for further information.
-
-
-- You may (with a few exceptions) not modify the location of the
- configuration file /etc/default/cdrecord.
-
- See defaults.c for further information.
-
-Please note that this is just the way I interpret the GPL and as this
-is my software, users should follow my interpretation of the GPL and not
-use their own different interpretations.
Modified: cdrkit/trunk/cdrecord/cdrecord.c
===================================================================
--- cdrkit/trunk/cdrecord/cdrecord.c 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/cdrecord/cdrecord.c 2006-11-20 22:35:45 UTC (rev 412)
@@ -81,7 +81,7 @@
#include <sys/capability.h> /* for rawio capability */
#endif
-#define cdr_version "1.0pre1"
+#define cdr_version "1.0"
#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING -0 >= 0
#ifdef HAVE_SYS_PRIOCNTL_H /* The preferred SYSvR4 schduler */
@@ -299,36 +299,6 @@
BOOL is_dvdwr = FALSE;
- /* workaround for k3b */
- int acpos;
- for(acpos=0;acpos<argc;acpos++) {
- if(!strcmp(argv[acpos],"-version") || !strcmp(argv[acpos],"--version"))
- fprintf(stderr, "Cdrecord-yelling-line-to-tell-frontends-to-use-it-like-version 2.01.01a03-dvd \n");
- }
-
-#ifndef SHUT_UP
-
- fprintf(stderr,
- "This is wodim, not cdrecord. Don't expect it to behave like cdrecord in any\n"
- "way, don't refer to it as \"cdrecord\". Send problem reports to\n"
- "debburn-devel at lists.alioth.debian.org, don't bother Joerg Schilling with any\n"
- "problems caused by this application.\n"
- "Copyright (C) 2006 cdrkit maintainers, (C) 1994-2006 Joerg Schilling\n\n" );
- fprintf(stderr,
- "WARNING WARNING WARNING:\n\n"
- "If you are annoyed by the messages below about unofficial status or about\n"
- "non-Schily-Makefilesystem or if your GUI/script breaks because of them,\n"
- "please don't send your complaints to cdrkit maintainers; they already know.\n"
- "They are not allowed to remove them by Joerg Schilling's license\n"
- "modifications (restrictions), hidden in the source. Correcting the contents\n"
- "of the messages is forbidden as well, so don't believe everything said there.\n"
- "See http://svn.debian.org/wsvn/debburn/nonameyet/trunk/FAQ?op=file&rev=0&sc=0\n"
- "for details.\n\n" );
-
- if(strcmp(argv[0], "cdrecord") == 0)
- strcpy(argv[0], "wodim");
-#endif /* SHUT_UP */
-
#ifdef __EMX__
/* This gives wildcard expansion with Non-Posix shells with EMX */
_wildcard(&argc, &argv);
@@ -348,139 +318,14 @@
if (flags & F_VERSION) {
fprintf(stderr,
+ "Cdrecord-yelling-line-to-tell-frontends-to-use-it-like-version 2.01.01a03-dvd \n"
"Wodim " cdr_version "\n"
"Copyright (C) 2006 Cdrkit suite contributors\n"
"Based on works from Joerg Schilling, Copyright (C) 1995-2006, J. Schilling\n"
);
- /*exit(0);*/
+ exit(0);
}
-#ifndef SHUT_UP
-
-#define HOST_CPU "HOST_CPU-just-a-fake-string-to-make-Schilling's-invariant-section-compile-because-cdrkit-does-not-need-it-anymore"
-#define HOST_VENDOR "HOST_VENDOR-just-a-fake-string-to-make-Schilling's-invariant-section-compile-because-cdrkit-does-not-need-it-anymore"
-#define HOST_OS HOST_SYSTEM
-
- /*
- * Begin restricted code for quality assurance.
- *
- * Warning: you are not allowed to modify or to remove the
- * Copyright and version printing code below!
- * See also GPL § 2 subclause c)
- *
- * If you modify cdrecord you need to include additional version
- * printing code that:
- *
- * - Clearly states that the current version is an
- * inofficial (modified) version and thus may have bugs
- * that are not present in the original.
- *
- * - Print your support e-mail address and tell people that
- * you will do complete support for this version of
- * cdrecord.
- *
- * Or clearly state that there is absolutely no support
- * for the modified version you did create.
- *
- * - Tell the users not to ask the original author for
- * help.
- *
- * This limitation definitely also applies when you use any other
- * cdrecord release together with libscg-0.6 or later, or when you
- * use any amount of code from cdrecord-1.11a17 or later.
- * In fact, it applies to any version of cdrecord, see also
- * GPL Preamble, subsection 6.
- *
- * I am sorry for the inconvenience but I am forced to do this because
- * some people create inofficial branches. These branches create
- * problems but the initiators do not give support and thus cause the
- * development of the official cdrecord versions to slow down because
- * I am loaded with unneeded work.
- *
- * Please note that this is a memorandum on how I interpret the GPL.
- * If you use/modify/redistribute cdrecord, you need to accept it
- * this way.
- *
- *
- * The above statement is void if there has been neither a new version
- * of cdrecord nor a new version of star from the original author
- * within more then a year.
- */
-
- /*
- * Ugly, but Linux incude files violate POSIX and #define printf
- * so we cannot include the #ifdef inside the printf() arg list.
- */
-# define PRODVD_TITLE ""
-#ifdef CLONE_WRITE
-# define CLONE_TITLE "-Clone"
-#else
-# define CLONE_TITLE ""
-#endif
- if ((flags & F_MSINFO) == 0 || lverbose || flags & F_VERSION) {
- printf("Cdrecord%s%s %s (%s-%s-%s) Copyright (C) 1995-2006 Jörg Schilling\n",
- PRODVD_TITLE,
- CLONE_TITLE,
- cdr_version,
- HOST_CPU, HOST_VENDOR, HOST_OS);
-
-#if defined(SOURCE_MODIFIED) || !defined(IS_SCHILY_XCONFIG)
-#define INSERT_YOUR_EMAIL_ADDRESS_HERE
-#define NO_SUPPORT 0
- printf("NOTE: this version of cdrecord is an inofficial (modified) release of cdrecord\n");
- printf(" and thus may have bugs that are not present in the original version.\n");
-#if NO_SUPPORT
- printf(" The author of the modifications decided not to provide a support e-mail\n");
- printf(" address so there is absolutely no support for this version.\n");
-#else
- printf(" Please send bug reports and support requests to <%s>.\n", "debburn-devel at lists.alioth.debian.org");
-#endif
- printf(" The original author should not be bothered with problems of this version.\n");
- printf("\n");
-#endif
-#if !defined(IS_SCHILY_XCONFIG)
- printf("\nWarning: This version of cdrecord has not been configured via the standard\n");
- printf("autoconfiguration method of the Schily makefile system. There is a high risk\n");
- printf("that the code is not configured correctly and for this reason will not behave\n");
- printf("as expected.\n");
-#endif
-
-
- /*
- * I am sorry that even for version 1.310 of cdrecord.c, I am forced to do
- * things like this, but defective versions of cdrecord cause a lot of
- * work load to me and it seems to be impossible to otherwise convince
- * SuSE to cooperate.
- * As people contact me and bother me with the related problems,
- * it is obvious that SuSE is violating subsection 6 in the preamble of
- * the GPL.
- *
- * The reason for including a test against SuSE's private
- * distribution environment is only that SuSE violates the GPL for
- * a long time and seems not to be willing to follow the requirements
- * imposed by the GPL. If SuSE starts to ship non defective versions
- * of cdrecord or informs their customers that they would need to
- * compile cdrecord themselves in order to get a working cdrecord,
- * they should contact me for a permission to change the related test.
- *
- * Note that although the SuSE test is effective only for SuSE, the
- * intention to have non bastardized versions out is not limited
- * to SuSE. It is bad to see that in special in the "Linux" business,
- * companies prefer a model with many proprietary differing programs
- * instead of cooperating with the program authors.
- */
-
- if (flags & F_VERSION)
- exit(0);
- /*
- * End restricted code for quality assurance.
- */
- }
-#else
- if (flags & F_VERSION)
- exit(0);
-#endif /* SHUT_UP */
-
checkgui();
if (debug || lverbose) {
@@ -636,48 +481,22 @@
scgp->kdebug = kdebug;
scgp->cap->c_bsize = DATA_SEC_SIZE;
-#ifndef SHUT_UP
-
if ((flags & F_MSINFO) == 0 || lverbose) {
char *vers;
char *auth;
- /*
- * Warning: you are not allowed to modify or to remove this
- * version checking code!
- */
vers = scg_version(0, SCG_VERSION);
auth = scg_version(0, SCG_AUTHOR);
- printf("Using libscg version '%s-%s'.\n", auth, vers);
- if (auth == 0 || strcmp("schily", auth) != 0) {
- errmsgno(EX_BAD,
- "Warning: using inofficial version of libscg (%s-%s '%s').\n",
- auth, vers, scg_version(0, SCG_SCCS_ID));
- }
+ if(lverbose >1 && auth && vers)
+ fprintf(stderr, "Using libscg version '%s-%s'.\n", auth, vers);
- vers = scg_version(scgp, SCG_VERSION);
- auth = scg_version(scgp, SCG_AUTHOR);
- if (lverbose > 1)
- fprintf(stderr, "Using libscg transport code version '%s-%s'\n", auth, vers);
- if (auth == 0 || strcmp("schily", auth) != 0) {
- errmsgno(EX_BAD,
- "Warning: using inofficial libscg transport code version (%s-%s '%s').\n",
- auth, vers, scg_version(scgp, SCG_SCCS_ID));
- }
vers = scg_version(scgp, SCG_RVERSION);
auth = scg_version(scgp, SCG_RAUTHOR);
if (lverbose > 1 && vers && auth)
- fprintf(stderr, "Using remote transport code version '%s-%s'\n", auth, vers);
- if (auth != 0 && strcmp("schily", auth) != 0) {
- errmsgno(EX_BAD,
- "Warning: using inofficial remote transport code version (%s-%s '%s').\n",
- auth, vers, scg_version(scgp, SCG_RSCCS_ID));
- }
+ fprintf(stderr, "Using remote transport code version '%s-%s'\n", auth, vers);
}
-#endif /* SHUT_UP */
-
if (lverbose && driveropts)
printf("Driveropts: '%s'\n", driveropts);
@@ -759,12 +578,13 @@
/* DVD does not support TAO */
if (dp->is_dvd) {
- fprintf(stderr, "Using Session At Once (SAO) for DVD mode.\n");
- dp->cdr_flags |= F_SAO;
- for (i = 0; i <= MAX_TRACK; i++) {
- track[i].flags &= ~TI_TAO;
- track[i].flags |= TI_SAO;
- }
+ if(lverbose>1)
+ fprintf(stderr, "Using Session At Once (SAO) for DVD mode.\n");
+ dp->cdr_flags |= F_SAO;
+ for (i = 0; i <= MAX_TRACK; i++) {
+ track[i].flags &= ~TI_TAO;
+ track[i].flags |= TI_SAO;
+ }
}
if (!is_cddrive(scgp))
Modified: cdrkit/trunk/cdrecord/drv_mmc.c
===================================================================
--- cdrkit/trunk/cdrecord/drv_mmc.c 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/cdrecord/drv_mmc.c 2006-11-20 22:35:45 UTC (rev 412)
@@ -734,7 +734,7 @@
fprintf(stderr, "identify_dvd: is_dvd: %d\n", is_dvd);
#endif
}
- if (is_dvd) {
+ if (is_dvd && lverbose>2) {
errmsgno(EX_BAD,
"Found DVD media: using cdr_mdvd.\n");
dp = &cdr_mdvd;
Modified: cdrkit/trunk/cdrecord/scsi_cdr.c
===================================================================
--- cdrkit/trunk/cdrecord/scsi_cdr.c 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/cdrecord/scsi_cdr.c 2006-11-20 22:35:45 UTC (rev 412)
@@ -2496,7 +2496,7 @@
inq->prod_ident[0] ||
inq->prod_revision[0]) {
fprintf(f, "Vendor_info : '%.8s'\n", inq->vendor_info);
- fprintf(f, "Identifikation : '%.16s'\n", inq->prod_ident);
+ fprintf(f, "Identification : '%.16s'\n", inq->prod_ident);
fprintf(f, "Revision : '%.4s'\n", inq->prod_revision);
}
}
Modified: cdrkit/trunk/debian/changelog
===================================================================
--- cdrkit/trunk/debian/changelog 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/debian/changelog 2006-11-20 22:35:45 UTC (rev 412)
@@ -1,12 +1,32 @@
-cdrkit (5:1.0~pre5-1.1) unstable; urgency=low
+cdrkit (5:1.0-1) unstable; urgency=high
+ [ Eduard Bloch ]
* ATAPI -> ATA mapping and better error messages (closes: #398465)
* more reliable FIFO process termination (closes: #398043)
* prints burn-free message only with higher verbosity (closes: 388770)
* sorted file list printing, by Dennis Vshivkov (closes: #278071)
- -- Eduard Bloch <blade at debian.org> Tue, 14 Nov 2006 15:08:16 +0100
+ [ Joerg Jaspert ]
+ * Remove all the printing of useless messages. This is based on GPLed
+ code, so we follow the letter of the GPL as it is interpreted by 99%
+ of the world, including its authors. Especially as Joerg was never able
+ to give us any clear explanation what other license he may think
+ cdrtools had, despite us asking multiple times. So we have no other
+ choice than to take whats written down, and thats GPL.
+ * The above fixes "license needs to be clarified" as well as
+ "Cdrkit possibly made non-free by former upstream, refuses
+ clarification"(Closes: #387783, #392342).
+ Note that I do not remove the "You may not return schily" clauses.
+ They are, in my understanding, valid requests an upstream can make, not
+ including his name if he doesn't want it. They are also no problem for
+ anyone, anywhere, the other stuff was.
+ * Was included earlier, close Bug "diff for 5:1.0~pre4-1.1 NMU" (Closes: #388595).
+ * Bug fix: "wodim: Spelling error in output of -checkdrive", thanks to
+ Alexey Feldgendler (Closes: #389135).
+ * Urgency high.
+ -- Joerg Jaspert <joerg at debian.org> Mon, 20 Nov 2006 19:42:09 +0100
+
cdrkit (5:1.0~pre5-1) unstable; urgency=low
* New upstream source snapshot
Modified: cdrkit/trunk/libscg/scsitransp.c
===================================================================
--- cdrkit/trunk/libscg/scsitransp.c 2006-11-20 21:40:50 UTC (rev 411)
+++ cdrkit/trunk/libscg/scsitransp.c 2006-11-20 22:35:45 UTC (rev 412)
@@ -167,38 +167,6 @@
scg_ops_t *ops;
extern scg_ops_t scg_std_ops;
-#define printf(x) fprintf(stderr, x)
-/* The code is not modified. Only moved to where it belongs to, stopping sabotage of frontend programs' functionality */
-
-#ifndef SHUT_UP
-/*
- * Who defines which changes decrease the quality and how? The one who hates
- * all changes not done by him personally? There are more harsh (but more
- * precise) words to describe stuff like that below, for now let's call it
- * "unpleasant easter egg" or "addition of code which is enabled by conditional
- * compilation when a condition appears which the creator of the code dislikes
- * by principle".
- */
-/*
- * Begin restricted code for quality assurance.
- *
- * Warning: you are not allowed to modify the quality ensurance code below.
- *
- * This restiction is introduced because this way, I hope that people
- * contribute to the project instead of creating branches.
- */
-#if !defined(IS_SCHILY_XCONFIG)
- printf("\nWarning: This version of libscg has not been configured via the standard\n");
- printf("autoconfiguration method of the Schily makefile system. There is a high risk\n");
- printf("that the code is not configured correctly and for this reason will not behave\n");
- printf("as expected.\n");
-#endif
- /*
- * End restricted code for quality assurance.
- */
-#endif /* SHUT_UP */
-#undef printf
-
scgp->ops = &scg_std_ops;
if (device && strncmp(device, "REMOTE", 6) == 0) {
More information about the Debburn-changes
mailing list