OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Aug-2003 17:15:19
Branch: HEAD Handle: 2003080116151900
Modified files:
openpkg-src/ddd ddd.patch ddd.spec
Log:
Fix packaging of NEWS and LICENSE, and patch nonstandard source code
some more
Summary:
Revision Changes Path
1.7 +36 -0 openpkg-src/ddd/ddd.patch
1.16 +0 -2 openpkg-src/ddd/ddd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 ddd.patch
--- openpkg-src/ddd/ddd.patch 1 Aug 2003 11:10:32 -0000 1.6
+++ openpkg-src/ddd/ddd.patch 1 Aug 2003 15:15:19 -0000 1.7
@@ -36,3 +36,39 @@
extern short ospeed;
extern void tputs (const char *string, int nlines, int (*outfun) ());
+diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C
+--- ddd-3.3.7.orig/ddd/DispBox.C Sat May 24 17:27:02 2003
++++ ddd-3.3.7/ddd/DispBox.C Fri Aug 1 15:49:30 2003
+@@ -59,7 +59,9 @@
+ #include "regexps.h"
+ #include "resolveP.h"
+
+-#include <ctype.h>
++#include <iostream>
++#include <strstream>
++#include <cctype>
+
+ #define assert_ok(x) assert(x)
+
+@@ -152,7 +154,7 @@
+ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" +
+ vsllib_defs;
+
+- istrstream is(defs.chars());
++ std::istrstream is(defs.chars());
+ vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode());
+ #else
+ name = "vsllib/" ddd_NAME ".vsl";
+diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in
+--- ddd-3.3.7.orig/ddd/Ddd.in Sat May 24 21:00:35 2003
++++ ddd-3.3.7/ddd/Ddd.in Fri Aug 1 15:43:54 2003
+@@ -649,9 +649,6 @@
+ ! The Perl Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
+ @[EMAIL PROTECTED]:
+
[EMAIL PROTECTED]@*bashInitCommands: \
+- set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\
+-
+ ! The Bash Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
+ @[EMAIL PROTECTED]:
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 ddd.spec
--- openpkg-src/ddd/ddd.spec 1 Aug 2003 11:10:32 -0000 1.15
+++ openpkg-src/ddd/ddd.spec 1 Aug 2003 15:15:19 -0000 1.16
@@ -88,8 +88,6 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
- rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd/COPYING
- rm $RPM_BUILD_ROOT%{l_prefix}/share/ddd/NEWS
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
