r37065 - in /packages/liborigin2/trunk/debian: changelog control patches/01_makefile.diff rules
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sat Dec 4 11:12:16 UTC 2010
Author: gudjon-guest
Date: Sat Dec 4 11:12:11 2010
New Revision: 37065
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37065
Log:
* Fix get-orig-source target
* Remove section field for binary package
Modified:
packages/liborigin2/trunk/debian/changelog
packages/liborigin2/trunk/debian/control
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=37065&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/changelog (original)
+++ packages/liborigin2/trunk/debian/changelog Sat Dec 4 11:12:11 2010
@@ -8,8 +8,10 @@
* Changed patch 01_makefile.diff
* Changed description
* Add override on dh_auto_clean
+ * Fix get-orig-source target
+ * Remove section field for binary package
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 04 Dec 2010 09:52:07 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 04 Dec 2010 11:49:02 +0100
liborigin2 (1:06042009+svn1724-1) unstable; urgency=low
Modified: packages/liborigin2/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/control?rev=37065&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/control (original)
+++ packages/liborigin2/trunk/debian/control Sat Dec 4 11:12:11 2010
@@ -27,7 +27,6 @@
This package contains the development header files.
Package: liborigin2-1
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library for reading OriginLab Origin 7.5 project files (runtime)
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=37065&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/patches/01_makefile.diff (original)
+++ packages/liborigin2/trunk/debian/patches/01_makefile.diff Sat Dec 4 11:12:11 2010
@@ -1,61 +1,18 @@
+Remove unnecessary dependencies on libboost_thread and QtCore and QtGui
--- 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
+@@ -15,7 +15,7 @@
+ #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
-
-+# Avoid link against Qt core and qui modules
-+
-+QT -= core gui
++#LIBS += -lboost_thread
+
+ HEADERS += endianfstream.hh \
+ logging.hpp \
+@@ -40,3 +40,5 @@
+ Origin800Parser.cpp \
+ Origin810Parser.cpp
+
++QT -= core gui
++
Modified: packages/liborigin2/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/rules?rev=37065&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/rules (original)
+++ packages/liborigin2/trunk/debian/rules Sat Dec 4 11:12:11 2010
@@ -10,7 +10,7 @@
override_dh_auto_install:
$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
-override_dh_install:
+override_dh_auto_install:
dh_install --list-missing
override_dh_auto_clean:
@@ -18,18 +18,21 @@
rm -f tree.hh
get-orig-source:
- REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*svn([0-9]+).*,\1,p'); \
- VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*1:([^-+~]+).*,\1,p'); \
- if [ x$$REV = x ]; then \
- wget http://download.berlios.de/qtiplot/liborigin2-$$VER.zip; \
- unzip liborigin2-$$VER.zip; \
- tar czf liborigin2_$$VER.orig.tar.gz liborigin2-$$VER; \
- rm -f liborigin2-$$VER.zip; \
- rm -rf liborigin2-$$VER; \
- else \
- svn checkout http://svn.berlios.de/svnroot/repos/qtiplot/trunk/3rdparty/liborigin liborigin2-$$VER\+svn$$REV && (\
- find liborigin2-$$VER\+svn$$REV -type f -exec chmod a-x {} \; ;\
- find liborigin2-$$VER\+svn$$REV -name '.svn' -exec rm -rf {} \; ; \
- tar -zcf ./liborigin2_$$VER\+svn$$REV.orig.tar.gz liborigin2-$$VER\+svn$$REV;\
- rm -rf liborigin2-$$VER\+svn$$REV; );\
- fi
+ REV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*svn([0-9]+).*,\1,p'); \
+ VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*1:([^-+~]+).*,\1,p'); \
+ if [ x$$REV = x ]; then \
+ wget http://download.berlios.de/qtiplot/liborigin2-$$VER.zip; \
+ unzip liborigin2-$$VER.zip; \
+ mv liborigin2 liborigin2-$$VER; \
+ find liborigin2-$$VER -type f -exec fromdos {} \; ;\
+ tar czf liborigin2_$$VER.orig.tar.gz liborigin2-$$VER; \
+ rm -f liborigin2-$$VER.zip; \
+ rm -rf liborigin2-$$VER; \
+ else \
+ svn checkout http://svn.berlios.de/svnroot/repos/qtiplot/trunk/3rdparty/liborigin liborigin2-$$VER\+svn$$REV && (\
+ find liborigin2-$$VER\+svn$$REV -type f -exec chmod a-x {} \; ;\
+ find liborigin2-$$VER\+svn$$REV -name '.svn' -exec rm -rf {} \; ; \
+ tar -zcf ./liborigin2_$$VER\+svn$$REV.orig.tar.gz liborigin2-$$VER\+svn$$REV;\
+ rm -rf liborigin2-$$VER\+svn$$REV; );\
+ fi
+
More information about the debian-science-commits
mailing list