--- liborigin-20080225.orig/debian/changelog +++ liborigin-20080225/debian/changelog @@ -0,0 +1,81 @@ +liborigin (20080225-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Rename library packages for g++5 ABI transition, patch + from Ubuntu (see #791150) + + -- Jonathan Wiltshire Sat, 08 Aug 2015 16:00:38 +0100 + +liborigin (20080225-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with linker flag --as-needed" and "FTBFS: tree.hh:138:21: + error: 'ptrdiff_t' does not name a type": Apply patches from Ubuntu: + + [ Stefan Potyra ] + * debian/patches/02_makefile_as_needed.patch: Adjust link order in Makefile + to fix a FTBFS with --as-needed linker flag (closes: #607396). + + [ Colin Watson ] + * debian/patches/cstddef.patch: Include for ptrdiff_t + (closes: #625068, LP: #771110). + + -- gregor herrmann Fri, 07 Oct 2011 13:58:38 +0200 + +liborigin (20080225-2) unstable; urgency=low + + * Use versioned conflicts for labplot. (Closes: #469047) + + -- Fathi Boudra Sat, 15 Mar 2008 08:27:53 +0100 + +liborigin (20080225-1) unstable; urgency=low + + * New upstream release. + * Remove gcc-4.3 patch. Merged upstream. + * Add Vcs-Browser and Vcs-Svn fields. + + -- Fathi Boudra Sat, 01 Mar 2008 15:04:11 +0100 + +liborigin (20071119-1) unstable; urgency=low + + * New upstream release. + * Add myself in Uploaders field. + * Bump Standards-Version to 3.7.3. + * Use Homepage field. + * Refresh 01_makefile patch. Add --no-undefined and --as-needed linker + flags. + * Add gcc-4.3 patch. Thanks to Brian Carlson (Closes: #455372) + * Switch to quilt patch system. + + -- Fathi Boudra Tue, 15 Jan 2008 13:13:30 +0100 + +liborigin (20070926-1) unstable; urgency=low + + * New upstream release. + * Update 01_makefile patch. Merge upstream: tree.hh installation. + + -- Gudjon I. Gudjonsson Wed, 26 Sep 2007 15:26:19 +0200 + +liborigin (20070817-1) unstable; urgency=low + + * New upstream release. + * Update 01_makefile patch. Remove ldconfig call. + * Update copyright for tree.hh file. + * Update rules. Add dpatch.make usage. + + -- Gudjon I. Gudjonsson Fri, 17 Aug 2007 18:12:49 +0200 + +liborigin (20070529-1) unstable; urgency=low + + * New upstream release. + * Update Makefile.LINUX patch. Remove lib-arch.sh and ldconfig call. + + -- Gudjon I. Gudjonsson Tue, 29 May 2007 16:40:52 +0200 + +liborigin (20070115-1) unstable; urgency=low + + * Initial release. (Closes: #40860) + * Add patch to fix Makefile.LINUX. + + -- Gudjon I. Gudjonsson Sat, 27 Jan 2007 00:08:12 +0100 + --- liborigin-20080225.orig/debian/compat +++ liborigin-20080225/debian/compat @@ -0,0 +1 @@ +5 --- liborigin-20080225.orig/debian/control +++ liborigin-20080225/debian/control @@ -0,0 +1,54 @@ +Source: liborigin +Priority: optional +Maintainer: Gudjon I. Gudjonsson +Uploaders: Fathi Boudra +Build-Depends: debhelper (>= 5), quilt +Standards-Version: 3.7.3 +Section: libs +Homepage: http://sourceforge.net/projects/liborigin +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/liborigin/trunk +Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/liborigin/trunk + +Package: liborigin-dev +Section: libdevel +Architecture: any +Depends: liborigin0v5 (= ${binary:Version}) +Description: library for reading OriginLab Origin project files (development) + liborigin is a library for reading the project files from the OriginLab Origin + plotting program. OriginLab Origin provides extensive scientific graphing and + data analysis capabilities and includes several new tools that simplify common + operations. + . + See http://www.originlab.com for more informations about OriginLab Origin. + . + This package contains the development files. + +Package: liborigin0v5 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: liborigin0 +Replaces: liborigin0 +Description: library for reading OriginLab Origin project files (runtime) + liborigin is a library for reading the project files from the OriginLab Origin + plotting program. OriginLab Origin provides extensive scientific graphing and + data analysis capabilities and includes several new tools that simplify common + operations. + . + See http://www.originlab.com for more informations about OriginLab Origin. + . + This package contains the development files. + +Package: opj2dat +Section: science +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: labplot (<< 1.6.0.1-1) +Description: OriginLab Origin project files to data files converter + opj2dat is a program build on the liborigin library and converts project files + from the OriginLab Origin plotting program to data files, readable by most + other plotting programs. OriginLab Origin provides extensive scientific + graphing and data analysis capabilities and includes several new tools that + simplify common operations. + . + See http://www.originlab.com for more informations about OriginLab Origin. --- liborigin-20080225.orig/debian/copyright +++ liborigin-20080225/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by Gudjon I. Gudjonsson on +Sat, 27 Jan 2007 00:08:12 +0100. + +It was downloaded from http://sourceforge.net/projects/liborigin/ + +Upstream Authors: + + Stefan Gerlach + Alex Kargovsky + +Copyright: + + © 2005-2007 Stefan Gerlach + © 2007 Alex Kargovsky + © 2007 Ion Vasilief + +Copyright for STL-like templated tree class (tree.hh): + + © 2001-2006 Kasper Peeters + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2 of the License. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is © 2007, Gudjon I. Gudjonsson and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- liborigin-20080225.orig/debian/liborigin-dev.dirs +++ liborigin-20080225/debian/liborigin-dev.dirs @@ -0,0 +1,2 @@ +usr/include/liborigin +usr/lib --- liborigin-20080225.orig/debian/liborigin-dev.install +++ liborigin-20080225/debian/liborigin-dev.install @@ -0,0 +1,2 @@ +usr/lib/liborigin.so +usr/include/liborigin --- liborigin-20080225.orig/debian/liborigin0v5.dirs +++ liborigin-20080225/debian/liborigin0v5.dirs @@ -0,0 +1 @@ +usr/lib --- liborigin-20080225.orig/debian/liborigin0v5.install +++ liborigin-20080225/debian/liborigin0v5.install @@ -0,0 +1 @@ +usr/lib/liborigin.so.* --- liborigin-20080225.orig/debian/liborigin0v5.lintian-overrides +++ liborigin-20080225/debian/liborigin0v5.lintian-overrides @@ -0,0 +1,2 @@ +# G++5 ABI transition +liborigin0v5: package-name-doesnt-match-sonames liborigin0 --- liborigin-20080225.orig/debian/opj2dat.1 +++ liborigin-20080225/debian/opj2dat.1 @@ -0,0 +1,30 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH OPJ2DAT 1 "January 27, 2007" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +opj2dat \- Converts origin project files to dat files +.SH SYNOPSIS +.B opj2dat +.RI [ options ] " files" ... +.br +.SH DESCRIPTION +No more description available. +.SH AUTHOR +liborigin was written by Stefan Gerlach. +.PP +This manual page was written by Gudjon I. Gudjonsson , +for the Debian project (but may be used by others). --- liborigin-20080225.orig/debian/opj2dat.dirs +++ liborigin-20080225/debian/opj2dat.dirs @@ -0,0 +1,2 @@ +usr/share/man/man1 +usr/bin --- liborigin-20080225.orig/debian/opj2dat.install +++ liborigin-20080225/debian/opj2dat.install @@ -0,0 +1 @@ +usr/bin/* --- liborigin-20080225.orig/debian/patches/01_makefile.diff +++ liborigin-20080225/debian/patches/01_makefile.diff @@ -0,0 +1,21 @@ +--- a/Makefile.LINUX ++++ b/Makefile.LINUX +@@ -7,8 +7,8 @@ + OPJ2DAT = opj2dat + CC = g++ + CFLAGS = -pipe -Wall -W -O2 -fPIC +-LDFLAGS = -shared -Wl,-soname,$(TARGET1) +-LIBEXT = `./lib-arch.sh` ++LDFLAGS = -shared -Wl,-soname,$(TARGET1) -Wl,--no-undefined -Wl,--as-needed ++LIBEXT = lib + all : $(TARGET0) $(OPJ2DAT) + + $(TARGET0) : $(OPJ).cpp $(OPJ).h +@@ -38,7 +38,5 @@ + mkdir -p $(DESTDIR)/usr/include/$(TARGET) + chmod 644 $(OPJ).h tree.hh + cp $(OPJ).h tree.hh $(DESTDIR)/usr/include/$(TARGET) +- ldconfig + uninstall: + rm -f $(DESTDIR)/usr/$(LIBEXT)/$(TARGET0)* $(DESTDIR)/usr/bin/$(OPJ2DAT) $(DESTDIR)/usr/include/$(TARGET)/$(OPJ).h +- ldconfig --- liborigin-20080225.orig/debian/patches/02_makefile_as_needed.patch +++ liborigin-20080225/debian/patches/02_makefile_as_needed.patch @@ -0,0 +1,13 @@ +Index: liborigin-20080225/Makefile.LINUX +=================================================================== +--- liborigin-20080225.orig/Makefile.LINUX 2010-12-17 22:07:51.030175732 +0100 ++++ liborigin-20080225/Makefile.LINUX 2010-12-17 22:08:03.970175732 +0100 +@@ -23,7 +23,7 @@ + ln -sf $(TARGET3) $(TARGET2)) + + $(OPJ2DAT): $(OPJ2DAT).cpp +- $(CC) $(CFLAGS) -L lib/ -o $(OPJ2DAT) -lorigin $(OPJ2DAT).cpp ++ $(CC) $(CFLAGS) -L lib/ -o $(OPJ2DAT) $(OPJ2DAT).cpp -lorigin + + clean : + rm -f *~ *.o $(OPJ2DAT) $(TARGET0)* --- liborigin-20080225.orig/debian/patches/03_cstddef.patch +++ liborigin-20080225/debian/patches/03_cstddef.patch @@ -0,0 +1,20 @@ +Description: Include for ptrdiff_t + G++ 4.6 is stricter about header namespacing. +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/625068 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/771110 +Forwarded: no +Last-Update: 2011-09-13 + +Index: b/tree.hh +=================================================================== +--- a/tree.hh ++++ b/tree.hh +@@ -67,6 +67,7 @@ + #include + #include + #include ++#include + + // HP-style construct/destroy have gone from the standard, + // so here is a copy. --- liborigin-20080225.orig/debian/patches/series +++ liborigin-20080225/debian/patches/series @@ -0,0 +1,3 @@ +01_makefile.diff +02_makefile_as_needed.patch +03_cstddef.patch --- liborigin-20080225.orig/debian/rules +++ liborigin-20080225/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +version=0.0.3 +major=0 + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + + $(MAKE) + + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs README + dh_installexamples + dh_install --sourcedir=debian/tmp + dh_installman -popj2dat debian/opj2dat.1 + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure