[rlplot] 17/23: Imported Debian patch 1.4-2
Andreas Tille
tille at debian.org
Wed Jun 29 09:50:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository rlplot.
commit f35c84181840f85b751e64aac474d34077ca4a55
Author: Olly Betts <olly at survex.com>
Date: Tue Nov 29 06:41:40 2011 +0000
Imported Debian patch 1.4-2
---
Makefile | 22 ++-----
debian/changelog | 23 +++++++
debian/compat | 2 +-
debian/control | 7 +-
debian/copyright | 10 ++-
debian/dirs | 4 +-
debian/docs | 1 -
debian/patches/fix-ftbfs-with-gold.patch | 30 +++++++++
debian/patches/fix-ftbfs-with-qt4.7.patch | 29 +++++++++
debian/patches/series | 2 +
debian/rlplot.1 | 4 +-
debian/rlplot.desktop | 1 -
debian/rules | 105 ++++++------------------------
debian/source/format | 1 +
14 files changed, 127 insertions(+), 114 deletions(-)
diff --git a/Makefile b/Makefile
index 817b4f4..aacf7b2 100755
--- a/Makefile
+++ b/Makefile
@@ -24,20 +24,17 @@ CC = g++
X11LIBS = -lX11 -lm
SRCDIR = ./
-BIN = $(DESTDIR)/usr/bin
-MAN= $(DESTDIR)/usr/share/man/man1
-
-QT3DIR = /usr/share/qt-3
-QT3MOC = /usr/share/qt-3/bin/moc
+QT3DIR = /usr/lib/qt-3.3
+QT3MOC = /usr/lib/qt-3.3/bin/moc
MOC3FLAGS =
QT3CFLAGS = "-I$(QT3DIR)/include -pipe -O2"
QT3H = QT3_Spec.h
QT3LIBS = "-L$(QT3DIR)/lib -L/usr/X11R6/lib -lqt-mt"
-QT4DIR = /usr/share/qt4
-QT4MOC = /usr/share/qt4/bin/moc
+QT4DIR = /usr/lib/qt4
+QT4MOC = /usr/lib/qt4/bin/moc-qt4
MOC4FLAGS = "MOCFLAGS=-DQT_VERSION=0x040000"
-QT4CFLAGS = "-I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -O2"
+QT4CFLAGS = "-I/usr/include/Qt -pipe -O2"
QT4H = QT_Spec.h
QT4LIBS = "-L$(QT4DIR)/lib -L/usr/X11R6/lib -lQtCore -lQtGui -lQtNetwork"
@@ -66,16 +63,9 @@ rlplot: $(OBJECTS)
exprlp: $(GENOBJ)
$(CC) -o exprlp $(GENOBJ)
-install:
- install -d $(BIN) $(MAN)
- install ./rlplot $(BIN)
- install ./exprlp $(BIN)
-
clean:
rm -f *.o *~
- rm -f moc_QT_Spec.cpp
- rm -f rlplot
- rm -f exprlp
+ rm moc_QT_Spec.cpp
####### Compile
diff --git a/debian/changelog b/debian/changelog
index d63c57d..b0a343f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+rlplot (1.4-2) unstable; urgency=low
+
+ * QA upload.
+ + Orphaned, so set maintainer to QA group.
+ * New patch fix-ftbfs-with-gold.patch from Ubuntu to fix FTBFS with gold or
+ --no-add-needed. (Closes: #556322)
+ * New patch fix-ftbfs-with-qt4.7.patch from Ubuntu which replaces 'QString
+ foo(0);' with 'QString foo;' to fix FTBFS with Qt 4.7.
+ (Closes: #618048, #610150)
+ * Clear executable bit on /usr/share/pixmaps/RLPlot.xpm, fixing lintian
+ warning.
+ * debian/rules: Rewrite to use dh.
+ * debian/copyright: Update to point to GPL-2; update copyright holders and
+ years.
+ * Don't package upstream README - debian/copyright has the licence
+ information, and the details about how to build it aren't relevant to
+ those who have installed a binary package.
+ * debian/rlplot.1: Fix typo; fix hyphens to be dashes (fixes lintian
+ warning).
+ * debian/rlplot.desktop: Remove deprecated Encoding field.
+
+ -- Olly Betts <olly at survex.com> Tue, 29 Nov 2011 06:41:40 +0000
+
rlplot (1.4-1) unstable; urgency=low
* New upstream release
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index d6775b1..9ea0b4b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,10 @@
Source: rlplot
Section: math
Priority: optional
-Maintainer: James Stone <jamesmstone at gmail.com>
-Build-Depends: debhelper (>= 4.0.0), libqt4-dev (>= 4.3), libx11-dev (>= 4.3)
-Standards-Version: 3.7.2
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 7.0.50~), libqt4-dev (>= 4.3), libx11-dev (>= 4.3)
+Standards-Version: 3.9.2
+Homepage: http://rlplot.sourceforge.net/
Package: rlplot
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index ba54e5b..1131cc6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,15 @@
This package was debianized by James Stone <jmstone at dsl.pipex.com> on
Fri, 16 Apr 2004 19:26:24 +0100.
-It was downloaded from http://rlplot.sourceforge.net/index.html
+It was downloaded from http://rlplot.sourceforge.net/
Upstream Author: Reinhard Lackner <reinhard.lackner at uibk.ac.at>
-This software is copyright (c) 2002-04 by Reinhard Lackner
+This software is:
+
+ Copyright (c) 2000-2007 Reinhard Lackner
+ Copyright (C) 1998 Ross Ihaka
+ Copyright (C) 2000-2005 The R Development Core Team
RLPlot is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,4 +22,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
+License can be found in the file `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/dirs b/debian/dirs
index ca882bb..1317f86 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,2 @@
-usr/bin
-usr/sbin
+/usr/bin
+/usr/share/man/man1
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/patches/fix-ftbfs-with-gold.patch b/debian/patches/fix-ftbfs-with-gold.patch
new file mode 100644
index 0000000..c7bd8e9
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-gold.patch
@@ -0,0 +1,30 @@
+Patch from Ubuntu to fix FTBFS with binutils-gold (#556322):
+
+ rlplot (1.4-1ubuntu2) natty; urgency=low
+
+ * Fix FTBFS with ld --no-add-needed.
+ - Rearrange linker arguments.
+ - Link against pthread.
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Sat, 15 Jan 2011 18:08:18 +0100
+
+--- rlplot-1.4.orig/Makefile
++++ rlplot-1.4/Makefile
+@@ -21,7 +21,7 @@
+ # visit: http://www.trolltech.com for download and licence information
+ #
+ CC = g++
+-X11LIBS = -lX11 -lm
++X11LIBS = -lX11 -lm -lpthread
+ SRCDIR = ./
+
+ QT3DIR = /usr/lib/qt-3.3
+@@ -58,7 +58,7 @@
+ make rlplot QTDIR=$(QT3DIR) MOC=$(QT3MOC) CFLAGS=$(QT3CFLAGS) QTH=$(QT3H) $(MOC3FLAGS) LIBS=$(QT3LIBS)
+
+ rlplot: $(OBJECTS)
+- $(CC) $(LIBS) -o rlplot $(OBJECTS) $(QTLIBS) $(X11LIBS)
++ $(CC) -o rlplot $(OBJECTS) $(LIBS) $(QTLIBS) $(X11LIBS)
+
+ exprlp: $(GENOBJ)
+ $(CC) -o exprlp $(GENOBJ)
diff --git a/debian/patches/fix-ftbfs-with-qt4.7.patch b/debian/patches/fix-ftbfs-with-qt4.7.patch
new file mode 100644
index 0000000..290bbb7
--- /dev/null
+++ b/debian/patches/fix-ftbfs-with-qt4.7.patch
@@ -0,0 +1,29 @@
+Patch from Ubuntu to fix FTBFS with Qt 4.7 (#610150 and #618048):
+
+ rlplot (1.4-1ubuntu1) maverick; urgency=low
+
+ * Fix FTBFS with Qt 4.7 (LP: #641536)
+ - Patch QT_Spec.cpp
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Fri, 17 Sep 2010 21:14:41 +0200
+
+--- rlplot-1.4.orig/QT_Spec.cpp
++++ rlplot-1.4/QT_Spec.cpp
+@@ -1187,7 +1187,7 @@
+ com_GetTextExtentW(w_char *txt, int *width, int *height, int cb, TextDEF *TxtSet, QPainter *qP)
+ {
+ int i;
+- QString wtxt(0);
++ QString wtxt;
+
+ if(!txt || !txt[0]) return com_QStringExt(QString("a"), width, height, 1, TxtSet, qP);
+ for(i = 0; txt[i] && i < cb; i++) wtxt.append(QChar(txt[i]));
+@@ -1275,7 +1275,7 @@
+ bool com_TextOutW(int x, int y, w_char *wtxt, TextDEF *TxtSet, QPainter *qP, anyOutput *o)
+ {
+ int i;
+- QString txt(0);
++ QString txt;
+
+ if(!wtxt || !wtxt[0] || !TxtSet || !qP || !o) return false;
+ for(i = 0; wtxt[i]; i++) txt.append(QChar(wtxt[i]));
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..33f446f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-ftbfs-with-gold.patch
+fix-ftbfs-with-qt4.7.patch
diff --git a/debian/rlplot.1 b/debian/rlplot.1
index 94fbbe7..b082ea7 100644
--- a/debian/rlplot.1
+++ b/debian/rlplot.1
@@ -41,7 +41,7 @@ EPS, WMF and TIFF formats.
.PP
.B exprlp
reads RLPlot files and exports various vector based graphic file
-formats including scaleable vector graphics (SVG), Encapsulated
+formats including scalable vector graphics (SVG), Encapsulated
PostScript (EPS), and Windows Metafile (WMF).
.SH OPTIONS
.B rlplot
@@ -51,7 +51,7 @@ available for
.
.TP
.B \-
-use stdin/stdout as input or output file; requires that file format is set by -e | -s | -w option
+use stdin/stdout as input or output file; requires that file format is set by \-e | \-s | \-w option
.TP
.B \-h
help
diff --git a/debian/rlplot.desktop b/debian/rlplot.desktop
index 9f94d48..77a89ce 100644
--- a/debian/rlplot.desktop
+++ b/debian/rlplot.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.1.2
-Encoding=UTF-8
Name=Rlplot Graph Generator
Comment=Generate publication quality graphs
Exec=rlplot
diff --git a/debian/rules b/debian/rules
index b2945f8..4fde353 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,94 +1,29 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+override_dh_auto_build:
+ # Override incorrect (for debian) values in upstream Makefile:
+ make QT4DIR=/usr/share/qt4 \
+ QT4MOC=/usr/share/qt4/bin/moc \
+ QT4CFLAGS='"-I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -O2"'
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-#Architecture
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-
- # Add here commands to compile the arch part of the package.
- $(MAKE)
- touch build-arch-stamp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp
- rm -f configure-stamp
-
- # Add here commands to clean up after the build process.
- $(MAKE) clean
-
- dh_clean
-
-install: install-arch
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- # Add here commands to install the arch part of the package into
- # debian/tmp.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/rlplot
-
- dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
+override_dh_install:
+ install ./rlplot debian/rlplot/usr/bin
+ install ./exprlp debian/rlplot/usr/bin
+ dh_install
dh_install RLPlot.xpm usr/share/pixmaps
+ # Shouldn't be executable:
+ chmod a-x debian/rlplot/usr/share/pixmaps/RLPlot.xpm
dh_install debian/rlplot.desktop usr/share/applications
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installmenu
+
+override_dh_installman:
dh_installman debian/rlplot.1
dh_link usr/share/man/man1/rlplot.1 usr/share/man/man1/exprlp.1
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-arch configure
+override_dh_auto_clean:
+ # Upstream's Makefile tries to rm moc_QT_Spec.cpp without -f in "clean"
+ # which will fail if that file doesn't exist, so just reimplement it
+ # here and also remove the binaries:
+ rm -f *.o *~ moc_QT_Spec.cpp rlplot exprlp
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/rlplot.git
More information about the debian-science-commits
mailing list