r37258 - in /packages/liborigin2/trunk/debian: changelog patches/01_makefile.diff rules

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

Author: gudjon-guest
Date: Sun Feb  6 12:29:10 2011
New Revision: 37258

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37258
Log:
Rewrote 01_makefile.diff

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

Modified: packages/liborigin2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/changelog?rev=37258&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/changelog (original)
+++ packages/liborigin2/trunk/debian/changelog Sun Feb  6 12:29:10 2011
@@ -10,7 +10,10 @@
   * Added myself to Uploaders
   * Fix indentation of get-orig-source target
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sun, 06 Feb 2011 12:58:07 +0100
+  [ Gudjon I. Gudjonsson ]
+  * Rewrote 01_makefile.diff
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sun, 06 Feb 2011 13:12:40 +0100
 
 liborigin2 (1:13092010-1) unstable; urgency=low
 

Modified: 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=37258&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/patches/01_makefile.diff (original)
+++ packages/liborigin2/trunk/debian/patches/01_makefile.diff Sun Feb  6 12:29:10 2011
@@ -1,59 +1,19 @@
-Remove unnecessary dependencies on libboost_thread and QtCore and QtGui
 --- a/liborigin2.pro
 +++ b/liborigin2.pro
-@@ -6,37 +6,37 @@
- OBJECTS_DIR  = ./tmp
- 
- DESTDIR      = ./
--
-+
- # Path to the folder where the header files of the BOOST C++ libraries are installed
+@@ -8,14 +8,14 @@
+ 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
++#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
+ 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
- 
++#LIBS        += -lboost_thread
+ 
+ HEADERS += endianfstream.hh \
+ 	   logging.hpp \

Modified: packages/liborigin2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/rules?rev=37258&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/rules (original)
+++ packages/liborigin2/trunk/debian/rules Sun Feb  6 12:29:10 2011
@@ -25,6 +25,7 @@
 	    unzip liborigin2-$$VER.zip; \
 	    mv liborigin2 liborigin2-$$VER; \
 	    find liborigin2-$$VER -type f -exec fromdos {} \; ;\
+	    rm -f liborigin2-$$VER/liborigin2.pro.user ;\
 	    tar czf liborigin2_$$VER.orig.tar.gz liborigin2-$$VER; \
 	    rm -f liborigin2-$$VER.zip; \
 	    rm -rf liborigin2-$$VER; \