r37062 - in /packages/liborigin2/trunk/debian: changelog patches/ patches/01_makefile.diff patches/series

[gudjon-guest at users.alioth.debian.org]

Author: gudjon-guest
Date: Thu Dec  2 07:31:11 2010
New Revision: 37062

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37062
Log:
* New upstream release (Closes: #604695)
* Changed patch 01_makefile.diff

Added:
    packages/liborigin2/trunk/debian/patches/
    packages/liborigin2/trunk/debian/patches/01_makefile.diff
    packages/liborigin2/trunk/debian/patches/series
Modified:
    packages/liborigin2/trunk/debian/changelog

Modified: packages/liborigin2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/changelog?rev=37062&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/changelog (original)
+++ packages/liborigin2/trunk/debian/changelog Thu Dec  2 07:31:11 2010
@@ -1,14 +1,14 @@
 liborigin2 (1:13092010-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * New upstream release (Closes: #604695)
   * Bump standards version to 3.9.1
   * Remove README.source
   * tree.hh is missing. Add it during build
   * Fix debian/rules file
-  * Remove all patches. Fixed in upstream
+  * Changed patch 01_makefile.diff
   * Changed description
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 02 Dec 2010 07:57:31 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Thu, 02 Dec 2010 08:30:11 +0100
 
 liborigin2 (1:06042009+svn1724-1) unstable; urgency=low
 

Added: packages/liborigin2/trunk/debian/patches/01_makefile.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/patches/01_makefile.diff?rev=37062&op=file
==============================================================================
--- packages/liborigin2/trunk/debian/patches/01_makefile.diff (added)
+++ packages/liborigin2/trunk/debian/patches/01_makefile.diff Thu Dec  2 07:31:11 2010
@@ -1,0 +1,61 @@
+--- a/liborigin2.pro
++++ b/liborigin2.pro
+@@ -6,37 +6,40 @@
+ OBJECTS_DIR  = ./tmp
+ 
+ DESTDIR      = ./
+-
++
+ # Path to the folder where the header files of the BOOST C++ libraries are installed
+-INCLUDEPATH += ../boost
+-
+-# link statically against a copy of BOOST C++ libraries
++INCLUDEPATH += ../boost
++
++# link statically against a copy of BOOST C++ libraries
+ #LIBS        += ../boost/lib/libboost_date_time.a
+ #LIBS        += ../boost/lib/libboost_thread.a
+-# or dynamically against a system-wide installation
++# or dynamically against a system-wide installation
+ LIBS        += -lboost_date_time
+-LIBS        += -lboost_thread
++LIBS        += -lboost_thread
+ 
+ HEADERS += endianfstream.hh \
+ 	   logging.hpp \
+ 	   OriginObj.h \
+ 	   OriginFile.h \
+ 	   OriginParser.h \
+-           OriginDefaultParser.h \
+-	   Origin600Parser.h \
+-	   Origin610Parser.h \
+-	   Origin700Parser.h \
+-	   Origin750Parser.h \
+-	   Origin800Parser.h \
+-	   Origin810Parser.h
++           OriginDefaultParser.h \
++	   Origin600Parser.h \
++	   Origin610Parser.h \
++	   Origin700Parser.h \
++	   Origin750Parser.h \
++	   Origin800Parser.h \
++	   Origin810Parser.h
+ 
+ SOURCES += OriginFile.cpp \
+ 	   OriginParser.cpp \
+-	   OriginDefaultParser.cpp \
+-	   Origin600Parser.cpp \
+-	   Origin610Parser.cpp \
++	   OriginDefaultParser.cpp \
++	   Origin600Parser.cpp \
++	   Origin610Parser.cpp \
+ 	   Origin700Parser.cpp \
+-	   Origin750Parser.cpp \
+-	   Origin800Parser.cpp \
++	   Origin750Parser.cpp \
++	   Origin800Parser.cpp \
+ 	   Origin810Parser.cpp
+ 
++# Avoid link against Qt core and qui modules
++
++QT -= core gui

Added: packages/liborigin2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/patches/series?rev=37062&op=file
==============================================================================
--- packages/liborigin2/trunk/debian/patches/series (added)
+++ packages/liborigin2/trunk/debian/patches/series Thu Dec  2 07:31:11 2010
@@ -1,0 +1,1 @@
+01_makefile.diff