On Wed, May 23, 2012 at 09:43:58AM +0200, Sebastian Harl wrote:
> Thomas, if you could make your NMU-work available somehow, I'd be very
> happy to include that and finish your work.
Sure, patches against the git repository attached. You'll need the 1.8.5
tarball, obviously.
Thanks
Thomas
>From 9b37c724f9e0f07f49bdec31285ab0d8be4b669f Mon Sep 17 00:00:00 2001
From: Thomas Weber <[email protected]>
Date: Tue, 22 May 2012 22:44:25 +0200
Subject: [PATCH 1/4] Prepare new upstream release 1.8.5
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index cec21de..79be486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pfstools (1.8.5-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+
+ -- Thomas Weber <[email protected]> Tue, 22 May 2012 22:42:30 +0200
+
pfstools (1.8.1-2) unstable; urgency=low
[ Thomas Weber ]
--
1.7.10
>From 0589d51df7060fbe995c5490ba009134629f2ffe Mon Sep 17 00:00:00 2001
From: Thomas Weber <[email protected]>
Date: Tue, 22 May 2012 23:13:37 +0200
Subject: [PATCH 2/4] Switch to Octave 3.6, closes 666959
---
debian/changelog | 13 +++++++++++++
debian/control | 6 +++---
debian/octave-pfstools.install | 2 +-
debian/rules | 1 -
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 79be486..96ac7f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
pfstools (1.8.5-1.1) UNRELEASED; urgency=low
+ [ Thomas Weber ]
* Non-maintainer upload.
* New upstream release
+ [ Rafael Laboissiere ]
+ * Switch to Octave 3.6 packages (closes: #666959)
+ - debian/control:
+ - Build-depend on liboctave-dev, such that the package builds with
+ Octave 3.6
+ - Depend simply on octave, do not use the obsolete ${octave:Depends}
+ substitution variable anymore
+ - debian/rules:
+ - Do not invoke the obsolete script octave-depends
+ - debian/octave-pfstools.install: Adjust for the multiarch path, which
+ contains the architecture triplet now
+
-- Thomas Weber <[email protected]> Tue, 22 May 2012 22:42:30 +0200
pfstools (1.8.1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b641cca..483610a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Debian PhotoTools Maintainers <[email protected]>
Uploaders: Sebastian Harl <[email protected]>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt3-mt-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, octave3.2-headers, texlive-latex-base, freeglut3-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt3-mt-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev
Standards-Version: 3.8.4
Homepage: http://pfstools.sourceforge.net/
Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstools.git
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-phototools/pfstools.git
Package: pfstools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: pfsglview | pfsview, pfstmo, octave3.2, octave-signal, octave-pfstools
+Recommends: pfsglview | pfsview, pfstmo, octave, octave-signal, octave-pfstools
Suggests: dcraw, exrtools, imagemagick
Description: command line HDR manipulation programs
pfstools is a set of command line (and two GUI) programs for reading,
@@ -90,7 +90,7 @@ Description: C++ library to read and write pfs files
Package: octave-pfstools
Section: math
Architecture: any
-Depends: ${octave:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: octave, ${shlibs:Depends}, ${misc:Depends}
Description: octave bindings for pfstools
PFS is a high-dynamic range (HDR) image format. It is an attempt to integrate
existing file formats by providing a simple data format that can be used to
diff --git a/debian/octave-pfstools.install b/debian/octave-pfstools.install
index ff9de68..153a7c8 100644
--- a/debian/octave-pfstools.install
+++ b/debian/octave-pfstools.install
@@ -1,3 +1,3 @@
-usr/lib/octave/*
+usr/lib/*/octave/*
usr/share/octave/*
diff --git a/debian/rules b/debian/rules
index 8ad66f2..aff3b93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,6 @@ binary-arch: build install
dh_makeshlibs
dh_installdeb
dh_shlibdeps -Llibpfs-1.2-0 -ldebian/libpfs-1.2-0/usr/lib/
- octave3.2-depends -poctave-pfstools
dh_gencontrol
dh_md5sums
dh_builddeb
--
1.7.10
>From 55c90d44a0737beb69049f1542627f02aadd9338 Mon Sep 17 00:00:00 2001
From: Thomas Weber <[email protected]>
Date: Tue, 22 May 2012 23:15:47 +0200
Subject: [PATCH 3/4] Switch to QT4
---
debian/changelog | 1 +
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 96ac7f7..942da92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pfstools (1.8.5-1.1) UNRELEASED; urgency=low
[ Thomas Weber ]
* Non-maintainer upload.
* New upstream release
+ * Switch to QT4 (the new upstream release uses QT4), (closes: #604368)
[ Rafael Laboissiere ]
* Switch to Octave 3.6 packages (closes: #666959)
diff --git a/debian/control b/debian/control
index 483610a..2449fd6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Debian PhotoTools Maintainers <[email protected]>
Uploaders: Sebastian Harl <[email protected]>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt3-mt-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev
+Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch, gfortran, autotools-dev, libqt4-dev, libmagick++-dev | libmagick++9-dev, libtiff4-dev, libopenexr-dev, libnetpbm10-dev, liboctave-dev, texlive-latex-base, freeglut3-dev
Standards-Version: 3.8.4
Homepage: http://pfstools.sourceforge.net/
Vcs-Git: git://git.debian.org/git/pkg-phototools/pfstools.git
diff --git a/debian/rules b/debian/rules
index aff3b93..9a984e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
- --with-moc=moc-qt3 \
+ --with-moc=moc-qt4 \
--with-octave-m-dir=$(MDIR)/pfstools \
--with-octave-oct-dir=$(OCTDIR)/pfstools
--
1.7.10
>From b1c56a6c0436f01a0ec575c0927c4533c1162d68 Mon Sep 17 00:00:00 2001
From: Thomas Weber <[email protected]>
Date: Tue, 22 May 2012 23:19:36 +0200
Subject: [PATCH 4/4] Drop patch gcc-4.4.dpatch, applied upstream
---
debian/changelog | 1 +
debian/patches/00list | 1 -
debian/patches/gcc-4.4.dpatch | 21 ---------------------
3 files changed, 1 insertion(+), 22 deletions(-)
delete mode 100644 debian/patches/gcc-4.4.dpatch
diff --git a/debian/changelog b/debian/changelog
index 942da92..15d8097 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pfstools (1.8.5-1.1) UNRELEASED; urgency=low
* Non-maintainer upload.
* New upstream release
* Switch to QT4 (the new upstream release uses QT4), (closes: #604368)
+ * Drop patch: gcc-4.4.dpatch, applied upstream
[ Rafael Laboissiere ]
* Switch to Octave 3.6 packages (closes: #666959)
diff --git a/debian/patches/00list b/debian/patches/00list
index a1ac012..d5b9a75 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,2 @@
octave-nargin.dpatch
octave-signal.dpatch
-gcc-4.4.dpatch
diff --git a/debian/patches/gcc-4.4.dpatch b/debian/patches/gcc-4.4.dpatch
deleted file mode 100644
index e84dce1..0000000
--- a/debian/patches/gcc-4.4.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc-4.4.dpatch by Fabrice Coutadeur <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compilation error with GCC 4.4. Fix get from http://sourceforge.net/tracker/index.php?func=detail&aid=2848391&group_id=129921&atid=716245
-## DP: Rationale (by [email protected]): the "name" argument is in fact *not* used as "const"
-## DP: Closes: #554494
-
-@DPATCH@
-diff -urNad pfstools-1.8.1~/src/filter/pfspanoramic.cpp pfstools-1.8.1/src/filter/pfspanoramic.cpp
---- pfstools-1.8.1~/src/filter/pfspanoramic.cpp 2008-07-29 16:14:30.000000000 +0000
-+++ pfstools-1.8.1/src/filter/pfspanoramic.cpp 2009-09-10 20:11:29.000000000 +0000
-@@ -191,7 +191,7 @@
- singleton.projections[ string( name ) ] = ptr;
- }
-
-- static Projection *getProjection(const char *name)
-+ static Projection *getProjection(char *name)
- {
- char *opts;
-
--
1.7.10
_______________________________________________
Pkg-phototools-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-phototools-devel
