[med-svn] r19058 - in trunk/packages/murasaki/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-04-15 12:43:50 +0000 (Wed, 15 Apr 2015)
New Revision: 19058

Added:
   trunk/packages/murasaki/trunk/debian/patches/
   trunk/packages/murasaki/trunk/debian/patches/include_libpstream.patch
   trunk/packages/murasaki/trunk/debian/patches/series
   trunk/packages/murasaki/trunk/debian/patches/use_proper_libboost_names.patch
Modified:
   trunk/packages/murasaki/trunk/debian/changelog
   trunk/packages/murasaki/trunk/debian/control
Log:
Get something that somehow builds - needs further checking


Modified: trunk/packages/murasaki/trunk/debian/changelog
===================================================================
--- trunk/packages/murasaki/trunk/debian/changelog	2015-04-15 12:12:42 UTC (rev 19057)
+++ trunk/packages/murasaki/trunk/debian/changelog	2015-04-15 12:43:50 UTC (rev 19058)
@@ -1,5 +1,5 @@
 murasaki (1.68.6-1) UNRELEASED; urgency=medium
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release (Closes: #nnnn)
 
  -- Andreas Tille <tille at debian.org>  Wed, 15 Apr 2015 14:06:19 +0200

Modified: trunk/packages/murasaki/trunk/debian/control
===================================================================
--- trunk/packages/murasaki/trunk/debian/control	2015-04-15 12:12:42 UTC (rev 19057)
+++ trunk/packages/murasaki/trunk/debian/control	2015-04-15 12:43:50 UTC (rev 19058)
@@ -9,7 +9,8 @@
                libboost-filesystem-dev,
                libterm-readkey-perl,
                libtext-wrapper-perl,
-               libcrypto++-dev
+               libcrypto++-dev,
+               libpstreams-dev
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/murasaki/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/murasaki/trunk/

Added: trunk/packages/murasaki/trunk/debian/patches/include_libpstream.patch
===================================================================
--- trunk/packages/murasaki/trunk/debian/patches/include_libpstream.patch	                        (rev 0)
+++ trunk/packages/murasaki/trunk/debian/patches/include_libpstream.patch	2015-04-15 12:43:50 UTC (rev 19058)
@@ -0,0 +1,10 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,6 +13,7 @@
+ #WITH_LIBCRYPTOPP = NO
+ 
+ #If your libraries (boost/cryptopp) are in another directory, add them here:
++INCLUDE	 += -I/usr/include/pstreams
+ LDLIBS    = -lboost_regex -lboost_filesystem -lboost_iostreams -lboost_system
+ ##some systems might use this boost naming scheme, but they're a minority at this point
+ #LDLIBS    = -lboost_regex -lboost_filesystem -lboost_iostreams 

Added: trunk/packages/murasaki/trunk/debian/patches/series
===================================================================
--- trunk/packages/murasaki/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/murasaki/trunk/debian/patches/series	2015-04-15 12:43:50 UTC (rev 19058)
@@ -0,0 +1,2 @@
+use_proper_libboost_names.patch
+include_libpstream.patch

Added: trunk/packages/murasaki/trunk/debian/patches/use_proper_libboost_names.patch
===================================================================
--- trunk/packages/murasaki/trunk/debian/patches/use_proper_libboost_names.patch	                        (rev 0)
+++ trunk/packages/murasaki/trunk/debian/patches/use_proper_libboost_names.patch	2015-04-15 12:43:50 UTC (rev 19058)
@@ -0,0 +1,13 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,9 +13,7 @@
+ #WITH_LIBCRYPTOPP = NO
+ 
+ #If your libraries (boost/cryptopp) are in another directory, add them here:
+-INCLUDE   = -I./include -I/usr/local/include -I/opt/local/include
+-LIBPATH   = -L/usr/local/lib -L/usr/lib -L/opt/local/lib
+-LDLIBS    = -lboost_regex-mt -lboost_filesystem-mt -lboost_iostreams-mt -lboost_system
++LDLIBS    = -lboost_regex -lboost_filesystem -lboost_iostreams -lboost_system
+ ##some systems might use this boost naming scheme, but they're a minority at this point
+ #LDLIBS    = -lboost_regex -lboost_filesystem -lboost_iostreams 
+ CPPFLAGS += $(OPTIM) $(INCLUDE) -Wall $(MARCH)