Package: qtpfsgui
Version: 2.0~svn691-0.1
Severity: wishlist
Tags: patch

Hi,

I attach a patch against current git which update the package
for the new name of Qtpfsgui.

I have chosen to simply name the pacakge luminance (and not luminancehdr)
but I might be wrong.

I have also updated the packaging for the SVN snapshot available on SF
(rev 691 which is also called beta according to their homepage).

Maybe this beta could be uploaded to experimental in order to get a large
testing base for the upcoming new release?

Cheers,
Julien

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (150, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages qtpfsgui depends on:
ii  luminance                 2.0~svn691-0.1 graphical user interface providing

qtpfsgui recommends no packages.

qtpfsgui suggests no packages.

-- no debconf information
diff --git a/debian/changelog b/debian/changelog
index 3dab449..212e626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+luminance (2.0~svn691-0.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream development snapshot
+    + Cropping of HDR images
+    + Tonemapping selections
+    + Threads manager
+    + Added mantiuk08
+    + New help browser and new help content
+    + Project renamed from 'Qtpfsgui' to 'LuminanceHDR'
+  * Bump standards version to 3.8.3
+  * Switch to 3.0 (quilt) source format
+  * Add dirs file to create necessary directories
+  * Refresh Debian patches, update for new release
+  * Remove useless link to GPL-2 license
+  * Necessary changes due to upstream rename:
+    + Add dummy package to ease transition
+    + Fix Debian manpage for the new name
+
+ -- Julien Valroff <[email protected]>  Sat, 02 Jan 2010 17:38:01 +0100
+
 qtpfsgui (1.9.3-1) unstable; urgency=low
 
   [ Cyril Brulebois ]
diff --git a/debian/control b/debian/control
index 2dcb480..3b4f489 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,28 @@
-Source: qtpfsgui
+Source: luminance
 Section: graphics
 Priority: extra
 Maintainer: Debian PhotoTools Maintainers <[email protected]>
 Uploaders: Cyril Brulebois <[email protected]>
-Build-Depends: debhelper (>= 7.0.50), quilt, libqt4-dev, libexiv2-dev, libfftw3-dev, libopenexr-dev, libtiff4-dev
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7.0.50~), libqt4-dev, libexiv2-dev, libfftw3-dev, libopenexr-dev, libtiff4-dev, libgsl0-dev
+Standards-Version: 3.8.3
 Homepage: http://qtpfsgui.sourceforge.net/
 Vcs-Browser: http://git.debian.org/?p=pkg-phototools/qtpfsgui.git
 Vcs-Git: git://git.debian.org/git/pkg-phototools/qtpfsgui.git
 
 Package: qtpfsgui
+Depends: ${misc:Depends}, luminance
+Architecture: all
+Description: transitional dummy package for luminance
+ This is a dummy package to ease transition to new package name luminance.
+ .
+ It can be safely removed from your system.
+
+Package: luminance
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dcraw
+Provides: qtpfsgui
+Replaces: qtpfsgui (<= 1.9.3-1)
+Conflicts: qtpfsgui (<= 1.9.3-1)
 Description: graphical user interface providing a workflow for HDR imaging
  Features:
   * Create an HDR file from a set of images (formats: JPEG, TIFF 8bit and
@@ -29,3 +40,5 @@ Description: graphical user interface providing a workflow for HDR imaging
   * PFS native format (extension: pfs).
  .
  Supported LDR formats: JPEG, PNG, PPM, PBM, TIFF (8 bit).
+ .
+ LuminanceHDR was previously known as Qtpfsgui 
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index ca0272a..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTHORS
-README
-TODO
diff --git a/debian/links b/debian/links
deleted file mode 100644
index f77fc15..0000000
--- a/debian/links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/common-licenses/GPL-2 /usr/share/qtpfsgui/LICENSE
-/usr/share/doc/qtpfsgui/html     /usr/share/qtpfsgui/html
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index 03eec37..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/qtpfsgui.1
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index a564e7d..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(qtpfsgui):needs="X11" section="Applications/Graphics"\
-  title="qtpfsgui" command="/usr/bin/qtpfsgui"
diff --git a/debian/patches/10_remove_encoding_from_desktop_file b/debian/patches/10_remove_encoding_from_desktop_file
deleted file mode 100644
index 06accf1..0000000
--- a/debian/patches/10_remove_encoding_from_desktop_file
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/qtpfsgui.desktop
-+++ b/qtpfsgui.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Qtpfsgui
- Name[en_US]=Qtpfsgui
- GenericName=HDR imaging
diff --git a/debian/patches/20_gcc4.3_includes b/debian/patches/20_gcc4.3_includes
deleted file mode 100644
index 4bd338f..0000000
--- a/debian/patches/20_gcc4.3_includes
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Exif/exif_operations.cpp
-+++ b/src/Exif/exif_operations.cpp
-@@ -21,6 +21,7 @@
-  * @author Giuseppe Rota <[email protected]>
-  */
- 
-+#include <cstring>
- #include <image.hpp>
- #include <cmath>
- #include "exif_operations.h"
---- a/src/TM_operators/ashikhmin02/tmo_ashikhmin02.cpp
-+++ b/src/TM_operators/ashikhmin02/tmo_ashikhmin02.cpp
-@@ -29,6 +29,7 @@
- #include <iostream>
- #include <math.h>
- #include <assert.h>
-+#include <cstdlib>
- 
- #include "../../Libpfs/array2d.h"
- #include "tmo_ashikhmin02.h"
diff --git a/debian/patches/30_fix_documentation_search_path b/debian/patches/30_fix_documentation_search_path
deleted file mode 100644
index ebe1215..0000000
--- a/debian/patches/30_fix_documentation_search_path
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/MainWindow/mainWindow.cpp
-+++ b/src/MainWindow/mainWindow.cpp
-@@ -423,7 +423,7 @@ void MainGui::openDocumentation() {
- 	ui.setupUi(help);
- 	QString docDir = QCoreApplication::applicationDirPath();
- 	docDir.append("/../Resources/html");
--	ui.tb->setSearchPaths(QStringList("/usr/share/qtpfsgui/html") << "/usr/local/share/qtpfsgui/html" << "./html" << docDir << "/Applications/qtpfsgui.app/Contents/Resources/html");
-+	ui.tb->setSearchPaths(QStringList("/usr/share/doc/qtpfsgui/html") << "/usr/local/share/qtpfsgui/html" << "./html" << docDir << "/Applications/qtpfsgui.app/Contents/Resources/html");
- 	ui.tb->setSource(QUrl("index.html"));
- 	help->show();
- }
diff --git a/debian/patches/40_fix_desktop_file_icon b/debian/patches/40_fix_desktop_file_icon
deleted file mode 100644
index 301a107..0000000
--- a/debian/patches/40_fix_desktop_file_icon
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/qtpfsgui.desktop
-+++ b/qtpfsgui.desktop
-@@ -12,9 +12,9 @@ Comment[de]=Qtpfsgui ist eine grafische 
- Comment[en_US]=Qtpfsgui is a graphical user interface used to create and tonemap HDR images
- Comment[ru]=Qtpfsgui — программа для создания HDR-снимков и отображения тонов
- Comment[it]=Qtpfsgui e' una interfaccia grafica usata per creare ed eseguire il tonemapping di immagini HDR
--Comment[hu_HU]=Ez a program nagy megvilágítástartományú (HDR) képek előállítására és megtekintésére szolgál.
-+Comment[hu_HU]=Ez a program nagy megvilágítástartományú (HDR) képek előállítására és megtekintésére szolgál.
- Exec=qtpfsgui
--Icon=qtpfsgui.png
-+Icon=qtpfsgui
- MimeType=
- Path=
- StartupNotify=true
diff --git a/debian/patches/50_disable_opts b/debian/patches/50_disable_opts
deleted file mode 100644
index 3618b4e..0000000
--- a/debian/patches/50_disable_opts
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/project.pro
-+++ b/project.pro
-@@ -3,8 +3,7 @@ CONFIG += release qt thread
- DEFINES += QT_NO_DEBUG_OUTPUT
- 
- # Assume openmp-capable g++ (>=4.2)
--QMAKE_CXXFLAGS += -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe -fopenmp -msse2
--QMAKE_LFLAGS += -fopenmp
-+QMAKE_CXXFLAGS += -funroll-loops -fstrength-reduce -fschedule-insns2 -felide-constructors -frerun-loop-opt -fexceptions -fno-strict-aliasing -fexpensive-optimizations -ffast-math -pipe
- 
- TARGET = qtpfsgui
- 
diff --git a/debian/patches/series b/debian/patches/series
index 357e50f..773408f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-10_remove_encoding_from_desktop_file
-20_gcc4.3_includes
-30_fix_documentation_search_path
-40_fix_desktop_file_icon
-50_disable_opts
+10_fix-desktop-file
+20_fix-typo
diff --git a/debian/qtpfsgui.pod b/debian/qtpfsgui.pod
deleted file mode 100644
index 2aebf20..0000000
--- a/debian/qtpfsgui.pod
+++ /dev/null
@@ -1,80 +0,0 @@
-=head1 NAME
-
-qtpfsgui - GUI offering a workflow for HDR imaging
-
-
-=head1 SYNOPSIS
-
-B<qtpfsgui>
-
-
-=head1 DESCRIPTION
-
-Qtpfsgui is an open source graphical user interface application that
-aims to provide a workflow for HDR imaging.
-
-Supported HDR formats:
-
-=over
-
-=item *
-OpenEXR (extension: exr)
-
-=item *
-Radiance RGBE (extension: hdr)
-
-=item *
-Tiff formats: 16bit, 32bit (float) and LogLuv (extension: tiff)
-
-=item *
-Raw image formats (extension: various)
-
-=item *
-PFS native format (extension: pfs)
-
-=back
-
-
-Supported LDR formats:
-
-=over
-
-=item *
-JPEG, PNG, PPM, PBM, TIFF(8 bit)
-
-=back
-
-
-Supported features:
-
-=over
-
-=item *
-Create an HDR file from a set of images (formats: JPEG, TIFF 8bit and 16bit, RAW) of the same scene taken at different exposure setting.
-
-=item *
-Save and load HDR images.
-
-=item *
-Rotate and resize HDR images.
-
-=item *
-Tonemap HDR images.
-
-=item *
-Copy exif data between sets of images.
-
-=item *
-Supports internationalization.
-
-=back
-
-
-=head1 AUTHOR
-
-Qtpfsgui was written by Giuseppe Rota and several contributors (see
-also the L<AUTHORS> file).
-
-This manual page was written by Cyril Brulebois
-<[email protected]> and is licensed under the same term
-as the package itself.
diff --git a/debian/rules b/debian/rules
index 61f813b..afcef0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,11 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 # Various variables used later on:
 NOT_NEEDED  = AUTHORS INSTALL LICENSE README Changelog
-DEB_DESTDIR = $(CURDIR)/debian/qtpfsgui
-MANPAGE     = debian/qtpfsgui.1
+DEB_DESTDIR = $(CURDIR)/debian/luminance
+MANPAGE     = debian/luminance.1
 
-override_dh_auto_configure: $(QUILT_STAMPFN)
+override_dh_auto_configure:
 	# Generate localization files before qmake is run:
 	lrelease-qt4 project.pro
 	# Avoid the default /usr/local prefix:
@@ -17,21 +15,21 @@ override_dh_auto_build:
 	# Normal auto_build:
 	dh_auto_build
 	# Build the minimal manpage:
-	pod2man --center='Minimal qtpfsgui manpage' \
+	pod2man --center='Minimal luminance manpage' \
 		--release='' \
-		debian/qtpfsgui.pod > $(MANPAGE)
+		debian/luminance.pod > $(MANPAGE)
 
 override_dh_auto_install:
 	# Install in a subdirectory, not in /:
 	$(MAKE) install INSTALL_ROOT=$(DEB_DESTDIR)
-	# Move the doc where it belongs
-	mkdir -p $(DEB_DESTDIR)/usr/share/doc/qtpfsgui
-	mv $(DEB_DESTDIR)/usr/share/qtpfsgui/html \
-		$(DEB_DESTDIR)/usr/share/doc/qtpfsgui
 	# Remove unneeded files
 	for i in $(NOT_NEEDED); do \
-		rm $(DEB_DESTDIR)/usr/share/qtpfsgui/$$i ; \
+		rm $(DEB_DESTDIR)/usr/share/luminance/$$i ; \
 	done
+	# Remove empty directory
+	 rmdir $(DEB_DESTDIR)/usr/share/luminance/help/img/
+	# Do not ship unused jquery js library
+	rm -r $(DEB_DESTDIR)/usr/share/luminance/help/js/
 
 override_dh_auto_clean:
 	# Normal auto_clean:
@@ -39,11 +37,5 @@ override_dh_auto_clean:
 	# Delete generated files:
 	rm -f i18n/*.qm $(MANPAGE)
 
-clean: unpatch
-	dh $@
-
-build: patch
-	dh $@
-
 %:
 	dh $@

Reply via email to