[eso-midas] 02/02: Adjust patches for new (experimental) version
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Feb 27 10:21:41 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository eso-midas.
commit 9c97ea4a42c845936c4985430f2b56b0f4262352
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Feb 27 11:18:23 2015 +0100
Adjust patches for new (experimental) version
---
debian/changelog | 5 +-
debian/patches/series | 1 -
debian/patches/setup-debian.patch | 4 +-
debian/patches/writting.patch | 252 --------------------------------------
4 files changed, 5 insertions(+), 257 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c6fe594..25de2c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-eso-midas (13.09pl1.4-2) UNRELEASED; urgency=low
+eso-midas (15.02pl1.0-1~exp1) experimental; urgency=low
+ * New upstream version
* Update maintainers e-mail address
* Update standards version to 3.9.6. No changes needed.
- -- Ole Streicher <olebole at debian.org> Thu, 25 Sep 2014 12:21:27 +0200
+ -- Ole Streicher <olebole at debian.org> Fri, 27 Feb 2015 10:57:42 +0100
eso-midas (13.09pl1.4-1) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 2b8b631..12409e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
output-to-stdout.patch
setup-debian.patch
-writting.patch
syskeys.patch
system_readline.patch
fix_manpages.patch
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index 7df6139..c3d8b96 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -65,8 +65,8 @@ Description: Debian specific changes
x11incl="found"
else
ed_moptions delete X11INC >/dev/null
-- x11inclpth='/usr/openwin/include /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
-+ x11inclpth='/usr/include/X11 /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
+- x11inclpth='/usr/openwin/include /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include /opt/X-local/include'
++ x11inclpth='/usr/include/X11 /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include /opt/X-local/include'
for dir in $x11inclpth
do
if [ ! -d $dir ]; then
diff --git a/debian/patches/writting.patch b/debian/patches/writting.patch
deleted file mode 100644
index f47208b..0000000
--- a/debian/patches/writting.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Fix (some) spelling errors
---- a/test/os/atestosu.c
-+++ b/test/os/atestosu.c
-@@ -168,7 +168,7 @@
- for(i=0; i<sizebuf; i++) buf[i] = PATTERN0;
- printf("Writting a buffer in device ...."); fflush(stdout);
- if ( osuwrite(fd,buf,sizebuf) == -1) {
-- printf("ERROR writting a buffer\n");
-+ printf("ERROR writing a buffer\n");
- PERROR;
- }
- else printf("OK\n");
-@@ -368,7 +368,7 @@
- ospexit(0);
- }
-
-- /* Overwritting data */
-+ /* Overwriting data */
- printf("\n************** Trying to overwrite data\n");
- printf("Opening in READ_WRITE mode ...."); fflush(stdout);
- if ( (fd = osuopen(pname,READ_WRITE,0)) == -1) PERROR
-@@ -509,7 +509,7 @@
- for(i=0; i<sizebuf; i++) buf[i] = pattern;
- for (j=0; j<count; j++) {
- if ( osuwrite(fd,buf,sizebuf) == -1) {
-- printf("\nERROR writting a buffer: %s\n",osmsg());
-+ printf("\nERROR writing a buffer: %s\n",osmsg());
- return(-1);
- }
- else printf("...OK");
---- a/test/os/atestosx.c
-+++ b/test/os/atestosx.c
-@@ -476,28 +476,28 @@
- printf("OPEN SOCKET IN WRITE MODE... OK\n");
-
- if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNA,UPPER)) != SIZEBUF) {
-- printf("WRITTING PATTERN A IN SOCKET... FAILED.\n");
-+ printf("WRITING PATTERN A IN SOCKET... FAILED.\n");
- if (nbytes != -1)
- printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
- ospexit(1);
- }
-- else printf("WRITTING PATTERN A IN SOCKET... OK\n");
-+ else printf("WRITING PATTERN A IN SOCKET... OK\n");
-
- if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNB,UPPER)) != SIZEBUF) {
-- printf("WRITTING PATTERN B IN SOCKET... FAILED.\n");
-+ printf("WRITING PATTERN B IN SOCKET... FAILED.\n");
- if (nbytes != -1)
- printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
- ospexit(1);
- }
-- else printf("WRITTING PATTERN B IN SOCKET... OK\n");
-+ else printf("WRITING PATTERN B IN SOCKET... OK\n");
-
- if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNC,UPPER)) != SIZEBUF) {
-- printf("WRITTING PATTERN C IN SOCKET... FAILED.\n");
-+ printf("WRITING PATTERN C IN SOCKET... FAILED.\n");
- if (nbytes != -1)
- printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
- ospexit(1);
- }
-- else printf("WRITTING PATTERN C IN SOCKET... OK\n");
-+ else printf("WRITING PATTERN C IN SOCKET... OK\n");
-
- if ( (nbytes = testread(fd,buf,SIZEBUF,PATTERNA,UPPER)) != SIZEBUF) {
- PRINTF("READING PATTERN A IN SOCKET... FAILED.\n");
-@@ -574,20 +574,20 @@
-
-
- if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNC,UPPER)) != SIZEBUF) {
-- printf("WRITTING PATTERN C IN SOCKET... FAILED.\n");
-+ printf("WRITING PATTERN C IN SOCKET... FAILED.\n");
- if (nbytes != -1)
- printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
- ospexit(1);
- }
-- else printf("WRITTING PATTERN C IN SOCKET... OK\n");
-+ else printf("WRITING PATTERN C IN SOCKET... OK\n");
-
- if ( (nbytes = testwrite(fd,buf,SIZEBUF,PATTERNA,UPPER)) != SIZEBUF) {
-- printf("WRITTING PATTERN A IN SOCKET... FAILED.\n");
-+ printf("WRITING PATTERN A IN SOCKET... FAILED.\n");
- if (nbytes != -1)
- printf("\tERROR: ONLY %d BYTES WRITTEN!!!\n",nbytes);
- ospexit(1);
- }
-- else printf("WRITTING PATTERN A IN SOCKET... OK\n");
-+ else printf("WRITING PATTERN A IN SOCKET... OK\n");
-
- if ( (nbytes = testread(fd,buf,SIZEBUF,PATTERNC,UPPER)) != SIZEBUF) {
- PRINTF("READING PATTERN C IN SOCKET... FAILED.\n");
-@@ -650,8 +650,8 @@
-
- if ( (nbytes = osxwrite(fd,buffer,size)) != size) {
- if (type == UPPER)
-- printf("\tERROR WRITTING A BUFFER: %s\n",osmsg());
-- else printf("\tError writting a buffer: %s\n",osmsg());
-+ printf("\tERROR WRITING A BUFFER: %s\n",osmsg());
-+ else printf("\tError writing a buffer: %s\n",osmsg());
- return(-1);
- }
- return(nbytes);
---- a/test/os/testosu.c
-+++ b/test/os/testosu.c
-@@ -221,7 +221,7 @@
- /* getchar();
- */
- if (osuwrite(fd,pbuf,n_bytes) == -1) {
-- printf("Error writting %d bytes, %s\n",
-+ printf("Error writing %d bytes, %s\n",
- n_bytes,osmsg());
- return;
- }
---- a/test/os/testosx.c
-+++ b/test/os/testosx.c
-@@ -231,7 +231,7 @@
- pbuf[i]=pattern;
-
- if ((length=osxwrite(fd,pbuf,n_bytes,'C')) <= 0) {
-- printf("Error writting %d bytes: %s\n", n_bytes,osmsg());
-+ printf("Error writing %d bytes: %s\n", n_bytes,osmsg());
- return;
- }
- printf("WRITE %d bytes succeded\n",length);
---- a/test/os/testtape.c
-+++ b/test/os/testtape.c
-@@ -228,7 +228,7 @@
- {
- printf("\nWRITE A TAPE MARK\n");
- if (ioweof(fd) == -1) {
-- printf("Error writting a tape mark, %s\n", osmsg());
-+ printf("Error writing a tape mark, %s\n", osmsg());
- return;
- }
- printf("WRITE A TAPE MARK succeded.\n");
-@@ -271,7 +271,7 @@
- /* getchar();
- */
- if (iowrite(fd,pbuf,n_bytes) == -1) {
-- printf("Error writting %d bytes, %s\n",
-+ printf("Error writing %d bytes, %s\n",
- n_bytes,osmsg());
- return;
- }
---- a/prim/dio/libsrc/dataio.c
-+++ b/prim/dio/libsrc/dataio.c
-@@ -294,7 +294,7 @@
- if (n != wbsize)
- {
- if (n<0) SCTPUT(osmsg());
-- SCTPUT("Error: I/O-error in writting block");
-+ SCTPUT("Error: I/O-error in writing block");
- widx -= no; return -1;
- }
-
-@@ -307,7 +307,7 @@
- if (n != wbsize)
- {
- if (n<0) SCTPUT(osmsg());
-- SCTPUT("Error: I/O-error in writting block");
-+ SCTPUT("Error: I/O-error in writing block");
- widx -= no; return -1;
- }
- pbuf += n; no -= n;
---- a/applic/fit/libsrc/fitcon.for
-+++ b/applic/fit/libsrc/fitcon.for
-@@ -695,6 +695,6 @@
- 9020 FORMAT (I6,8X,I7,7X,1PE9.1,8X,0PF4.2,6X,0PF8.0,5X,A1)
- 9030 FORMAT ('FIT/TABLE : Bad Scaling of the problem ','HSD from ',
- + 1PD9.2,' to ',1PD9.2)
-- 9040 FORMAT ('*** Detected only ',I3,' linear independant parameters ',
-+ 9040 FORMAT ('*** Detected only ',I3,' linear independent parameters ',
- + 'on the total of ',I3,' ***')
- END
---- a/applic/fit/libsrc/fitunc.for
-+++ b/applic/fit/libsrc/fitunc.for
-@@ -463,6 +463,6 @@
- CALL TDMFRE(NBYT,PTRW,STATUS)
- RETURN
- 9000 FORMAT (I6,8X,I7,7X,1PE9.1,8X,0PF4.2,6X,0PF8.0,5X,A1)
-- 9010 FORMAT ('*** Detected only ',I3,' linear independant parameters ',
-+ 9010 FORMAT ('*** Detected only ',I3,' linear independent parameters ',
- + 'on the total of ',I3,' ***')
- END
---- a/contrib/lyman/src/minuit.for
-+++ b/contrib/lyman/src/minuit.for
-@@ -2726,7 +2726,7 @@
- +is rewound before',/,' reading. Note that this command is imple
- +mented in standard',/' Fortran 77 and the results may depend on
- + the system;',/,' for example, if a filename is given under VM
-- +/CMS, it must',/,' be preceeded by a slash.')
-+ +/CMS, it must',/,' be preceded by a slash.')
- 11804 FORMAT(/,' SET INTeractive',/,' Informs Minuit that it is run
- +ning interactively.')
- 11805 FORMAT(/,' SET LIMits [parno] [lolim] [uplim]',/,' Allows
---- a/contrib/romafot/src/rfotmfit.for
-+++ b/contrib/romafot/src/rfotmfit.for
-@@ -191,7 +191,7 @@
- 9023 FORMAT('Total Mag. index Histogram')
- 9024 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I',A50)
- 9025 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I')
-- 9026 FORMAT('Components succesfully fitted: ',I6)
-+ 9026 FORMAT('Components successfully fitted: ',I6)
- 9027 FORMAT('Components with no convergency: ',I6)
- C
- 9031 FORMAT('Iteration: ',I6,'; Added star: ',I6)
---- a/contrib/romafot/src/rfotrfit.for
-+++ b/contrib/romafot/src/rfotrfit.for
-@@ -185,7 +185,7 @@
- 9023 FORMAT('Total Mag. index Histogram')
- 9024 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I',A50)
- 9025 FORMAT(1X,I5,2X,F5.1,1X,F11.0,1X,'I')
-- 9026 FORMAT('Components succesfully fitted: ',I6)
-+ 9026 FORMAT('Components successfully fitted: ',I6)
- 9027 FORMAT('Components with no convergency: ',I6)
-
- 9031 FORMAT('Iteration: ',I6,'; Added star: ',I6)
---- a/gui/XFilter/src/MainFilt.c
-+++ b/gui/XFilter/src/MainFilt.c
-@@ -1376,7 +1376,7 @@
-
- UxPutFontList( me_f_cwbw, BoldTextFont );
- UxPutMnemonic( me_f_cwbw, "B" );
-- UxPutLabelString( me_f_cwbw, "Central Wave & Bandwith ..." );
-+ UxPutLabelString( me_f_cwbw, "Central Wave & Bandwidth ..." );
-
- UxPutFontList( me_f_filterlist, BoldTextFont );
- UxPutMnemonic( me_f_filterlist, "L" );
---- a/gui/XFilter/src/WaveBShell.c
-+++ b/gui/XFilter/src/WaveBShell.c
-@@ -321,7 +321,7 @@
- UxPutBackground( WaveBShell, WindowBackground );
- UxPutBorderColor( WaveBShell, WindowBackground );
- UxPutKeyboardFocusPolicy( WaveBShell, "pointer" );
-- UxPutIconName( WaveBShell, "Wavelength & Bandwith" );
-+ UxPutIconName( WaveBShell, "Wavelength & Bandwidth" );
- UxPutHeight( WaveBShell, 260 );
- UxPutWidth( WaveBShell, 325 );
- UxPutY( WaveBShell, 275 );
---- a/monit/communi.c
-+++ b/monit/communi.c
-@@ -222,7 +222,7 @@
- else if (verify > 1)
- {
- (void) printf("********************************\n");
-- (void) printf("Verification procedure succesfully terminated...\n");
-+ (void) printf("Verification procedure successfully terminated...\n");
- (void) printf("********************************\n");
- ospexit(0);
- }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git
More information about the debian-science-commits
mailing list