uncommitted - ciderwebmail
Ready changes
Summary
Import uploads missing from VCS:Diff
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b955410
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+/blib
+/Makefile
+/Makefile.old
+/cover_db
+/inc
+/pm_to_blib
+/runtests
+/root/var/user_settings.sql
+/root/templates/cs
+/root/templates/da
+/root/templates/de
+/root/templates/en
+/root/templates/ru
+/root/locale/cs/LC_MESSAGES/CiderWebmail.mo
+/root/locale/da/LC_MESSAGES/CiderWebmail.mo
+/root/locale/de/LC_MESSAGES/CiderWebmail.mo
+/root/locale/en/LC_MESSAGES/CiderWebmail.mo
+/root/locale/ru/LC_MESSAGES/CiderWebmail.mo
diff --git a/debian/changelog b/debian/changelog
index f09310a..4c2f61a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+ciderwebmail (1.05+20221106-1) unstable; urgency=medium
+
+ [ upstream ]
+ * development snapshot
+ + fix bug when throwing an error
+
+ [ Jonas Smedegaard ]
+ * update git-buildpackage config:
+ + use DEP-14 git branches
+ + enable automatic DEP-14 branch name handling
+ + add usage config
+ * simplify rules;
+ stop build-depend on cdbs dh-buildinfo
+ * use debhelper compatibility level 13 (not 10);
+ build-depend on debhelper-compat (not debhelper)
+ * declare compliance with Debian Policy 4.6.2
+ * set Rules-Requires-Root: no
+ * simplify source helper tool copyright-check
+ * update copyright info: update coverage
+
+ -- Jonas Smedegaard <dr@jones.dk> Mon, 26 Dec 2022 13:15:47 +0100
+
ciderwebmail (1.05+20191006-3) UNRELEASED; urgency=medium
* Update lintian override info format in d/source/lintian-overrides on line
diff --git a/debian/ciderwebmail.links b/debian/ciderwebmail.links
index 614b5bf..ce275c5 100644
--- a/debian/ciderwebmail.links
+++ b/debian/ciderwebmail.links
@@ -1 +1,2 @@
/etc/ciderwebmail/apache2-uwsgi.conf /etc/apache2/conf-available/ciderwebmail.conf
+/etc/ciderwebmail/custom.css /usr/share/ciderwebmail/root/static/css/custom.css
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..be64586
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+root/locale/*/LC_MESSAGES/*.mo
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index ebf8b4f..5bc2be6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,9 @@ Section: web
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs,
+Build-Depends:
perl,
- debhelper (>= 10~),
- dh-buildinfo,
+ debhelper-compat (= 13),
libmoose-perl,
liblog-dispatch-perl,
libparse-recdescent-perl,
@@ -66,15 +65,74 @@ Homepage: https://ciderwebmail.org/
Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/ciderwebmail.git
Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/ciderwebmail
Testsuite: autopkgtest-pkg-perl
+Rules-Requires-Root: no
Package: ciderwebmail
Architecture: all
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${cdbs:Depends},
+Depends:
+ adduser,
+ libcatalyst-action-renderview-perl,
+ libcatalyst-action-renderview-perl,
+ libcatalyst-authentication-credential-http-perl,
+ libcatalyst-model-dbic-schema-perl,
+ libcatalyst-perl,
+ libcatalyst-plugin-authentication-perl,
+ libcatalyst-plugin-configloader-perl,
+ libcatalyst-plugin-log-dispatch-perl,
+ libcatalyst-plugin-session-state-cookie-perl,
+ libcatalyst-plugin-session-store-fastmmap-perl,
+ libcatalyst-plugin-stacktrace-perl,
+ libcatalyst-plugin-static-simple-perl,
+ libcatalyst-view-petal-perl,
+ libclone-perl,
+ libcrypt-cbc-perl,
+ libcrypt-random-source-perl,
+ libcrypt-rijndael-perl,
+ libcrypt-util-perl,
+ libdata-ical-perl,
+ libdatetime-format-iso8601-perl,
+ libdatetime-format-mail-perl,
+ libdatetime-perl,
+ libemail-address-xs-perl,
+ libemail-sender-perl,
+ libemail-simple-perl,
+ libemail-valid-perl,
+ libhtml-defang-perl,
+ libhtml-tidy-perl,
+ libio-socket-ssl-perl,
+ libjson-xs-perl,
+ liblist-moreutils-perl,
+ liblocale-maketext-gettext-perl,
+ liblog-dispatch-config-perl,
+ liblog-dispatch-perl,
+ libmail-imapclient-perl (>= 3.41),
+ libmime-base64-urlsafe-perl,
+ libmime-tools-perl,
+ libmoose-perl,
+ libmoosex-role-withoverloading-perl,
+ libnet-managesieve-perl,
+ libparse-recdescent-perl,
+ libpetal-utils-perl,
+ libregexp-common-perl,
+ libtext-autoformat-perl,
+ libtext-iconv-perl,
+ libtry-tiny-perl,
+ libtry-tiny-smartcatch-perl,
+ liburi-perl,
+ libyaml-libyaml-perl,
+ libyaml-perl,
${misc:Depends},
${perl:Depends}
-Recommends: ${cdbs:Recommends}
-Suggests: ${cdbs:Suggests}
+Recommends:
+ libauthen-sasl-perl,
+ default-mta | mail-transport-agent,
+ libdbd-sqlite3-perl,
+Suggests:
+ dovecot | imap-server,
+ imapproxy,
+ libfcgi-perl,
+ libfcgi-procmanager-perl,
Description: IMAP webmail service
CiderWebmail is a modern, user friendly and maintenance free webmail
application. It's targeted at mailserver administrators who need to
diff --git a/debian/copyright b/debian/copyright
index f341493..28160b7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,8 @@ Source: http://ciderwebmail.org/download/index.html
git://github.com/mreitinger/CiderWebmail
Files: *
-Copyright: Stefan Seifert
+Copyright:
+ Stefan Seifert
License-Grant:
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
@@ -22,47 +23,60 @@ Comment:
No copyright holder is listed explicitly. Stefan Seifert is listed as
author and so is assumed to also be copyright holder.
-Files: root/static/images/*.png
-Copyright: 2007 David Miller <miller@oxygen-icons.org>
- 2007 David Vignoni <david@icon-king.com>
- 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
- 2007 Kenneth Wimer <kwwii@bootsplash.org>
- 2007 Nuno Pinheiro <nuno@oxygen-icons.org>
- 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
+Files:
+ root/static/images/*.png
+Copyright:
+ 2007 David Miller <miller@oxygen-icons.org>
+ 2007 David Vignoni <david@icon-king.com>
+ 2007 Johann Ollivier Lapeyre <johann@oxygen-icons.org>
+ 2007 Kenneth Wimer <kwwii@bootsplash.org>
+ 2007 Nuno Pinheiro <nuno@oxygen-icons.org>
+ 2007 Riccardo Iaconelli <riccardo@oxygen-icons.org>
License-Grant:
address_book.png, attachment.png, compose.png, folder.png, inbox.png,
logout.png, manage_folders.png, mail_forward.png, mail_reply.png,
mail_reply_all.png, mail_reply_list.png, mimeicons/* message*.png,
- sent.png, flag.png, flag-red.png and trash.png are taken from the KDE 4
- Oxygen icon theme and are covered by LGPL version 2.1 or later
- https://www.gnu.org/licenses/lgpl-2.1.txt
+ sent.png, flag.png, flag-red.png and trash.png
+ are taken from the KDE 4 Oxygen icon theme
+ and are covered by LGPL version 2.1 or later
+ <https://www.gnu.org/licenses/lgpl-2.1.txt>
License: LGPL-2.1+
-Files: root/static/images/btn_*.png
+Files:
+ root/static/images/btn_*.png
root/static/images/catalyst_logo.png
-Copyright: Catalyst Contributors
+Copyright:
+ Catalyst Contributors
License-Grant:
- This library is free software. You can redistribute it and/or modify it
+ This library is free software.
+ You can redistribute it and/or modify it
under the same terms as Perl itself.
License: Artistic or GPL-1+
Comment:
- Perl 5 is licensed under either the 'Artistic license' or the 'GNU
- General Public License' version 1 or later.
+ Perl 5 is licensed under either the 'Artistic license'
+ or the 'GNU General Public License' version 1 or later.
-Files: debian/*
-Copyright: 2012-2017, Jonas Smedegaard <dr@jones.dk>
+Files:
+ debian/*
+Copyright:
+ 2012-2022 Jonas Smedegaard <dr@jones.dk>
+ 2020-2021 Purism, SPC
License-Grant:
- This program 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 3, or (at your option) any
- later version.
+ This program 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 3, or (at your option) any later version.
License: GPL-3+
+License-Reference: debian/copyright
-Files: debian/patches/1001*
-Copyright: 2013, Jonas Smedegaard <dr@jones.dk>
+Files:
+ debian/patches/1001*
+Copyright:
+ 2013 Jonas Smedegaard <dr@jones.dk>
License-Grant:
- This file is distributed under the same license as the CiderWebmail
- package.
+ This file is distributed
+ under the same license as the CiderWebmail package.
License: Artistic or GPL-1+
License: Artistic
diff --git a/debian/copyright-check b/debian/copyright-check
index c5b52bf..0edb8fa 100755
--- a/debian/copyright-check
+++ b/debian/copyright-check
@@ -1,5 +1,6 @@
#!/bin/sh
-# Copyright © 2016-2017 Jonas Smedegaard <dr@jones.dk>
+# Copyright 2020-2022 Jonas Smedegaard <dr@jones.dk>
+# Copyright 2020-2021 Purism, SPC
# Description: helper script to update copyright_hints
#
# This program is free software; you can redistribute it and/or modify
@@ -15,15 +16,41 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Depends:
+# licensecheck,
+# libimage-exiftool-perl,
+# perl,
+
set -eu
-# extract metadata from binary files before copyright check
-# - but skip file formats unlikely to contain relevant metadata
-export DEB_COPYRIGHT_EXTRACT_EXTS="png"
-export DEB_COPYRIGHT_CHECK_IGNORE_EXTS="ico"
+SKIPFILES='skip|meta'
+
+# cleanup stray hint files from an interrupted previous run
+find -type f -regextype posix-egrep -regex "^.*:($SKIPFILES)$" -delete
+
+# omit files not copyright protected nor stating copyright or licensing
+RE_omit='.*\.(ico)'
+
+#1>&2 echo 'skip binary files without parsable metadata ...'
+#RE_skip='.*\.(xls|pcl|xps)'
+#find -type f -regextype posix-egrep -regex "^($RE_skip)$" -exec sh -c "echo 'License: UNKNOWN' > '{}:skip'" ';'
+
+1>&2 echo 'extract metadata from binary files ...'
+EXT_meta='png'
+RE_meta=$(perl -E '$"="|";say ".*\\.(@ARGV)|Resource/Font/.*"' $EXT_meta) #"
+exiftool '-textOut!' %d%f.%e:meta -short -short -recurse -extractEmbedded $(perl -E 'say map {" -ext $_"} @ARGV' $EXT_meta) .
+
+#RE_SKIP="$RE_omit|$RE_skip|$RE_meta"
+RE_SKIP="$RE_omit|$RE_meta"
+
+# skip non-copyright-protected Debian files
+RE_debian='debian/(changelog|copyright(_hints)?|source/lintian-overrides)'
+
+# check for copyright and licensing statements
+licensecheck --copyright --deb-machine --recursive --lines 0 --check '.*' --ignore "^($RE_SKIP|$RE_debian)$" -- * > debian/copyright_hints
-make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true
-make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1
+# tidy listing of diverted files
+sed -i -e 's/:meta$//' -e 's/:skip$//' debian/copyright_hints
-# unconditionally merge changes - safe to do with git-tracked package
-[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints
+# cleanup hint files
+find -type f -regextype posix-egrep -regex "^.*:($SKIPFILES)$" -delete
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 6dccdce..2217363 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,41 +1,49 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: FIXME
Upstream-Contact: FIXME
Source: FIXME
-Disclaimer: Autogenerated by CDBS
+Disclaimer: Autogenerated by licensecheck
Files: Changes
MANIFEST
Makefile.PL
README
TODO
+ ciderwebmail.psgi
ciderwebmail.yml
debian/README.Debian
- debian/README.source
debian/TODO
debian/ciderwebmail.links
- debian/ciderwebmail.maintscript
- debian/compat
+ debian/clean
debian/control
- debian/control.in
+ debian/etc/apache2/conf-available/ciderwebmail-uwsgi.conf
debian/etc/ciderwebmail/apache2-uwsgi.conf
debian/etc/ciderwebmail/ciderwebmail.conf
debian/etc/ciderwebmail/ciderwebmail.psgi
debian/etc/uwsgi/apps-available/ciderwebmail.ini
+ debian/examples
debian/gbp.conf
debian/install
debian/patches/1001_use_Email-Address-XS.patch
debian/patches/1002_fix_message_submit.patch
- debian/patches/2001_avoid_autoinstall.patch
+ debian/patches/1003_fix_use_CBC_crypto_block_mode.patch
debian/patches/series
debian/postinst
debian/postrm
+ debian/rules
debian/source/format
+ debian/tests/pkg-perl/SKIP
+ debian/tests/pkg-perl/smoke-env
+ debian/tests/pkg-perl/smoke-files
+ debian/tests/pkg-perl/smoke-setup
+ debian/tests/pkg-perl/syntax-skip
+ debian/upstream/metadata
debian/watch
lib/Catalyst/Plugin/CiderWebmail/ErrorHandler.pm
lib/CiderWebmail/Cache.pm
lib/CiderWebmail/DB/Result/Addressbook.pm
lib/CiderWebmail/DB/Result/DbVersion.pm
+ lib/CiderWebmail/DB/Result/RecentContacts.pm
lib/CiderWebmail/DB/Result/Settings.pm
lib/CiderWebmail/Error.pm
lib/CiderWebmail/Header.pm
@@ -61,6 +69,7 @@ Files: Changes
lib/CiderWebmail/Util.pm
root/locale/CiderWebmail.pot
root/locale/Makefile
+ root/locale/cs/LC_MESSAGES/CiderWebmail.po
root/locale/de/LC_MESSAGES/CiderWebmail.po
root/locale/en/LC_MESSAGES/CiderWebmail.po
root/locale/ru/LC_MESSAGES/CiderWebmail.po
@@ -469,68 +478,29 @@ Files: lib/Catalyst/Authentication/Store/IMAP.pm
lib/CiderWebmail/Model/Managesieve.pm
lib/CiderWebmail/View/Petal.pm
lib/CiderWebmail/View/RFC822.pm
-Copyright: NONE
-License: Artistic or GPL-1+
- FIXME
-
-Files: script/ciderwebmail_cgi.pl
+ script/ciderwebmail_cgi.pl
script/ciderwebmail_create.pl
script/ciderwebmail_fastcgi.pl
script/ciderwebmail_server.pl
script/ciderwebmail_test.pl
-Copyright: This library is free software. You can redistribute it and/or modify /
-License: Artistic or GPL-1+
+Copyright: NONE
+License: Perl
FIXME
Files: LICENSE
Copyright: 1989, 1991, Free Software Foundation, Inc. 675 Mass Ave,
- ed by the Free Software Foundation,
- ed interfaces, the original copyright holder who
- of this
- the software, and (2) offer
-License: Artistic or GPL-1+
- FIXME
-
-Files: debian/rules
-Copyright: 2012-2017, Jonas Smedegaard <dr@jones.dk>
-License: GPL-3+
+License: Artistic-1.0 and/or GPL-2 and/or LGPL-2.1+ and/or Perl
FIXME
Files: debian/copyright-check
-Copyright: 2016-2017, Jonas Smedegaard <dr@jones.dk>
- check
+Copyright: 2020-2021, Purism, SPC
+ 2020-2022, Jonas Smedegaard <dr@jones.dk>
+ protected nor stating copyright or licensing
License: GPL-3+
FIXME
Files: root/locale/da/LC_MESSAGES/CiderWebmail.po
Copyright: 2013, Jonas Smedegaard <dr@jones.dk>
- r feriemelding"
- r filterregler"
- r kontakter"
- r mapper"
- r regler"
- r vigtige flag"
-License: UNKNOWN
- FIXME
-
-Files: debian/source/lintian-overrides
-Copyright: Artistic
- GPL-1+
- GPL-3+
- LGPL-2.1+
- artistic
- gpl-1+
- gpl-3+
- lgpl-2.1+
-License: UNKNOWN
- FIXME
-
-Files: root/locale/cs/LC_MESSAGES/CiderWebmail.po
-Copyright: jméno"
- no"
- no:"
- složky.${1} Použijte "
- složky.${5} 'r' "
License: UNKNOWN
FIXME
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..3b373ce
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1,2 @@
+ciderwebmail.yml
+script/update_schema.sh
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 2a594ca..c6859d1 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,15 @@
-# Configuration file for git-buildpackage and friends
+# clone this source: gbp clone $PKG_GIT_URL
+# track upstream source: git remote add upstream-git $UPSTREAM_GIT_URL
+# update this source: gbp pull
+# update upstream source: git fetch upstream-git --tags
+# import upstream release: gbp import-orig --upstream-vcs-tag=$VERSION --uscan
+# build package: gbp buildpackage
+# publish source release: gbp tag && gbp push
[DEFAULT]
pristine-tar = True
sign-tags = True
filter = */.git*
+debian-branch = debian/latest
+upstream-branch = upstream/latest
+dist = DEP14
diff --git a/debian/rules b/debian/rules
index cac64f4..8d34916 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,87 +1,30 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/perl-makemaker.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-pkg = ciderwebmail
-
-# Needed by upstream build and (always/often) at runtime
-perl-deps = moose log-dispatch parse-recdescent
-perl-deps += log-dispatch-config catalyst-plugin-log-dispatch yaml
-perl-deps += yaml-libyaml json-xs catalyst-view-petal petal-utils
-perl-deps += datetime datetime-format-mail mime-tools try-tiny try-tiny-smartcatch
-perl-deps += email-simple email-sender email-valid email-address-xs
-perl-deps += regexp-common text-iconv
-perl-deps += text-autoformat io-socket-ssl net-managesieve clone html-tidy
-perl-deps += uri locale-maketext-gettext list-moreutils data-ical
-perl-deps += datetime-format-iso8601 crypt-util crypt-cbc crypt-rijndael
-perl-deps += crypt-random-source mime-base64-urlsafe html-defang
-perl-deps += moosex-role-withoverloading catalyst
-catalyst-deps = authentication-credential-http plugin-configloader
-catalyst-deps += plugin-static-simple plugin-stacktrace
-catalyst-deps += plugin-authentication plugin-session-store-fastmmap
-catalyst-deps += plugin-session-state-cookie model-dbic-schema
-catalyst-deps += action-renderview action-renderview
-deps = $(patsubst %,$(comma) lib%-perl,$(perl-deps))
-deps += $(patsubst %,$(comma) libcatalyst-%-perl,$(catalyst-deps))
-deps +=, libmail-imapclient-perl (>= 3.41)
-deps-recommend = libdbd-sqlite3-perl
-
-# Needed (always/often/seldom) at runtime
-# * libauthen-sasl-perl needed for secure Managesieve connections
-depends = adduser
-recommends = libauthen-sasl-perl
-recommends +=, default-mta | mail-transport-agent
-suggests = libfcgi-perl, libfcgi-procmanager-perl
-suggests +=, dovecot | imap-server, imapproxy
-
-CDBS_DEPENDS_$(pkg) = $(deps), $(depends)
-CDBS_RECOMMENDS_$(pkg) = $(deps-recommend), $(recommends)
-CDBS_SUGGESTS_$(pkg) = $(suggests)
-
-DEB_INSTALL_EXAMPLES_$(pkg) = ciderwebmail.yml script/update_schema.sh
-
-# Avoid virtually empty TODO file
-DEB_INSTALL_DOCS_ALL := $(filter-out TODO,$(DEB_INSTALL_DOCS_ALL))
+%:
+ dh $@
# (Re)generate localized templates
-langs := $(shell \
- find root/locale -mindepth 1 -maxdepth 1 -type d -printf '%f\n')
-configure/$(pkg):: debian/stamp-mktemplates
-debian/stamp-mktemplates: pre-build
- for lang in $(langs); do \
- stem=root/locale/$$lang/LC_MESSAGES/CiderWebmail; \
- msgfmt -o $$stem.mo $$stem.po; \
- done
+execute_after_dh_auto_configure:
+ find root/locale -name 'LC_MESSAGES' \
+ -execdir msgfmt -o '{}'/CiderWebmail.mo '{}'/CiderWebmail.po ';'
cd root/templates && perl ./template.pl
- touch $@
-clean::
- find root/locale -type f -name '*.mo' -delete
- rm -f debian/stamp-mktemplates
+execute_after_dh_auto_install:
# Install config files
-binary-install/$(pkg)::
- mkdir -p $(cdbs_curdestdir)etc/$(pkg)
- touch $(cdbs_curdestdir)etc/$(pkg)/custom.css
+ mkdir -p debian/ciderwebmail/etc/ciderwebmail
+ touch debian/ciderwebmail/etc/ciderwebmail/custom.css
# Install binaries in project-specific dir and drop their manpages
-binary-post-install/$(pkg)::
- mkdir -p $(cdbs_curdestdir)usr/share/$(pkg)/bin
- mv $(cdbs_curdestdir)usr/bin $(cdbs_curdestdir)usr/share/$(pkg)/
- rm -rf $(cdbs_curdestdir)usr/share/man/man1
-
-# Replace config with symlinks
-binary-post-install/$(pkg)::
- rm -rf $(cdbs_curdestdir)usr/share/$(pkg)/root/static/css/custom.css
- ln -sT /etc/ciderwebmail/custom.css $(cdbs_curdestdir)usr/share/$(pkg)/root/static/css/custom.css
+ mkdir -p debian/ciderwebmail/usr/share/ciderwebmail/bin
+ mv debian/ciderwebmail/usr/bin debian/ciderwebmail/usr/share/ciderwebmail/
+ rm -rf debian/ciderwebmail/usr/share/man/man1
# Drop excess files bogusly handled by upstream install routines
-binary-post-install/$(pkg)::
- rm -rf $(cdbs_curdestdir)usr/share/perl5/CiderWebmail/.pc
- rm -rf $(cdbs_curdestdir)usr/share/perl5/CiderWebmail/root
- rm -f $(cdbs_curdestdir)usr/share/perl5/CiderWebmail/.gitignore
- rm -f $(cdbs_curdestdir)usr/share/perl5/CiderWebmail/LICENSE
- rm -f $(cdbs_curdestdir)usr/share/perl5/CiderWebmail/TODO
- rm -f $(cdbs_curdestdir)usr/share/perl5/CiderWebmail/ciderwebmail.yml
- rm -f $(cdbs_curdestdir)usr/share/perl5/CiderWebmail/root/templates/template.pl
- rm -f $(cdbs_curdestdir)usr/share/ciderwebmail/root/templates/template.pl
+ rm -rf debian/ciderwebmail/usr/share/perl5/CiderWebmail/.pc
+ rm -rf debian/ciderwebmail/usr/share/perl5/CiderWebmail/root
+ rm -f debian/ciderwebmail/usr/share/perl5/CiderWebmail/.gitignore
+ rm -f debian/ciderwebmail/usr/share/perl5/CiderWebmail/LICENSE
+ rm -f debian/ciderwebmail/usr/share/perl5/CiderWebmail/TODO
+ rm -f debian/ciderwebmail/usr/share/perl5/CiderWebmail/ciderwebmail.yml
+ rm -f debian/ciderwebmail/usr/share/perl5/CiderWebmail/root/templates/template.pl
+ rm -f debian/ciderwebmail/usr/share/ciderwebmail/root/templates/template.pl
diff --git a/lib/CiderWebmail/View/RFC822.pm b/lib/CiderWebmail/View/RFC822.pm
index b9d9a11..f4872e7 100644
--- a/lib/CiderWebmail/View/RFC822.pm
+++ b/lib/CiderWebmail/View/RFC822.pm
@@ -150,7 +150,7 @@ sub process {
CiderWebmail::Error->throw({
code => '500',
message => "Unable to send Mail: $!",
- error_id => 'send-mail-error',
+ error => 'send-mail-error',
});
};
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/ciderwebmail/root/templates/template.pl
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/doc/ciderwebmail/TODO -rw-r--r-- root/root /usr/share/doc/ciderwebmail/buildinfo_all.gz
Control files: lines which differ (wdiff format)
Depends: libmoose-perl, liblog-dispatch-perl, libparse-recdescent-perl, liblog-dispatch-config-perl, adduser, libcatalyst-action-renderview-perl, libcatalyst-authentication-credential-http-perl, libcatalyst-model-dbic-schema-perl, libcatalyst-perl, libcatalyst-plugin-authentication-perl, libcatalyst-plugin-configloader-perl, libcatalyst-plugin-log-dispatch-perl, libyaml-perl, libyaml-libyaml-perl, libjson-xs-perl, libcatalyst-plugin-session-state-cookie-perl, libcatalyst-plugin-session-store-fastmmap-perl, libcatalyst-plugin-stacktrace-perl, libcatalyst-plugin-static-simple-perl, libcatalyst-view-petal-perl, libpetal-utils-perl, libdatetime-perl, libclone-perl, libcrypt-cbc-perl, libcrypt-random-source-perl, libcrypt-rijndael-perl, libcrypt-util-perl, libdata-ical-perl, libdatetime-format-iso8601-perl, libdatetime-format-mail-perl, libmime-tools-perl, libtry-tiny-perl, libtry-tiny-smartcatch-perl, libemail-simple-perl, libdatetime-perl, libemail-address-xs-perl, libemail-sender-perl, libemail-simple-perl, libemail-valid-perl, libemail-address-xs-perl, libregexp-common-perl, libtext-iconv-perl, libtext-autoformat-perl, libio-socket-ssl-perl, libnet-managesieve-perl, libclone-perl, libhtml-defang-perl, libhtml-tidy-perl, liburi-perl, liblocale-maketext-gettext-perl, libio-socket-ssl-perl, libjson-xs-perl, liblist-moreutils-perl, libdata-ical-perl, libdatetime-format-iso8601-perl, libcrypt-util-perl, libcrypt-cbc-perl, libcrypt-rijndael-perl, libcrypt-random-source-perl, libmime-base64-urlsafe-perl, libhtml-defang-perl, libmoosex-role-withoverloading-perl, libcatalyst-perl, libcatalyst-authentication-credential-http-perl, libcatalyst-plugin-configloader-perl, libcatalyst-plugin-static-simple-perl, libcatalyst-plugin-stacktrace-perl, libcatalyst-plugin-authentication-perl, libcatalyst-plugin-session-store-fastmmap-perl, libcatalyst-plugin-session-state-cookie-perl, libcatalyst-model-dbic-schema-perl, libcatalyst-action-renderview-perl, liblocale-maketext-gettext-perl, liblog-dispatch-config-perl, liblog-dispatch-perl, libmail-imapclient-perl (>= 3.41), adduser, libmime-base64-urlsafe-perl, libmime-tools-perl, libmoose-perl, libmoosex-role-withoverloading-perl, libnet-managesieve-perl, libparse-recdescent-perl, libpetal-utils-perl, libregexp-common-perl, libtext-autoformat-perl, libtext-iconv-perl, libtry-tiny-perl, libtry-tiny-smartcatch-perl, liburi-perl, libyaml-libyaml-perl, libyaml-perl, perl:any
Recommends: libdbd-sqlite3-perl, libauthen-sasl-perl, default-mta | mail-transport-agent mail-transport-agent, libdbd-sqlite3-perl
Suggests: libfcgi-perl, libfcgi-procmanager-perl, dovecot | imap-server, imapproxy imapproxy, libfcgi-perl, libfcgi-procmanager-perl