r47329 - in /packages/liborigin2/trunk/debian: changelog control liborigin2-1.install liborigin2-1v5.install patches/01_makefile.diff

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

Author: gudjon-guest
Date: Fri Aug  5 08:48:21 2016
New Revision: 47329

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47329
Log:
* Non-maintainer upload (See #791151)
* Rename library packages for g++5 ABI transition.
* Add libboost-system-dev to build-depends and add linking to it to
  debian/patches/01_makefile.diff so liborigin2-1v5 has all symbols
  available

Added:
    packages/liborigin2/trunk/debian/liborigin2-1v5.install
      - copied unchanged from r47328, packages/liborigin2/trunk/debian/liborigin2-1.install
Removed:
    packages/liborigin2/trunk/debian/liborigin2-1.install
Modified:
    packages/liborigin2/trunk/debian/changelog
    packages/liborigin2/trunk/debian/control
    packages/liborigin2/trunk/debian/patches/01_makefile.diff

Modified: packages/liborigin2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/changelog?rev=47329&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/changelog	(original)
+++ packages/liborigin2/trunk/debian/changelog	Fri Aug  5 08:48:21 2016
@@ -1,3 +1,17 @@
+liborigin2 (2:20110117-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload (See #791151)
+
+  [ Steve Langasek ]
+  * Rename library packages for g++5 ABI transition.
+
+  [ Scott Kitterman ]
+  * Add libboost-system-dev to build-depends and add linking to it to
+    debian/patches/01_makefile.diff so liborigin2-1v5 has all symbols
+    available
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 23 Aug 2015 19:49:45 -0400
+
 liborigin2 (2:20110117-1) unstable; urgency=low
 
   [ Gudjon I. Gudjonsson ]

Modified: packages/liborigin2/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/liborigin2/trunk/debian/control?rev=47329&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/control	(original)
+++ packages/liborigin2/trunk/debian/control	Fri Aug  5 08:48:21 2016
@@ -5,7 +5,7 @@
 Uploaders: Fathi Boudra <fabo at debian.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), libqt4-dev,
- libboost-date-time-dev
+ libboost-date-time-dev, libboost-system-dev
 Standards-Version: 3.9.1
 Homepage: http://soft.proindependent.com/liborigin2/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/liborigin2/trunk/
@@ -15,7 +15,7 @@
 Package: liborigin2-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, liborigin2-1 (= ${binary:Version}),
+Depends: ${misc:Depends}, liborigin2-1v5 (= ${binary:Version}),
  libboost-date-time-dev
 Description: library for reading OriginLab Origin 7.5 project files (development)
  liborigin2 is a library for reading the project files from the OriginLab
@@ -27,9 +27,11 @@
  .
  This package contains the development header files.
 
-Package: liborigin2-1
+Package: liborigin2-1v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: liborigin2-1
+Replaces: liborigin2-1
 Description: library for reading OriginLab Origin 7.5 project files (runtime)
  liborigin2 is a library for reading the project files from the OriginLab
  Origin 7.5 plotting program. OriginLab Origin provides extensive scientific

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=47329&op=diff
==============================================================================
--- packages/liborigin2/trunk/debian/patches/01_makefile.diff	(original)
+++ packages/liborigin2/trunk/debian/patches/01_makefile.diff	Fri Aug  5 08:48:21 2016
@@ -1,7 +1,9 @@
 Change to Debian boost version and remove unneccessary libraries
---- a/liborigin2.pro
-+++ b/liborigin2.pro
-@@ -6,16 +6,18 @@
+Index: liborigin2-20110117/liborigin2.pro
+===================================================================
+--- liborigin2-20110117.orig/liborigin2.pro	2011-02-06 09:16:37.000000000 -0500
++++ liborigin2-20110117/liborigin2.pro	2015-08-23 19:56:15.850774338 -0400
+@@ -6,16 +6,19 @@
  OBJECTS_DIR  = ./tmp
  
  DESTDIR      = ./
@@ -18,6 +20,7 @@
  # or dynamically against a system-wide installation
  LIBS        += -lboost_date_time
 -LIBS        += -lboost_thread
++LIBS        += -lboost_system
 +#LIBS        += -lboost_thread
  
  HEADERS += endianfstream.hh \