Renamed source package to "enblend-enfuse" and added binary package "enfuse".

 * Upstream renamed the source package in the same way.
 * Use dh_install.
 * Do not rename the top level source directory when repacking.

diff --git a/debian/bin/uscan_repack.sh b/debian/bin/uscan_repack.sh
index ca1d079a8ccd65f7f4229f66c30c349cc2773552..eedf11389fa28ea87d779a87b452df6182e4ff5f 100755 (executable)
--- a/debian/bin/uscan_repack.sh
+++ b/debian/bin/uscan_repack.sh
@@ -16,17 +16,17 @@ toplevel_sourcedir=`tar ztf ${filename} | head -n 1 | sed -e 's,/.*,,g'`
 tar zxf ${filename}
 rm -f ${filename}
 
-mv $toplevel_sourcedir enblend-$version+dfsg
+mv $toplevel_sourcedir $toplevel_sourcedir+dfsg
 
-rm -rf enblend-$version+dfsg/src/win32helpers
-find enblend-$version+dfsg -name '*.vcproj' -o -name '*.sln' | xargs rm -f
+rm -rf $toplevel_sourcedir+dfsg/src/win32helpers
+find $toplevel_sourcedir+dfsg -name '*.vcproj' -o -name '*.sln' | xargs rm -f
 
 for patch in debian/patches-repack/*.patch; do
-       ( cd enblend-$version+dfsg; patch -p1 ) < $patch
+       ( cd $toplevel_sourcedir+dfsg; patch -p1 ) < $patch
 done
 
 (
-       cd enblend-$version+dfsg
+       cd $toplevel_sourcedir+dfsg
        aclocal -I m4
        autoheader -f
        automake -acf
@@ -34,7 +34,7 @@ done
        rm -rf autom4te.cache/ config.h.in~
 )
 
-tar cf - enblend-$version+dfsg | gzip -9 \
-       > ../enblend_$version+dfsg.orig.tar.gz
-rm -rf enblend-$version+dfsg
+tar cf - $toplevel_sourcedir+dfsg | gzip -9 \
+       > ../enblend-enfuse_$version+dfsg.orig.tar.gz
+rm -rf $toplevel_sourcedir+dfsg
 

diff --git a/debian/changelog b/debian/changelog
index 9a1f3e044391f760ea3bdcc59d84f290b9d3eb5e..9561e2da21ebea6185e842448baf90428c089f82 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-enblend (3.2+dfsg-1) experimental; urgency=low
+enblend-enfuse (3.2+dfsg-1) experimental; urgency=low
 
   * New upstream release (Closes: #491370).
 
@@ -25,6 +25,7 @@ enblend (3.2+dfsg-1) experimental; urgency=low
       upstream tarball using debian/bin/uscan_repack.sh - thanks to Bernd
       Zeimetz for the idea!
     - Remove rebuilt documentation files.
+    - Use dh_install.
   * debian/patches:
     - Removed gcc4.3-includes.dpatch - included upstream.
     - Removed type_mismatch.dpatch - included upstream.
@@ -36,6 +37,8 @@ enblend (3.2+dfsg-1) experimental; urgency=low
       linker flags - based on a patch by Andreas.
   * debian/control:
     - Updated standards-version to 3.8.0 - no changes.
+    - Renamed the source package to "enblend-enfuse" - just like upstream did.
+    - Added new binary package "enfuse".
   * debian/bin/uscan_repack.sh:
     - Added script to take care of the repacking.
     - Remove src/win32helpers/.
@@ -45,7 +48,7 @@ enblend (3.2+dfsg-1) experimental; urgency=low
   * debian/watch:
     - Call debian/bin/uscan_repack.sh.
 
- -- Sebastian Harl <sh@tokkee.org>  Fri, 10 Oct 2008 15:19:43 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 12 Oct 2008 20:33:27 +0200
 
 enblend (3.0+dfsg-2) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 701ce46e47530c7202d95cc8b9ac7907644a9ddb..93108bee3a2c9972544736afe5f605feba00a392 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: enblend
+Source: enblend-enfuse
 Section: graphics
 Priority: optional
 Maintainer: Debian PhotoTools Maintainers <pkg-phototools-devel@lists.alioth.debian.org>
@@ -14,7 +14,7 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: hugin
 Enhances: hugin
-Description: image blending tools
+Description: image blending tool
  Enblend is a tool for compositing images. Given a set of images that overlap
  in some irregular way, Enblend overlays them in such a way that the seam
  between the images is invisible, or at least very difficult to see. It can,
@@ -31,6 +31,16 @@ Description: image blending tools
  wide transition zone because any sudden change in color will be immediately
  noticeable.
  .
+ Enblend does not align images for you. Use a tool like Hugin or PanoTools to
+ do this. The TIFFs produced by these programs are exactly what Enblend is
+ designed to work with.
+
+Package: enfuse
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: hugin
+Enhances: hugin
+Description: image exposure blending tool
  Enfuse blends differently exposed images of the same scene into a nice output
  image, without producing intermediate HDR images that are then tonemapped to a
  viewable image. This simplified process often works much better and quicker
@@ -42,7 +52,7 @@ Description: image blending tools
  high saturation. These weights determine how much a given pixel will
  contribute to the final image.
  .
- Both Enblend and Enfuse do not align images for you. Use a tool like Hugin or
- PanoTools to do this. The TIFFs produced by these programs are exactly what
- Enblend and Enfuse are designed to work with.
+ Enfuses does not align images for you. Use a tool like Hugin or PanoTools to
+ do this. The TIFFs produced by these programs are exactly what Enfuse is
+ designed to work with.
 

diff --git a/debian/enblend.install b/debian/enblend.install
new file mode 100644 (file)
index 0000000..356c7a1
--- /dev/null
+++ b/debian/enblend.install
@@ -0,0 +1,4 @@
+usr/bin/enblend
+usr/share/info/enfuse.info
+usr/share/man/man1/enblend.1
+

diff --git a/debian/enfuse.install b/debian/enfuse.install
new file mode 100644 (file)
index 0000000..f3bd7ff
--- /dev/null
+++ b/debian/enfuse.install
@@ -0,0 +1,5 @@
+usr/bin/enfuse
+usr/share/info/enfuse-focus-stacking.info
+usr/share/info/enfuse.info
+usr/share/man/man1/enfuse.1
+

diff --git a/debian/rules b/debian/rules
index 444eec60e738d79b52cb369f92ce68f64aa879cf..6b51e8ed0ccf54ea4d399785062fefa99b42edd7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules for enblend
+# debian/rules for enblend-enfuse
 #
 # Written by Sebastian Harl <sh@tokkee.org>.
 
@@ -58,7 +58,7 @@ install: build
        dh_clean -k 
        dh_installdirs
        
-       $(MAKE) DESTDIR=$(CURDIR)/debian/enblend install
+       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 binary-indep:
        # nothing to do here
@@ -69,6 +69,7 @@ binary-arch: build install
        dh_installchangelogs ChangeLog
        dh_installdocs NEWS TODO AUTHORS
        dh_installexamples
+       dh_install --sourcedir=debian/tmp --list-missing
        dh_installman
        dh_installinfo doc/*.info
        dh_link