[Pkg-Cyrus-imapd-Debian-devel] .orig.tar.gz orig vs. repacked

[Sven Mueller]

Hi.

Currently, the .orig.tar.gz of the cyrus22 source package is a repacked
version of the original upstream source tarball. As I understand it, we
should move towards a real prestine upstream tarball, but how do we
handle all those files I removed when original creating the repacked
tarball? I removed many which are unused (including various empty
subdirs) and some which are replaced with Debian (updated?) versions
like the autoconf/automake files and finally some which are rebuilt
during package build time. Here is a list of the files and directories I
removed:

=============================================================
empty directory (except for CVS stuff):
-acap

=============================================================
cache directory (really shouldn't be included in upstream tarball):
-autom4te.cache
-autom4te.cache/output.0
-autom4te.cache/requests
-autom4te.cache/traces.0

=============================================================
replaced by versions from Debian during build:
-config.guess
-config.sub

=============================================================
rebuilt automatically:
-doc/man
-doc/man/arbitron.8.html
-doc/man/chk_cyrus.8.html
-doc/man/ctl_cyrusdb.8.html
-doc/man/ctl_deliver.8.html
-doc/man/ctl_mboxlist.8.html
-doc/man/cvt_cyrusdb.8.html
-doc/man/cyr_expire.8.html
-doc/man/cyradm.1.html
-doc/man/cyrus.conf.5.html
-doc/man/deliver.8.html
-doc/man/fetchnews.8.html
-doc/man/fud.8.html
-doc/man/idled.8.html
-doc/man/imapd.8.html
-doc/man/imapd.conf.5.html
-doc/man/imclient.3.html
-doc/man/imtest.1.html
-doc/man/installsieve.1.html
-doc/man/ipurge.8.html
-doc/man/krb.equiv.5.html
-doc/man/lmtpd.8.html
-doc/man/lmtptest.1.html
-doc/man/master.8.html
-doc/man/mbexamine.8.html
-doc/man/mbpath.8.html
-doc/man/mupdatetest.1.html
-doc/man/nntpd.8.html
-doc/man/nntptest.1.html
-doc/man/notifyd.8.html
-doc/man/pop3d.8.html
-doc/man/pop3test.1.html
-doc/man/quota.8.html
-doc/man/reconstruct.8.html
-doc/man/rmnews.8.html
-doc/man/sieveshell.1.html
-doc/man/sivtest.1.html
-doc/man/smmapd.8.html
-doc/man/smtptest.1.html
-doc/man/squatter.8.html
-doc/man/syncnews.8.html
-doc/man/timsieved.8.html
-doc/man/tls_prune.8.html
-doc/murder.png
-doc/netnews.png
-doc/text/altnamespace
-doc/text/anoncvs
-doc/text/bugs
-doc/text/changes
-doc/text/faq
-doc/text/feedback
-doc/text/index
-doc/text/install
-doc/text/install-admin-mb
-doc/text/install-auth
-doc/text/install-compile
-doc/text/install-configure
-doc/text/install-murder
-doc/text/install-netnews
-doc/text/install-perf
-doc/text/install-prereq
-doc/text/install-sieve
-doc/text/install-snmpmon
-doc/text/install-testing
-doc/text/install-upgrade
-doc/text/install-virtdomains
-doc/text/mailing-list
-doc/text/man
-doc/text/notes
-doc/text/os
-doc/text/overview
-doc/text/questions
-doc/text/readme
-doc/text/sieve
-doc/text/sieve-protocol
-doc/text/specs
-imap/imap_err.c
-imap/imap_err.h
-imap/lmtpstats.c
-imap/lmtpstats.h
-imap/mupdate_err.c
-imap/mupdate_err.h
-imap/nntp_err.c
-imap/nntp_err.h
-imap/pushstats.c
-imap/pushstats.h
-lib/imapopts.c
-lib/imapopts.h
-man/imapd.conf.5
-man/sieveshell.1
-sieve/addr-lex.c
-sieve/addr.c
-sieve/addr.h
-sieve/sieve-lex.c
-sieve/sieve.c
-sieve/sieve.h
-sieve/sieve_err.c
-sieve/sieve_err.h

====================================================================
various stray CVS directories:
-CVS
-CVS/Entries
-CVS/Entries.Log
-CVS/Repository
-CVS/Root
-IMAP-Cyrus/CVS
-IMAP-Cyrus/CVS/Entries
-IMAP-Cyrus/CVS/Entries.Log
-IMAP-Cyrus/CVS/Repository
-IMAP-Cyrus/CVS/Root
-IMAP-Cyrus/Cyrus/CVS
-IMAP-Cyrus/Cyrus/CVS/Entries
-IMAP-Cyrus/Cyrus/CVS/Repository
-IMAP-Cyrus/Cyrus/CVS/Root
-IMAP-Cyrus/examples/CVS
-IMAP-Cyrus/examples/CVS/Entries
-IMAP-Cyrus/examples/CVS/Repository
-IMAP-Cyrus/examples/CVS/Root
-IMAP-Cyrus/t/CVS
-IMAP-Cyrus/t/CVS/Entries
-IMAP-Cyrus/t/CVS/Repository
-IMAP-Cyrus/t/CVS/Root
-SIEVE-Cyrus/CVS
-SIEVE-Cyrus/CVS/Entries
-SIEVE-Cyrus/CVS/Repository
-SIEVE-Cyrus/CVS/Root
-SIEVE/CVS
-SIEVE/CVS/Entries
-SIEVE/CVS/Entries.Log
-SIEVE/CVS/Repository
-SIEVE/CVS/Root
-SIEVE/Cyrus/CVS
-SIEVE/Cyrus/CVS/Entries
-SIEVE/Cyrus/CVS/Repository
-SIEVE/Cyrus/CVS/Root
-SIEVE/acap/CVS
-SIEVE/acap/CVS/Entries
-SIEVE/acap/CVS/Repository
-SIEVE/acap/CVS/Root
-SIEVE/scripts/CVS
-SIEVE/scripts/CVS/Entries
-SIEVE/scripts/CVS/Repository
-SIEVE/scripts/CVS/Root
-SIEVE/timsieved/CVS
-SIEVE/timsieved/CVS/Entries
-SIEVE/timsieved/CVS/Repository
-SIEVE/timsieved/CVS/Root
-acap/CVS
-acap/CVS/Entries
-acap/CVS/Repository
-acap/CVS/Root
-amssync/CVS
-amssync/CVS/Entries
-amssync/CVS/Repository
-amssync/CVS/Root
-cmulocal-old/CVS
-cmulocal-old/CVS/Entries
-cmulocal-old/CVS/Repository
-cmulocal-old/CVS/Root
-cmulocal/CVS
-cmulocal/CVS/Entries
-cmulocal/CVS/Repository
-cmulocal/CVS/Root
-contrib/CVS
-contrib/CVS/Entries
-contrib/CVS/Entries.Log
-contrib/CVS/Repository
-contrib/CVS/Root
-contrib/cyrus-graphtools.1.0/CVS
-contrib/cyrus-graphtools.1.0/CVS/Entries
-contrib/cyrus-graphtools.1.0/CVS/Entries.Log
-contrib/cyrus-graphtools.1.0/CVS/Repository
-contrib/cyrus-graphtools.1.0/CVS/Root
-contrib/cyrus-graphtools.1.0/cgi-bin/CVS
-contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries
-contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Repository
-contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Root
-contrib/cyrus-graphtools.1.0/html/CVS
-contrib/cyrus-graphtools.1.0/html/CVS/Entries
-contrib/cyrus-graphtools.1.0/html/CVS/Repository
-contrib/cyrus-graphtools.1.0/html/CVS/Root
-contrib/cyrus-graphtools.1.0/script/CVS
-contrib/cyrus-graphtools.1.0/script/CVS/Entries
-contrib/cyrus-graphtools.1.0/script/CVS/Repository
-contrib/cyrus-graphtools.1.0/script/CVS/Root
-contrib/notify_unix/CVS
-contrib/notify_unix/CVS/Entries
-contrib/notify_unix/CVS/Repository
-contrib/notify_unix/CVS/Root
-cyradm/CVS
-cyradm/CVS/Entries
-cyradm/CVS/Repository
-cyradm/CVS/Root
-depot/CVS
-depot/CVS/Entries
-depot/CVS/Repository
-depot/CVS/Root
-doc/CVS
-doc/CVS/Entries
-doc/CVS/Entries.Log
-doc/CVS/Repository
-doc/CVS/Root
-doc/html/CVS
-doc/html/CVS/Entries
-doc/html/CVS/Repository
-doc/html/CVS/Root
-doc/internal/CVS
-doc/internal/CVS/Entries
-doc/internal/CVS/Repository
-doc/internal/CVS/Root
-doc/text/CVS
-doc/text/CVS/Entries
-doc/text/CVS/Repository
-doc/text/CVS/Root
-et/CVS
-et/CVS/Entries
-et/CVS/Repository
-et/CVS/Root
-imap/CVS
-imap/CVS/Entries
-imap/CVS/Repository
-imap/CVS/Root
-imtest/CVS
-imtest/CVS/Entries
-imtest/CVS/Repository
-imtest/CVS/Root
-installsieve/CVS
-installsieve/CVS/Entries
-installsieve/CVS/Repository
-installsieve/CVS/Root
-lib/CVS
-lib/CVS/Entries
-lib/CVS/Entries.Log
-lib/CVS/Repository
-lib/CVS/Root
-lib/charset/CVS
-lib/charset/CVS/Entries
-lib/charset/CVS/Repository
-lib/charset/CVS/Root
-lib/test/CVS
-lib/test/CVS/Entries
-lib/test/CVS/Repository
-lib/test/CVS/Root
-makedepend/CVS
-makedepend/CVS/Entries
-makedepend/CVS/Repository
-makedepend/CVS/Root
-man/CVS
-man/CVS/Entries
-man/CVS/Repository
-man/CVS/Root
-master/CVS
-master/CVS/Entries
-master/CVS/Entries.Log
-master/CVS/Repository
-master/CVS/Root
-master/conf/CVS
-master/conf/CVS/Entries
-master/conf/CVS/Repository
-master/conf/CVS/Root
-netnews/CVS
-netnews/CVS/Entries
-netnews/CVS/Repository
-netnews/CVS/Root
-notifyd/CVS
-notifyd/CVS/Entries
-notifyd/CVS/Repository
-notifyd/CVS/Root
-perl/CVS
-perl/CVS/Entries
-perl/CVS/Entries.Log
-perl/CVS/Repository
-perl/CVS/Root
-perl/imap/CVS
-perl/imap/CVS/Entries
-perl/imap/CVS/Entries.Log
-perl/imap/CVS/Repository
-perl/imap/CVS/Root
-perl/imap/Cyrus/CVS
-perl/imap/Cyrus/CVS/Entries
-perl/imap/Cyrus/CVS/Repository
-perl/imap/Cyrus/CVS/Root
-perl/imap/IMAP/CVS
-perl/imap/IMAP/CVS/Entries
-perl/imap/IMAP/CVS/Repository
-perl/imap/IMAP/CVS/Root
-perl/imap/examples/CVS
-perl/imap/examples/CVS/Entries
-perl/imap/examples/CVS/Repository
-perl/imap/examples/CVS/Root
-perl/imap/t/CVS
-perl/imap/t/CVS/Entries
-perl/imap/t/CVS/Repository
-perl/imap/t/CVS/Root
-perl/sieve/CVS
-perl/sieve/CVS/Entries
-perl/sieve/CVS/Entries.Log
-perl/sieve/CVS/Repository
-perl/sieve/CVS/Root
-perl/sieve/acap/CVS
-perl/sieve/acap/CVS/Entries
-perl/sieve/acap/CVS/Repository
-perl/sieve/acap/CVS/Root
-perl/sieve/lib/CVS
-perl/sieve/lib/CVS/Entries
-perl/sieve/lib/CVS/Repository
-perl/sieve/lib/CVS/Root
-perl/sieve/managesieve/CVS
-perl/sieve/managesieve/CVS/Entries
-perl/sieve/managesieve/CVS/Repository
-perl/sieve/managesieve/CVS/Root
-perl/sieve/scripts/CVS
-perl/sieve/scripts/CVS/Entries
-perl/sieve/scripts/CVS/Repository
-perl/sieve/scripts/CVS/Root
-ptclient/CVS
-ptclient/CVS/Entries
-ptclient/CVS/Repository
-ptclient/CVS/Root
-pwcheck/CVS
-pwcheck/CVS/Entries
-pwcheck/CVS/Repository
-pwcheck/CVS/Root
-sieve/CVS
-sieve/CVS/Entries
-sieve/CVS/Entries.Log
-sieve/CVS/Repository
-sieve/CVS/Root
-sieve/tests/CVS
-sieve/tests/CVS/Entries
-sieve/tests/CVS/Entries.Log
-sieve/tests/CVS/Repository
-sieve/tests/CVS/Root
-sieve/tests/action/CVS
-sieve/tests/action/CVS/Entries
-sieve/tests/action/CVS/Entries.Log
-sieve/tests/action/CVS/Repository
-sieve/tests/action/CVS/Root
-sieve/tests/action/serverm/CVS
-sieve/tests/action/serverm/CVS/Entries
-sieve/tests/action/serverm/CVS/Repository
-sieve/tests/action/serverm/CVS/Root
-sieve/tests/action/testm/CVS
-sieve/tests/action/testm/CVS/Entries
-sieve/tests/action/testm/CVS/Repository
-sieve/tests/action/testm/CVS/Root
-sieve/tests/actionExtensions/CVS
-sieve/tests/actionExtensions/CVS/Entries
-sieve/tests/actionExtensions/CVS/Entries.Log
-sieve/tests/actionExtensions/CVS/Repository
-sieve/tests/actionExtensions/CVS/Root
-sieve/tests/actionExtensions/serverm/CVS
-sieve/tests/actionExtensions/serverm/CVS/Entries
-sieve/tests/actionExtensions/serverm/CVS/Repository
-sieve/tests/actionExtensions/serverm/CVS/Root
-sieve/tests/actionExtensions/testm/CVS
-sieve/tests/actionExtensions/testm/CVS/Entries
-sieve/tests/actionExtensions/testm/CVS/Repository
-sieve/tests/actionExtensions/testm/CVS/Root
-sieve/tests/test/CVS
-sieve/tests/test/CVS/Entries
-sieve/tests/test/CVS/Entries.Log
-sieve/tests/test/CVS/Repository
-sieve/tests/test/CVS/Root
-sieve/tests/test/serverm/CVS
-sieve/tests/test/serverm/CVS/Entries
-sieve/tests/test/serverm/CVS/Repository
-sieve/tests/test/serverm/CVS/Root
-sieve/tests/test/testm/CVS
-sieve/tests/test/testm/CVS/Entries
-sieve/tests/test/testm/CVS/Repository
-sieve/tests/test/testm/CVS/Root
-sieve/tests/testExtension/CVS
-sieve/tests/testExtension/CVS/Entries
-sieve/tests/testExtension/CVS/Entries.Log
-sieve/tests/testExtension/CVS/Repository
-sieve/tests/testExtension/CVS/Root
-sieve/tests/testExtension/serverm/CVS
-sieve/tests/testExtension/serverm/CVS/Entries
-sieve/tests/testExtension/serverm/CVS/Repository
-sieve/tests/testExtension/serverm/CVS/Root
-sieve/tests/testExtension/testm/CVS
-sieve/tests/testExtension/testm/CVS/Entries
-sieve/tests/testExtension/testm/CVS/Repository
-sieve/tests/testExtension/testm/CVS/Root
-snmp/CVS
-snmp/CVS/Entries
-snmp/CVS/Repository
-snmp/CVS/Root
-syslog/CVS
-syslog/CVS/Entries
-syslog/CVS/Repository
-syslog/CVS/Root
-timsieved/CVS
-timsieved/CVS/Entries
-timsieved/CVS/Repository
-timsieved/CVS/Root
-tools/CVS
-tools/CVS/Entries
-tools/CVS/Repository
-tools/CVS/Root
====================================================================

We should be save if we ignore the CVS stuff and the empty acap
directory. The autom4te.cache directory can easily be moved aside at
configuration time and moved back during cleanup. The same is true for
the config.guess and config.sub file. But how do we handle the files
which get rebuilt automatically? If we want to keep our diff as small as
possible (and, more importantly, only creating files in /debian), we
need to create backups of those files during configuration (respectively
patch) time and restore them during cleanup (resp. unpatch) time. But
there are quite some such files, so this task isn't too easy IMHO.

cu,
sven

PS: Any ontakers? I won't have time to do anything on the cyrus22
project for the next two or three weeks as far as I can tell now.
PPS: BTW: Henrique, you said you would work on cyrus22 during DebConf. I
assume you didn't find the time to do so, just like me?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 186 bytes
Desc: OpenPGP digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-cyrus-imapd-debian-devel/attachments/20050801/e41c2415/signature.pgp