< Previous by Date Date Index Next by Date >
  Thread Index  

[reSIProcate] [PATCH] fix debian build


hi

the current debian patch in svn (rev 6382) does not apply,
I think the below patch should fix it:


Index: repro/debian/patches/00.berkleydb-path.dpatch
===================================================================
--- repro/debian/patches/00.berkleydb-path.dpatch       (revision 6382)
+++ repro/debian/patches/00.berkleydb-path.dpatch       (working copy)
@@ -1,32 +1,20 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 00-berkleydb-path-patch.dpatch by  <m@martinh>
+## 00-berkleydb-path-patch.dpatch by  <alfredh@dingo>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fixes the include path for Berkley DB

 @DPATCH@

-diff -Naur predeb/repro/BerkeleyDb.cxx middeb/repro/BerkeleyDb.cxx
---- predeb/repro/BerkeleyDb.cxx        2006-02-17 17:37:05.000000000 +0100
-+++ middeb/repro/BerkeleyDb.cxx        2006-02-17 17:52:03.000000000 +0100
-@@ -7,7 +7,7 @@
- #ifdef WIN32
- #include <db_cxx.h>
+diff -Naur -X /home/alfredh/svn/priv/exclude resiprocate-orig/repro/BerkeleyDb.hxx resiprocate/repro/BerkeleyDb.hxx +--- resiprocate-orig/repro/BerkeleyDb.hxx 2006-06-22 09:22:02.000000000 +0200
++++ resiprocate/repro/BerkeleyDb.hxx   2006-06-22 09:24:24.000000000 +0200
+@@ -9,7 +9,7 @@
+ //#elif defined(__APPLE__)
+ //#include <db42/db_cxx.h>
  #else
--#include <db4/db_cxx.h>
+-#include<db4/db_cxx.h>
 +#include <db_cxx.h>
  #endif

  #include "rutil/Data.hxx"
-diff -Naur predeb/repro/BerkeleyDb.hxx middeb/repro/BerkeleyDb.hxx
---- predeb/repro/BerkeleyDb.hxx        2006-02-17 17:37:05.000000000 +0100
-+++ middeb/repro/BerkeleyDb.hxx        2006-02-17 17:52:10.000000000 +0100
-@@ -7,7 +7,7 @@
- #include "config.hxx"
- #include DB_HEADER
- #else
--#include <db4/db_cxx.h>
-+#include <db_cxx.h>
- #endif
-
- #include "rutil/Data.hxx"
Index: repro/debian/README
===================================================================
--- repro/debian/README (revision 6382)
+++ repro/debian/README (working copy)
@@ -6,5 +6,5 @@

 In order to make this work, you have to copy the debian directory
 one level up, ie., from ./repro/debian to ./debian and then run
-dpk-buildpackage in that directory. You may also use the source
+dpkg-buildpackage in that directory. You may also use the source
 package available from <http://www.sipfoundry.org/pub/repro/>.