Package: cthumb
Version: 4.2-3
Severity: normal
Tags: patch pending
Control: tags 817321 800207 260059 813387 395777 + patch
Control: tags 817321 800207 260059 813387 395777 + pending
Dear maintainer,
I've prepared an NMU for cthumb (versioned as 4.2-3.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru cthumb-4.2/cthumb.in cthumb-4.2/cthumb.in
--- cthumb-4.2/cthumb.in 2016-12-19 18:38:49.000000000 +0000
+++ cthumb-4.2/cthumb.in 2002-08-13 17:24:05.000000000 +0000
@@ -1698,15 +1698,15 @@
print "\tgenerating $dest ... ";
if ($UseMogrify) {
- system "cp \"$src\" \"$dest\"";
+ system "cp $src $dest";
my $cmd = "mogrify -rotate \"$destRotate\" -geometry
\"${destWidth}x${destHeight}>\" -quality $quality";
if ($InsertExif){
- my $new_cmd = "jhead -cmd '$cmd &i' \"$dest\"";
+ my $new_cmd = "jhead -cmd '$cmd &i' $dest";
if (system($new_cmd)) { print "cthumb warning: command '$new_cmd'
failed: $!\n"; }
else {print "done.\n";}
} else {
- my $new_cmd = "$cmd \"$dest\"";
+ my $new_cmd = "$cmd $dest";
if (system($new_cmd)) { print "cthumb warning: command '$new_cmd'
failed: $!\n"; }
else {print "done.\n";}
}
diff -Nru cthumb-4.2/debian/01_quotation_fix.patch
cthumb-4.2/debian/01_quotation_fix.patch
--- cthumb-4.2/debian/01_quotation_fix.patch 2016-12-19 18:38:49.000000000
+0000
+++ cthumb-4.2/debian/01_quotation_fix.patch 1970-01-01 00:00:00.000000000
+0000
@@ -1,22 +0,0 @@
---- cthumb-4.2.orig/cthumb.in
-+++ cthumb-4.2/cthumb.in
-@@ -1698,15 +1698,15 @@
-
- print "\tgenerating $dest ... ";
- if ($UseMogrify) {
-- system "cp $src $dest";
-+ system "cp \"$src\" \"$dest\"";
- my $cmd = "mogrify -rotate \"$destRotate\" -geometry
\"${destWidth}x${destHeight}>\" -quality $quality";
- if ($InsertExif){
-- my $new_cmd = "jhead -cmd '$cmd &i' $dest";
-+ my $new_cmd = "jhead -cmd '$cmd &i' \"$dest\"";
- if (system($new_cmd)) { print "cthumb warning: command '$new_cmd'
failed: $!\n"; }
- else {print "done.\n";}
-
- } else {
-- my $new_cmd = "$cmd $dest";
-+ my $new_cmd = "$cmd \"$dest\"";
- if (system($new_cmd)) { print "cthumb warning: command '$new_cmd'
failed: $!\n"; }
- else {print "done.\n";}
- }
-
diff -Nru cthumb-4.2/debian/changelog cthumb-4.2/debian/changelog
--- cthumb-4.2/debian/changelog 2016-12-19 18:38:49.000000000 +0000
+++ cthumb-4.2/debian/changelog 2016-10-24 02:07:51.000000000 +0000
@@ -1,3 +1,31 @@
+cthumb (4.2-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Created debian/cthumb.manpages.
+ * Updated to DH 10. (Closes: #817321, #800207)
+ * debian/control:
+ - Added Homepage field.
+ - Added ${misc:Depends} in Depends field.
+ - Added jhead as dependency. (Closes: #260059, LP: #1019789)
+ - Bumped Standards-Version to 3.9.8.
+ - Removed the leading article from short description.
+ - Fixed libjpeg-turbo-progs dependency. (Closes: #813387)
+ * debian/copyright:
+ - Updated Copyright format to 1.0.
+ - Fixed license link.
+ * debian/patches:
+ - Fixed doc location in manpage and syntax.
+ - Migrate quotation fix to quilt format (Thanks, [email protected]).
+ * debian/rules:
+ - Migrated to new (reduced) format. (Closes: #395777)
+ * debian/source:
+ - Added format 3.0 (quilt).
+ * debian/watch:
+ - Created the watch file.
+ * Run wrap-and-sort.
+
+ -- Fernando Ike <[email protected]> Mon, 24 Oct 2016 00:07:51 -0200
+
cthumb (4.2-3) unstable; urgency=low
* debian/control: Add rsync to Build-Conflict-Indep, so that it does
@@ -8,7 +36,7 @@
cthumb (4.2-2) unstable; urgency=low
- * cthumb.in: Quote filenames when using mogrify to avoid errors
+ * cthumb.in: Quote filenames when using mogrify to avoid errors
with blanks inside filenames; Closes: #160647
* debian/changelog: Removed local Emacs-variables
@@ -38,7 +66,7 @@
cthumb (3.7.1-2) unstable; urgency=low
- * Slight change in Makefile.in
+ * Slight change in Makefile.in
* Still from 3.7.1-1: Added clean and distclean targets and
a $(themedir) variable to Makefile.in
@@ -79,7 +107,7 @@
cthumb (3.4-1) unstable; urgency=low
* Initial Release.
- * Moved /usr/share/images/cthumb to /usr/share/cthumb as those
+ * Moved /usr/share/images/cthumb to /usr/share/cthumb as those
aren't really images but themes.
-- Michael Banck <[email protected]> Fri, 20 Jul 2001 21:32:40 +0000
diff -Nru cthumb-4.2/debian/compat cthumb-4.2/debian/compat
--- cthumb-4.2/debian/compat 1970-01-01 00:00:00.000000000 +0000
+++ cthumb-4.2/debian/compat 2016-10-24 02:07:51.000000000 +0000
@@ -0,0 +1 @@
+10
diff -Nru cthumb-4.2/debian/control cthumb-4.2/debian/control
--- cthumb-4.2/debian/control 2016-12-19 18:38:49.000000000 +0000
+++ cthumb-4.2/debian/control 2016-10-24 02:07:51.000000000 +0000
@@ -2,24 +2,30 @@
Section: web
Priority: optional
Maintainer: Michael Banck <[email protected]>
-Build-Depends-Indep: debhelper (>> 3.0.0)
+Build-Depends-Indep: debhelper (>= 10)
Build-Conflicts-Indep: rsync
-Standards-Version: 3.5.6.1
+Standards-Version: 3.9.8
+Homepage: http://cthumb.sourceforge.net/
Package: cthumb
Architecture: all
-Depends: ${perl:Depends}, libwww-perl, libjpeg-progs, netpbm
+Depends: libjpeg-turbo-progs,
+ libwww-perl,
+ netpbm,
+ ${misc:Depends},
+ ${perl:Depends}
+Recommends: jhead
Suggests: imagemagick
-Description: A program to generate themable Web picture albums
- cthumb allows you to create themable web picture albums, i.e.
- collections of digital pictures, with small thumbnails of your pictures
- and with captions. In addition, it optionally allows you to have
- several views of the collection of pictures. An album is composed of a
- series of pages, each composed of a collection of pictures. For each
- page (and each picture), you can have several annotations per picture.
- cthumb will generate several versions of the page, for each annotation
+Description: Program to generate themable Web picture albums
+ cthumb allows you to create themable web picture albums, i.e.
+ collections of digital pictures, with small thumbnails of your pictures
+ and with captions. In addition, it optionally allows you to have
+ several views of the collection of pictures. An album is composed of a
+ series of pages, each composed of a collection of pictures. For each
+ page (and each picture), you can have several annotations per picture.
+ cthumb will generate several versions of the page, for each annotation
type.
.
- You can customize almost everything in the way the albums look on the
- screen, from the size of the thumbnails to the background and foreground
+ You can customize almost everything in the way the albums look on the
+ screen, from the size of the thumbnails to the background and foreground
colors, the border colors, whether you want film-strips, etc.
diff -Nru cthumb-4.2/debian/copyright cthumb-4.2/debian/copyright
--- cthumb-4.2/debian/copyright 2016-12-19 18:38:49.000000000 +0000
+++ cthumb-4.2/debian/copyright 2016-10-24 02:07:51.000000000 +0000
@@ -1,26 +1,42 @@
-This package was debianized by Michael Banck <[email protected]> on
-Thu, 14 Jun 2001 18:02:20 +0000.
-
-It was downloaded from http://puchol.com/cpg/software/cthumb
-
-Upstream Author is Carlos Puchol, [email protected]
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://cthumb.sourceforge.net/
+Files: *
Copyright:
+ 1999-2002, Carlos Puchol <[email protected]>
+ 2001, Artur Kedzierski <[email protected]>
+ 2001, Bastiaan Niels Veelo <[email protected]>
+ 2001, Ben Elliston <[email protected]>
+ 2001, Eric Veldhuyzen <[email protected]>
+ 2001, Thomas Hammer <[email protected]>
+ 2001, Michael Banck <[email protected]>
+ 2001, Niels Bakker <[email protected]>
+ 2001, Steve Beach <[email protected]>
+ 2001, Ying Zhang <[email protected]>
+ 2001-2002, Irving Wolfe <[email protected]>
+ 2001-2002, Terry Gdt <[email protected]>
+ 2002, Christian Maegaard <[email protected]>
+ 2002, Eric Leblond <[email protected]>
+License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Files: debian/*
+Copyright:
+ 2001-2003, Michael Banck <[email protected]>
+License: GPL-2+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff -Nru cthumb-4.2/debian/cthumb.manpages cthumb-4.2/debian/cthumb.manpages
--- cthumb-4.2/debian/cthumb.manpages 1970-01-01 00:00:00.000000000 +0000
+++ cthumb-4.2/debian/cthumb.manpages 2016-10-24 02:07:51.000000000 +0000
@@ -0,0 +1 @@
+cthumb.1
diff -Nru cthumb-4.2/debian/patches/01_quotation_fix.patch
cthumb-4.2/debian/patches/01_quotation_fix.patch
--- cthumb-4.2/debian/patches/01_quotation_fix.patch 1970-01-01
00:00:00.000000000 +0000
+++ cthumb-4.2/debian/patches/01_quotation_fix.patch 2016-10-24
02:07:51.000000000 +0000
@@ -0,0 +1,25 @@
+From: Michael Banck <[email protected]>
+Subject: Quote filenames when using mogrify
+
+Bug-Debian: http://bugs.debian.org/160647
+--- a/cthumb.in
++++ b/cthumb.in
+@@ -1698,15 +1698,15 @@
+
+ print "\tgenerating $dest ... ";
+ if ($UseMogrify) {
+- system "cp $src $dest";
++ system "cp \"$src\" \"$dest\"";
+ my $cmd = "mogrify -rotate \"$destRotate\" -geometry
\"${destWidth}x${destHeight}>\" -quality $quality";
+ if ($InsertExif){
+- my $new_cmd = "jhead -cmd '$cmd &i' $dest";
++ my $new_cmd = "jhead -cmd '$cmd &i' \"$dest\"";
+ if (system($new_cmd)) { print "cthumb warning: command '$new_cmd'
failed: $!\n"; }
+ else {print "done.\n";}
+
+ } else {
+- my $new_cmd = "$cmd $dest";
++ my $new_cmd = "$cmd \"$dest\"";
+ if (system($new_cmd)) { print "cthumb warning: command '$new_cmd'
failed: $!\n"; }
+ else {print "done.\n";}
+ }
diff -Nru cthumb-4.2/debian/patches/02_man_location.patch
cthumb-4.2/debian/patches/02_man_location.patch
--- cthumb-4.2/debian/patches/02_man_location.patch 1970-01-01
00:00:00.000000000 +0000
+++ cthumb-4.2/debian/patches/02_man_location.patch 2016-10-24
02:07:51.000000000 +0000
@@ -0,0 +1,28 @@
+From: Fernando Ike <[email protected]>
+Subject: Fixed directory documentation on manpage.
+
+--- a/cthumb.1.in
++++ b/cthumb.1.in
+@@ -26,7 +26,7 @@
+ accumulate lots and lots of digital pictures and you need to label
+ them and sort them out. Perhaps also you have friends and family that
+ speak different languages. This program lets you very easily make
+-picture albums and have the same pictures labelled in one or more
++picture albums and have the same pictures labeled in one or more
+ languages.
+ .PP
+ You can customize almost everything in the way the albums look on the
+@@ -60,11 +60,11 @@
+ .I Cthumb
+ creates several HTML files, one per "Page" in the album.
+ .PP
+-Check the README file (probably in /usr/doc/cthumb*/README) for more detailed
info.
++Check the README file (probably in /usr/share/doc/cthumb/README) for more
detailed info.
+ .SH OPTIONS
+ .TP 12
+ .B \-c <files>
+-Create an album file with the files listed and spit it out in stadard out.
++Create an album file with the files listed and spit it out in standard out.
+ .TP
+ .B \-l <n>
+ Do pages in <n> languages.
diff -Nru cthumb-4.2/debian/patches/series cthumb-4.2/debian/patches/series
--- cthumb-4.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ cthumb-4.2/debian/patches/series 2016-10-24 02:07:51.000000000 +0000
@@ -0,0 +1,2 @@
+01_quotation_fix.patch
+02_man_location.patch
diff -Nru cthumb-4.2/debian/rules cthumb-4.2/debian/rules
--- cthumb-4.2/debian/rules 2016-12-19 18:38:49.000000000 +0000
+++ cthumb-4.2/debian/rules 2016-10-24 02:07:51.000000000 +0000
@@ -1,54 +1,15 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-#export DH_VERBOSE=1
-export DH_COMPAT=3
+%:
+ dh $@ --without autoreconf
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man
--with-themedir=/usr/share/cthumb
- touch configure-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) distclean
- dh_clean
-
-install: configure
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_auto_install:
$(MAKE) install prefix=$(CURDIR)/debian/cthumb/usr \
themedir=$(CURDIR)/debian/cthumb/usr/share/cthumb
- install -m 666 cthumbrc.sample
$(CURDIR)/debian/cthumb/usr/share/doc/cthumb/examples
- install contrib/*album
$(CURDIR)/debian/cthumb/usr/share/doc/cthumb/scripts
+ install -m 666 cthumbrc.sample
$(CURDIR)/debian/cthumb/usr/share/doc/cthumb/examples
+ install contrib/*album
$(CURDIR)/debian/cthumb/usr/share/doc/cthumb/scripts
+dh_autoreconf_clean:
-binary-indep: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installman
+override_dh_installchangelogs:
dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff -Nru cthumb-4.2/debian/source/format cthumb-4.2/debian/source/format
--- cthumb-4.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000
+++ cthumb-4.2/debian/source/format 2016-10-24 02:07:51.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru cthumb-4.2/debian/watch cthumb-4.2/debian/watch
--- cthumb-4.2/debian/watch 1970-01-01 00:00:00.000000000 +0000
+++ cthumb-4.2/debian/watch 2016-10-24 02:07:51.000000000 +0000
@@ -0,0 +1,2 @@
+version=4
+http://sf.net/cthumb/ cthumb-([0-9].+)\.tar\.gz debian uupdate
