On 2009-05-01 Andreas Metzler <[email protected]> wrote: > just for testing I have recently packaged libpano13 2.9.14 beta2. > Straightforward patch is attached, this is not ready for upload since > upstream broke the ABI.
> http://news.gmane.org/find-root.php?message_id=%3ct3oqc6%2dk4j.ln1%40argenau.downhill.at.eu.org%3e rc1 fixes this. Updated patch attached. cu andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
>From 9b10186aec121969e8fa0b10c5749e210f1858bd Mon Sep 17 00:00:00 2001 From: Andreas Metzler <[email protected]> Date: Sat, 2 May 2009 11:13:35 +0200 Subject: [PATCH] New upstream prerelease. 2.9.14~rc1 --- debian/changelog | 15 +++++ debian/control | 4 +- debian/libpano13-0.install | 1 - debian/libpano13-1.install | 1 + debian/libpano13-bin.install | 1 + debian/libpano13-bin.manpages | 1 - debian/manpages/PTblender.pod | 75 ----------------------- debian/manpages/PTcrop.pod | 59 ------------------ debian/manpages/PTinfo.pod | 36 ----------- debian/manpages/PTmasker.pod | 97 ------------------------------ debian/manpages/PTmender.pod | 113 ----------------------------------- debian/manpages/PToptimizer.pod | 29 --------- debian/manpages/PTroller.pod | 52 ---------------- debian/manpages/PTtiff2psd.pod | 124 --------------------------------------- debian/manpages/PTtiffdump.pod | 46 -------------- debian/manpages/PTuncrop.pod | 58 ------------------ debian/manpages/panoinfo.pod | 27 --------- debian/rules | 27 --------- 18 files changed, 19 insertions(+), 747 deletions(-) delete mode 100644 debian/libpano13-0.install create mode 100644 debian/libpano13-1.install delete mode 100644 debian/libpano13-bin.manpages delete mode 100644 debian/manpages/PTblender.pod delete mode 100644 debian/manpages/PTcrop.pod delete mode 100644 debian/manpages/PTinfo.pod delete mode 100644 debian/manpages/PTmasker.pod delete mode 100644 debian/manpages/PTmender.pod delete mode 100644 debian/manpages/PToptimizer.pod delete mode 100644 debian/manpages/PTroller.pod delete mode 100644 debian/manpages/PTtiff2psd.pod delete mode 100644 debian/manpages/PTtiffdump.pod delete mode 100644 debian/manpages/PTuncrop.pod delete mode 100644 debian/manpages/panoinfo.pod diff --git a/debian/changelog b/debian/changelog index 19dd9e9..649d223 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libpano13 (2.9.14~rc1-1) experimental; urgency=low + + * New upstream prerelease. + + New soname due to ABI breakage (new member in public struct). Change + package name of library package. + + Does not contain non-free files PixMap.c PixMap.h, no need for .dfsg + version anymore. Also does away with the need for a complex + get-orig-source + target. + + debian/manpages/* now shipped in upstream-tarball. Adapt build-system + accordingly. + + + -- Andreas Metzler <[email protected]> Sat, 02 May 2009 11:01:15 +0200 + libpano13 (2.9.12.dfsg-2) unstable; urgency=low * Drop Java support altogether (Closes: #477884). While checking that diff --git a/debian/control b/debian/control index 6d6b199..835af47 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Git: git://git.debian.org/git/pkg-phototools/libpano.git Package: libpano13-dev Section: libdevel Architecture: any -Depends: libpano13-0 (= ${binary:Version}) +Depends: libpano13-1 (= ${binary:Version}) Description: panorama tools library development files This package contains the panoramatools library. It provides basic algorithmical tools to generate, edit and transform many kinds of @@ -20,7 +20,7 @@ Description: panorama tools library development files This package holds static libraries and headers needed by developers who wish to use libpano13 in their programs. -Package: libpano13-0 +Package: libpano13-1 Section: libs Architecture: any Depends: ${shlibs:Depends} diff --git a/debian/libpano13-0.install b/debian/libpano13-0.install deleted file mode 100644 index d0dbfd1..0000000 --- a/debian/libpano13-0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/lib*.so.* diff --git a/debian/libpano13-1.install b/debian/libpano13-1.install new file mode 100644 index 0000000..d0dbfd1 --- /dev/null +++ b/debian/libpano13-1.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* diff --git a/debian/libpano13-bin.install b/debian/libpano13-bin.install index 1df36c6..c1fbc7a 100644 --- a/debian/libpano13-bin.install +++ b/debian/libpano13-bin.install @@ -1 +1,2 @@ usr/bin/* +usr/share/man/man1/*.1 diff --git a/debian/libpano13-bin.manpages b/debian/libpano13-bin.manpages deleted file mode 100644 index 4cd44fd..0000000 --- a/debian/libpano13-bin.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/manpages/*.1 diff --git a/debian/manpages/PTblender.pod b/debian/manpages/PTblender.pod deleted file mode 100644 index 2ec67ef..0000000 --- a/debian/manpages/PTblender.pod +++ /dev/null @@ -1,75 +0,0 @@ -=head1 NAME - -PTblender - Colour and brightness correction of panoramas - - -=head1 SYNOPSIS - -B<PTblender> [options] I<tiff_file(s)> - - -=head1 DESCRIPTION - -B<PTblender> is a command-line tool that only implements the colour -and brightness correction functionality of B<PTmender>. - - -=head1 OPTIONS - -=over - -=item B<-p> I<prefix> - -Prefix for output filename. Defaults to I<blended%4d>. - -=item B<-k> I<index> - -Index of the image to use as a reference (0-based, defaults to 0). - -=item B<-t> I<[0,1,2]> - -Type of colour correction: 0 full (default), 1 brightness only, 2 -colour only. - -=item B<-c> - -Output curves smooth (output one per each corrected file). - -=item B<-m> - -Output curves arbitrary map (output one per each corrected file). - -=item B<-f> - -Force processing (ignore warnings). - -=item B<-x> - -Delete source files (use with care). - -=item B<-q> - -Quiet run. - -=item B<-h> - -Output help summary. - -=back - - -=head1 SEE ALSO - -L<http://wiki.panotools.org/PTblender>, L<PTmender(1)> - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTblender was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTcrop.pod b/debian/manpages/PTcrop.pod deleted file mode 100644 index 73f6c17..0000000 --- a/debian/manpages/PTcrop.pod +++ /dev/null @@ -1,59 +0,0 @@ -=head1 NAME - -PTcrop - Crop TIFF images - - -=head1 SYNOPSIS - -B<PTcrop> [options] I<tiff_file(s)> - - -=head1 DESCRIPTION - -B<PTcrop> is a command-line tool that crops a TIFF image to its -bounding rectangle, preserving its original dimensions. - - -=head1 OPTIONS - -=over - -=item B<-p> I<prefix> - -Prefix for output files (defaults to I<cropped%4d>). - -=item B<-f> - -Force processing: Overwrite output files if they exists (use with -care). - -=item B<-x> - -Delete source files (use with care). - -=item B<-q> - -Quiet run - -=item B<-h> - -Output help summary. - -=back - - -=head1 SEE ALSO - -L<PTuncrop(1)> - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTcrop was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTinfo.pod b/debian/manpages/PTinfo.pod deleted file mode 100644 index 9b8194f..0000000 --- a/debian/manpages/PTinfo.pod +++ /dev/null @@ -1,36 +0,0 @@ -=head1 NAME - -PTinfo - Display information about a panotools-generated image - - -=head1 SYNOPSIS - -B<PTinfo> [options] I<tiff_file(s)> - - -=head1 DESCRIPTION - -B<PTinfo> displays information about an image created with panotools. - - -=head1 OPTIONS - -=over - -=item B<-h> - -Output help summary. - -=back - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTinfo was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTmasker.pod b/debian/manpages/PTmasker.pod deleted file mode 100644 index 00b4a9f..0000000 --- a/debian/manpages/PTmasker.pod +++ /dev/null @@ -1,97 +0,0 @@ -=head1 NAME - -PTmasker - Compute stitching masks - - -=head1 SYNOPSIS - -B<PTmasker> [options] I<tiff_file(s)> - - -=head1 DESCRIPTION - -B<PTmasker> computes stitching masks. It implements the ability to -increase depth-of-field by stacking images. - - -=head1 OPTIONS - -=over - -=item B<-p> I<prefix> - -Prefix for output files (defaults to I<masked%4d>). - -=item B<-e> I<feather> - -Size of the feather (defaults to zero). - -=item B<-f> - -Force processing (do not stop on warnings). - -=item B<-x> - -Delete source files (use with care). - -=item B<-q> - -Quiet run. - -=item B<-h> - -Output help summary. - -=item B<-z> - -Enable Extended depth of field. - -=item B<-m> - -Focus estimation mask type. - -=over - -=item 0 hard-edged masks, mutually exclusive - -=item 1 hard-edged masks, stack of nested masks - -=item 2 blended masks, stack of nested masks - -=back - -2 is default and strongly recommended: This option includes a -smoothing computation that seems to help a lot. - -=item B<-w> I<integer> - -Focus estimation window size. Only available if -z. - - -Recommended value is 0.51001114526f image width, e.g. 4 pixels for an -800-pixel image. - -Computation cost for focus estimation increases proportional to N^2. -Defaults to w4. - -=item B<-s> I<integer> - -Smoothing window size. Only available if -z. - -Recommended value is 0.50f image width, e.g. 4 pixels for an 800-pixel -image. - -Computation cost for focus estimation increases proportional to N^2. -Defaults to w4. - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTmasker was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTmender.pod b/debian/manpages/PTmender.pod deleted file mode 100644 index 56dd4f0..0000000 --- a/debian/manpages/PTmender.pod +++ /dev/null @@ -1,113 +0,0 @@ -=head1 NAME - -PTmender - Replacement for PTStitcher - - -=head1 SYNOPSIS - -B<PTmender> [options] I<script_filename> I<images> - - -=head1 DESCRIPTION - -B<PTmender> is a replacement for Professor Helmut Dersch's PTStitcher. -Most useful features of PTStitcher have already been implemented, -particularly: - -=over - -=item * - -Compatibility with existing command line and script usage - -=item * - -Colour and brightness correction - -=item * - -Multiple TIFF output - -=item * - -PSD output with layer masks - -=item * - -Flattened TIFF, JPEG and PNG output - -=back - - -There is also new useful features not available in PTStitcher: - -=over - -=item * - -Cropped TIFF output - -=item * - -LZW compression of TIFF output - -=back - - -Features that haven't been implemented: - -=over - -=item * - -Support for VRML, PICT, QTVR, IVR - -=item * - -Support for other-than-rectilinear lenses such as fisheyes - -=item * - -Probably lots of other stuff - -=back - - -=head1 OPTIONS - -=over - -=item B<-o> I<prefix> - -Prefix for output filename, defaults to I<pano>. - -=item B<-q> - -Quiet run - -=item B<-h> - -Output help summary. - -=item B<-s> - -Sort the filenames provided on the command line in lexicographical -order (and only on the command line) - -=back - -If no images are specified on the command line, then the C<i> lines -are used. If C<i> lines do not contain a valid filename then the C<o> -lines are used. - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTmender was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PToptimizer.pod b/debian/manpages/PToptimizer.pod deleted file mode 100644 index 0e71e8c..0000000 --- a/debian/manpages/PToptimizer.pod +++ /dev/null @@ -1,29 +0,0 @@ -=head1 NAME - -PToptimizer - Wrapper around control point optimization routines - - -=head1 SYNOPSIS - -B<PToptimizer> I<script_file> - - -=head1 DESCRIPTION - -B<PToptimizer> is a simple wrapper around control point optimization -routines available in libpano13. - - -=head1 SEE ALSO - -L<http://www.panotools.info/mediawiki/index.php?title=PTOptimizer> - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTroller.pod b/debian/manpages/PTroller.pod deleted file mode 100644 index 803fa6e..0000000 --- a/debian/manpages/PTroller.pod +++ /dev/null @@ -1,52 +0,0 @@ -=head1 NAME - -PTroller - Merge several images into a single one - - -=head1 SYNOPSIS - -B<PTroller> [options] I<tiff_file(s)> - - -=head1 DESCRIPTION - -B<PTroller> takes a set of images and merges them into a single one. - - -=head1 OPTIONS - -=over - -=item B<-o> I<filename> - -Output filename (defaults to I<merged.tif>). - -=item B<-f> - -Force processing (do not stop on warnings). - -=item B<-x> - -Delete source files (use with care). - -=item B<-q> - -Quiet run - -=item B<-h> - -Show this message - -=back - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTroller was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTtiff2psd.pod b/debian/manpages/PTtiff2psd.pod deleted file mode 100644 index 30fb161..0000000 --- a/debian/manpages/PTtiff2psd.pod +++ /dev/null @@ -1,124 +0,0 @@ -=head1 NAME - -PTtiff2psd - Convert a set of TIFF files into a Photoshop PSD file - - -=head1 SYNOPSIS - -B<PTtiff2psd> [options] I<tiff_file(s)> - - -=head1 DESCRIPTION - -B<PTtiff2psd> is a command-line tool that crops a TIFF image to its -bounding rectangle, preserving its original dimensions. - - -=head1 OPTIONS - -=over - -=item B<-o> I<filename> - -Output filename (defaults to I<merged.psd>). - -=item B<-b> I<blendingmode> - -Specify blending mode for layers (use B<-h> to display them). - -=item B<-s> - -Stack them. - -=item B<-r> - -Reverse layers. - -=item B<-f> - -Force processing (do no stop on warning). - -=item B<-q> - -Quiet run - -=item B<-h> - -Output help summary. - -=back - - -Valid blending modes: - -=over - -=item B<0> - -Normal - -=item B<1> - -Color - -=item B<2> - -Darken - -=item B<3> - -Difference - -=item B<4> - -Dissolve - -=item B<5> - -Hard - -=item B<6> - -Hue - -=item B<7> - -Lighten - -=item B<8> - -Luminosity - -=item B<9> - -Multiply - -=item B<10> - -Overlay - -=item B<11> - -Sof - -=item B<12> - -Saturation - -=item B<13> - -Screen - -=back - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTtiff2psd was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTtiffdump.pod b/debian/manpages/PTtiffdump.pod deleted file mode 100644 index 207144b..0000000 --- a/debian/manpages/PTtiffdump.pod +++ /dev/null @@ -1,46 +0,0 @@ -=head1 NAME - -PTtiffdump - Compare two TIFF images - - -=head1 SYNOPSIS - -B<PTtiffdump> [options] I<tiff_file1> I<tiff_file2> - - -=head1 DESCRIPTION - -B<PTtiffdump> compares the contents of 2 different tiff files. If the -byte is different, it gets output. - - - -=head1 OPTIONS - -=over - -=item B<-o> - -Overwrite output file if it exists. - -=item B<-q> - -Quiet run - -=item B<-h> - -Output help summary. - -=back - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTtiffdump was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/PTuncrop.pod b/debian/manpages/PTuncrop.pod deleted file mode 100644 index 8d68632..0000000 --- a/debian/manpages/PTuncrop.pod +++ /dev/null @@ -1,58 +0,0 @@ -=head1 NAME - -PTuncrop - Uncrop TIFF images - - -=head1 SYNOPSIS - -B<PTuncrop> [options] I<input_file> I<output_file> - - -=head1 DESCRIPTION - -B<PTuncrop> does the opposite of B<PTcrop>: it takes a cropped file -and creates an uncropped one. - - -=head1 OPTIONS - -=over - -=item B<-p> I<prefix> - -Prefix for output files (defaults to I<uncropped%4d>). - -=item B<-f> - -Force processing: Overwrite output file if it exists. - -=item B<-x> - -Delete source files (use with care). - -=item B<-q> - -Quiet run. - -=item B<-q> - -Output help summary. - -=back - - -=head1 SEE ALSO - -L<PTcrop(1)> - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -PTuncrop was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/manpages/panoinfo.pod b/debian/manpages/panoinfo.pod deleted file mode 100644 index a4db8a2..0000000 --- a/debian/manpages/panoinfo.pod +++ /dev/null @@ -1,27 +0,0 @@ -=head1 NAME - -panoinfo - List details about the libpano13 library - - -=head1 SYNOPSIS - -B<panoinfo> - - -=head1 DESCRIPTION - -B<panoinfo> is a simple utility built alongside the libpano13 library -that outputs a list of details about the currently installed version -of this library. It is particularly useful for debugging. - - -=head1 AUTHORS - -Panorama Tools was originally created by Professor Helmut Dersch, it's -now maintained by Bruno Postle <[email protected]>. - -panoinfo was written by Daniel M German <[email protected]>. - -This manpage was written by Cyril Brulebois -<[email protected]> and is licensed under the same -terms as the libpano13 package itself. diff --git a/debian/rules b/debian/rules index c00f05b..008acc8 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,6 @@ include /usr/share/cdbs/1/class/autotools.mk # For the repack: package name, mangled upstream version, non-free files PACKAGE=libpano13 VERSION=$(shell dpkg-parsechangelog | perl -ne 'print "$$1\n" if (/^Version: (.*?)(?:\.dfsg)?\-.*?$$/)') -NONFREE_FILES=PixMap.c PixMap.h # --{list,fail}-missing don't make sense when dh_install is called for each @@ -36,15 +35,6 @@ DEB_CONFIGURE_SCRIPT_ENV += \ LIBS="-lm" -# Build manpages for each binary -build/$(PACKAGE)-bin:: - for i in debian/manpages/*.pod ; do \ - pod2man --center "LIBPANO13 TOOLS" \ - --release $(VERSION) \ - $$i -o $${i%%.pod}.1 ; \ - done - - # Between "make install" and "dh_*" calls common-install-arch:: # Clear the rpath set on some architectures (e.g. amd64) @@ -55,25 +45,8 @@ common-install-arch:: # DEB_DH_INSTALL_ARGS declaration dh_install --fail-missing $(DEB_DH_INSTALL_ARGS) - -# Clean the generated manpages -clean:: - rm -f debian/manpages/*.1 - - # Build the DFSG-free source tarball get-orig-source: # Download uscan --force-download --rename - # Extract and prune non-free files - tar xfz ../$(PACKAGE)_$(VERSION).orig.tar.gz - for i in $(NONFREE_FILES); do \ - rm $(PACKAGE)-$(VERSION)/$$i ; \ - done - - # Rename, repack and clean - mv $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).orig - tar cfz ../$(PACKAGE)_$(VERSION).dfsg.orig.tar.gz $(PACKAGE)-$(VERSION).orig - rm -rf $(PACKAGE)-$(VERSION).orig - -- 1.5.6.5
_______________________________________________ Pkg-phototools-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-phototools-devel
