[Pkg-Cyrus-imapd-Debian-devel] [SVN] r225 - in branches/astronut: ./ cyrus-imapd-2.2.12/debian/

debian at incase.de debian at incase.de
Thu Dec 8 02:53:11 UTC 2005


Author: astronut
Date: Thu Dec  8 03:51:55 2005
New Revision: 225

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=225
Log:
Changed both package description and package name. This is a very large commit :-). I haven't tested it yet, because it fails in pbuilder due to the -lsensors issue.

Added:
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.README.Debian
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.README.Debian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.dirs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.files
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.linda
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.linda
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.lintian
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.lintian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.manpages
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.menu
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.menu
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-clients-2.2.README.Debian
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-clients.README.Debian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-clients-2.2.dirs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-clients.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-clients-2.2.manpages
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-clients.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.NEWS
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.NEWS
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.contrib
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.contrib
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cron.daily
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cron.daily
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.default
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.default
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.dirs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.docs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.docs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.files
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.linda
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.linda
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.links
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.lintian
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.lintian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.manpages
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postinst
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postinst
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postrm
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postrm
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.prerm
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.prerm
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.templates
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.templates
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-dev-2.2.dirs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-dev.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-dev-2.2.files
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-dev.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-dev-2.2.links
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-dev.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.doc-base
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.doc-base
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.docs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.docs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.links
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.dirs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-imapd.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.files
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-imapd.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.links
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-imapd.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.manpages
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-imapd.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-murder-2.2.files
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-murder.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-murder-2.2.links
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-murder.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.dirs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.files
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.links
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.manpages
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.dirs
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.files
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.links
      - copied, changed from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.manpages
      - copied unchanged from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.manpages
    branches/astronut/cyrus-imapd-2.2_2.2.12.orig.tar.gz
      - copied unchanged from r223, trunk/cyrus22-imapd_2.2.12.orig.tar.gz
Removed:
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-admin.README.Debian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-admin.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-admin.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-admin.linda
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-admin.lintian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-admin.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-admin.menu
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-clients.README.Debian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-clients.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-clients.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.NEWS
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.contrib
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.cron.daily
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.default
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.docs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.linda
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.lintian
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.postinst
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.postrm
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.prerm
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-common.templates
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-dev.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-dev.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-dev.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-doc.doc-base
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-doc.docs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-doc.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-imapd.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-imapd.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-imapd.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-imapd.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-murder.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-murder.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.manpages
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.dirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.files
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.links
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.manpages
    branches/astronut/cyrus22-imapd_2.2.12.orig.tar.gz
Modified:
    branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian
    branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.database
    branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.debug
    branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.simpleinstall
    branches/astronut/cyrus-imapd-2.2.12/debian/README.postfix
    branches/astronut/cyrus-imapd-2.2.12/debian/UPGRADE.Debian
    branches/astronut/cyrus-imapd-2.2.12/debian/changelog
    branches/astronut/cyrus-imapd-2.2.12/debian/control
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs
    branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs.8
    branches/astronut/cyrus-imapd-2.2.12/debian/executable.files
    branches/astronut/cyrus-imapd-2.2.12/debian/imapd.conf
    branches/astronut/cyrus-imapd-2.2.12/debian/rules

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian Thu Dec  8 03:51:55 2005
@@ -82,8 +82,8 @@
    However, you will have to configure it yourself.  No pre-packaged
    configuration of Murder is available at this time...  The documentation is
    all there, and the Cyrus packages will happily preserve your Cyrus Murder
-   configuration.  You do not have to install the cyrus22-imapd or
-   cyrus22-pop3d packages in hosts that only need the proxy daemons running,
+   configuration.  You do not have to install the cyrus-imapd-2.2 or
+   cyrus-pop3d-2.2 packages in hosts that only need the proxy daemons running,
    but do note that the /etc/pam.d/imap and /etc/pam.d/pop files are in those
    packages (and they are needed by the proxies), so you will have to create
    the files manually.
@@ -96,7 +96,7 @@
 General notes and hints:
 ------------------------
 
- o *** ALWAYS READ /usr/share/doc/cyrus22-common/NEWS.Debian *** after
+ o *** ALWAYS READ /usr/share/doc/cyrus-common-2.2/NEWS.Debian *** after
    you upgrade the package.
 
  o QUOTAS ARE LIMITIED TO 2GB on some platforms.
@@ -150,7 +150,7 @@
    subfolders are children of INBOX, and one where they are all in the same
    hierarchical level).
 
-   See /usr/share/doc/cyrus22-common/html/altnamespace.html for details. If
+   See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details. If
    you deal with a large population of winboze users, this option can save
    you some headaches.
 
@@ -160,7 +160,7 @@
    and the slash separate folders (the "^" character is reserved in this 
    mode).
 
-   See /usr/share/doc/cyrus22-common/html/altnamespace.html for details.
+   See /usr/share/doc/cyrus-common-2.2/html/altnamespace.html for details.
 
  o When using SASL, do keep in mind that cyrus runs under user cyrus, and not
    root.  It cannot read shadow files (unless you add the user cyrus to group
@@ -199,8 +199,8 @@
    that.  xfs is probably the best one.
  
  o You may want to enable/disable synchronous metadata writes to your mail
-   store dirs (check /usr/share/doc/cyrus22-doc/html/install.html for more
-   info, in package cyrus22-docs).  The cyrus-makedirs script tries to do the
+   store dirs (check /usr/share/doc/cyrus-doc-2.2/html/install.html for more
+   info, in package cyrus-docs-2.2).  The cyrus-makedirs script tries to do the
    right thing for ext2 and ext3 filesystems.  Failure to correctly update the
    metadata in the right order can completely screw up your Cyrus store on a
    power-loss or another disk failure.

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.database
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.database?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.database&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.database&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.database (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.database Thu Dec  8 03:51:55 2005
@@ -28,7 +28,7 @@
 
 After converting all the mail stores and /var/lib/cyrus to use the proper
 database backends using cvt_cyrusdb(8), remove
-/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus22-common"
+/usr/lib/cyrus/cyrus-db-types.active and run "dpkg-reconfigure cyrus-common-2.2"
 once to reset the error trigger, and start cyrmaster.
 
 If cvt-cyrusdb locks up just at the beginning of the conversion, your databases
@@ -38,7 +38,7 @@
 Step-by-step conversion guide:
 
 1. Stop the Cyrus system
-   /etc/init.d/cyrus22 stop
+   /etc/init.d/cyrus2.2 stop
    
 2. Find out which databases to convert:
    diff -u /usr/lib/cyrus/cyrus-db-types.active \
@@ -103,10 +103,10 @@
 
 3. Reset the database backend change system
    rm /usr/lib/cyrus/cyrus-db-types.active
-   dpkg-reconfigure cyrus22-common
+   dpkg-reconfigure cyrus-common-2.2
 
 4. Start Cyrus, if not started by step 3
-   /etc/init.d/cyrus22 start
+   /etc/init.d/cyrus2.2 start
 
 WHY THERE IS NO AUTOMATED UPGRADE SCRIPT:  Because I dislike people who do not
 read docs, and one Debian user asked me exactly the wrong thing (about

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.debug
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.debug?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.debug&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.debug&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.debug (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.debug Thu Dec  8 03:51:55 2005
@@ -7,7 +7,7 @@
 Cyrus has various levels of debugging aid, which can and should be used to
 offer more information about any problems you are facing with Cyrus.
 
-First, edit /etc/default/cyrus22, and set CYRUS_VERBOSE to a number higher
+First, edit /etc/default/cyrus2.2, and set CYRUS_VERBOSE to a number higher
 than zero.  The higher the number, more debug information is provided. Numbers
 above 30 will cause Cyrus services to pause for 15s before executing (so that
 you can do something to it, such as attach strace or a debugger to the
@@ -56,11 +56,11 @@
 
 1. Install all source dependencies to build the package (needs root):
    apt-get install build-essential fakeroot
-   apt-get build-dep cyrus22-imapd
+   apt-get build-dep cyrus-imapd-2.2
 
 2. Download and rebuild Cyrus with debug information:
-   apt-get source cyrus22-imapd
-   cd cyrus22-imapd-*
+   apt-get source cyrus-imapd-2.2
+   cd cyrus-imapd-2.2*
    DEB_BUILD_OPTIONS=debug,noopt,nostrip dpkg-buildpackage -uc -us -rfakeroot
 
 3. Install the Cyrus packages with debug information (needs root):
@@ -91,7 +91,7 @@
 Set the shell command to be run in /etc/imapd.conf, option debug_command.
 Then, add the command line switch "-D" to the Cyrus services you want to
 run the debug_command in /etc/cyrus.conf, and restart cyrmaster using
-/etc/init.d/cyrus22 restart.
+/etc/init.d/cyrus2.2 restart.
 
 The debugging command must be given as a single line in the configuration file.
 

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.simpleinstall
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.simpleinstall?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.simpleinstall&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.simpleinstall&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.simpleinstall (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/README.Debian.simpleinstall Thu Dec  8 03:51:55 2005
@@ -32,7 +32,7 @@
  2. Make sure /etc/sasldb2 is readable by group sasl.  Pay attention
     to overrides (dpkg-statoverride)!
 
- 3. Make sure user cyrus belongs to group sasl (cyrus22-common's install
+ 3. Make sure user cyrus belongs to group sasl (cyrus-common-2.2's install
     tries to do this automatically for you).
 
  4. Edit /etc/cyrus.conf, and make sure the services you need are
@@ -50,7 +50,7 @@
     will use "/" as the hierarchy separator instead of the default ".".
     I suggest you just leave unixhierarchysep set to false for now.
 
- 6. Restart Cyrus  (/etc/init.d/cyrus22 restart)
+ 6. Restart Cyrus  (/etc/init.d/cyrus2.2 restart)
 
  7. Use saslpasswd2 -c  to create an account for your admin:
     saslpasswd2 -c cyrus
@@ -70,7 +70,7 @@
     You must use "user/bob", "user/anna" instead if you have the
     unixhierarchysep option enabled in imapd.conf.
 
-    For this to work, you obviously need the cyrus22-admin package
+    For this to work, you obviously need the cyrus-admin-2.2 package
     installed.
 
 11. Try to login as a normal user, using imtest or a IMAP/POP3 client.
@@ -98,7 +98,7 @@
     embedded NULLs or any other crap.
 
 
-That's it.  See /usr/share/doc/cyrus22-common/README.{postfix,exim,sendmail}
+That's it.  See /usr/share/doc/cyrus-common-2.2/README.{postfix,exim,sendmail}
 for help on how to setup your MTA to correctly deliver to Cyrus.
 
 

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/README.postfix
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/README.postfix?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/README.postfix&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/README.postfix&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/README.postfix (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/README.postfix Thu Dec  8 03:51:55 2005
@@ -84,7 +84,7 @@
 
 4. Restart Postfix and Cyrus IMAPd
 	# /etc/init.d/postfix restart
-	# /etc/init.d/cyrus22 restart
+	# /etc/init.d/cyrus2.2 restart
 
 
 TCP sockets:

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/UPGRADE.Debian
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/UPGRADE.Debian?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/UPGRADE.Debian&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/UPGRADE.Debian&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/UPGRADE.Debian (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/UPGRADE.Debian Thu Dec  8 03:51:55 2005
@@ -2,7 +2,7 @@
 (thanks to David D. Kilzer <ddkilzer at theracingworld.com> for this document)
 -----------------------------------------------
 
-For more information, see README.Debian[.gz] in /usr/share/doc/cyrus22-common/
+For more information, see README.Debian[.gz] in /usr/share/doc/cyrus-common-2.2/
 and the web page below, part of the cyrus-utils project at SourceForge:
 
   http://cyrus-utils.sourceforge.net/faq
@@ -24,7 +24,7 @@
 -----------------------
 
 Cyrus IMAPD 2.2 uses bytecode for sieve scripts. This means that you need to
-compile all existing sieve scripts so that they will work with cyrus22. There
+compile all existing sieve scripts so that they will work with cyrus 2.2. There
 is a small tool in /usr/lib/cyrus/upgrade, called masssievec which will
 automatically compile all installed scripts when called correctly. Please 
 refer to the scripts usage information for details.
@@ -35,7 +35,7 @@
 ==========================
 
 This document describes the procedure for upgrading from the old cyrus-imapd
-(v1.5.x) package to the new cyrus22-imapd (v2.2) package.  While this is a
+(v1.5.x) package to the new cyrus-imapd-2.2 (v2.2) package.  While this is a
 manual process, it is very straightforward.
 
 The procedure for converting a v1.6 cyrus store to v2.2 is not explained here,
@@ -47,7 +47,7 @@
 as permissions and such.  When in doubt, read the README.simpleinstall
 document, as it describes an initial SASLv2 setup.
 
-NOTE: If you've already installed the cyrus22 packages, skip to step 5.
+NOTE: If you've already installed the cyrus 2.2 packages, skip to step 5.
 
  1. Become the "root" user on your local system.
 
@@ -76,14 +76,14 @@
     NOTE: You could also copy -a the /var/spool/cyrus and /var/lib/cyrus
     folders somewhere else, just in case.
 
- 4. Install the new cyrus22-imapd packages. Make sure no user will try
+ 4. Install the new cyrus-imapd-2.2 packages. Make sure no user will try
     to connect to imapd/pop3d and that no MTA will try to deliver to lmtpd
     until you do step 5.
 
-    cyrus22-common       [required]
-    cyrus22-admin        [required]
-    cyrus22-imapd        [optional; must have one of imapd or pop3d]
-    cyrus22-pop3d        [optional; must have one of imapd or pop3d]
+    cyrus-common-2.2       [required]
+    cyrus-admin-2.2        [required]
+    cyrus-imapd-2.2        [optional; must have one of imapd or pop3d]
+    cyrus-pop3d-2.2        [optional; must have one of imapd or pop3d]
     libcyrus-imap-perl22 [required]
 
     # apt-get install PACKAGE-NAME [PACKAGE_NAME ...]
@@ -92,7 +92,7 @@
 
  5. Stop the cyrmaster process.
 
-    # /etc/init.d/cyrus22 stop
+    # /etc/init.d/cyrus2.2 stop
 
  5a. Make sure Cyrus won't start until the upgrade process is over.
 
@@ -133,7 +133,7 @@
 
 12. Convert the state databases to those used by new Cyrus 2.2
 
-    Read /usr/share/doc/cyrus22-common/README.Debian.database, and follow
+    Read /usr/share/doc/cyrus-common-2.2/README.Debian.database, and follow
     whatever steps you need to change the backends from db3 to skiplist.
 
     This step needs some work, if you can send your experiences with it
@@ -146,7 +146,7 @@
 
 Now, you need to reconfigure the new Cyrus imapd to adequate it to your system
 and SASL requirements. The Cyrus config files are /etc/imapd.conf,
-/etc/cyrus.conf and /etc/default/cyrus22.
+/etc/cyrus.conf and /etc/default/cyrus2.2.
 
 Depending on your SASL configuration, you may also need to modify
 /etc/pam.d/{imap,pop,sieve,lmtp} and other SASL configuration files.

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/changelog?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/changelog&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/changelog&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/changelog (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/changelog Thu Dec  8 03:51:55 2005
@@ -1,10 +1,15 @@
-cyrus22-imapd (2.2.12-2) experimental; urgency=low
+cyrus-imapd-2.2 (2.2.12-2) experimental; urgency=low
 
   [ Henrique de Moraes Holschuh ]
   * Modify the Debian default TLS cipher list to use only secure ciphers
     suitable for imap/pop/smtp/lmtp TLS, and add an explanation
 
- -- Sven Mueller <debian at incase.de>  Tue,  6 Dec 2005 15:38:03 +0100
+  [ Benjamin Seidenberg ]
+  * Rewrote descriptions to all refer to cyrus-common-2.2
+  * Changed all package names in all required files within /debian to reflect
+    the new naming scheme
+
+ -- Benjamin Seidenberg <astronut at dlgeek.net>  Wed,  7 Dec 2005 20:59:42 -0500
 
 cyrus22-imapd (2.2.12-1) experimental; urgency=low
 

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/control
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/control?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/control&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/control&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/control (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/control Thu Dec  8 03:51:55 2005
@@ -1,4 +1,4 @@
-Source: cyrus22-imapd
+Source: cyrus-imapd-2.2
 Section: mail
 Priority: extra
 Maintainer: Henrique de Moraes Holschuh <hmh at debian.org>
@@ -7,13 +7,14 @@
 Build-Depends: debhelper (>= 4.1.68), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libdb4.2-dev (>= 4.2.52), libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, dpatch
 Build-Depends-Indep: transfig, gs, groff
 
-Package: cyrus22-common
+Package: cyrus-common-2.2
 Architecture: any
 Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
-Recommends: cyrus22-imapd | cyrus22-pop3d | cyrus22-murder | cyrus22-nntpd | cyrus22-admin
-Suggests: cyrus22-clients, cyrus22-admin, cyrus22-imapd, cyrus22-pop3d, cyrus22-murder, cyrus22-nntpd, cyrus22-doc, sasl2-bin, apt-listchanges (>= 2.35)
-Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common
-Replaces: cyrus21-common
+Recommends: cyrus-imapd-2.2 | cyrus-pop3d-2.2 | cyrus-murder-2.2 | cyrus-nntpd-2.2 | cyrus-admin-2.2
+Suggests: cyrus-clients-2.2, cyrus-admin-2.2, cyrus-imapd-2.2, cyrus-pop3d-2.2, cyrus-murder-2.2, cyrus-nntpd-2.2, cyrus-doc-2.2, sasl2-bin, apt-listchanges (>= 2.35)
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus21-common, cyrus22-common
+Replaces: cyrus21-common, cyrus22-common
+Provides: cyrus22-common
 Description: Cyrus mail system (common files)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -39,261 +40,125 @@
  to enable IMAP and POP3 support respectively. cyrus22-murder can be
  used to enable IMAP, POP3 and LMTP proxying.
 
-Package: cyrus22-doc
+Package: cyrus-doc-2.2
 Architecture: all
-Provides: cyrus22-docs
-Replaces: cyrus22-docs
-Conflicts: cyrus22-docs
+Provides: cyrus22-doc
+Replaces: cyrus22-doc
+Conflicts: cyrus22-doc
 Description: Cyrus mail system (documentation files)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains the documentation for the Cyrus IMAPd suite.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its
- own MH-like format.
- .
- This package contains documentation for the Cyrus IMAPd suite.
+ For more information, please see the cyrus-common-2.2 package.
 
-Package: cyrus22-imapd
+Package: cyrus-imapd-2.2
 Architecture: any
-Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
 Provides: imap-server
 Conflicts: imap-server
-Replaces: cyrus21-imapd
+Replaces: cyrus21-imapd, cyrus22-imapd
 Description: Cyrus mail system (IMAP support)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains the IMAP (Internet Mail Access  Protocol) portion
+ of the Cyrus IMAPd suite.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains support for IMAP (Internet Mail Access
- Protocol).
+ For more information, please see the cyrus-common-2.2 package.
+  
 
-Package: cyrus22-pop3d
+Package: cyrus-pop3d-2.2
 Architecture: any
-Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
 Provides: pop3-server
 Conflicts: pop3-server
-Replaces: cyrus21-pop3d
+Replaces: cyrus21-pop3d, cyrus22-pop3d
+Provides: cyrus22-pop3d
 Description: Cyrus mail system (POP3 support)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains the POP3 (Post Office Protocol) portion of the Cyrus
+ IMAPd suite.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains support for POP3 (Post Office Protocol).
+ For more information, please see the cyrus-common-2.2 package.
 
-Package: cyrus22-admin
+Package: cyrus-admin-2.2
 Architecture: all
 Depends: libcyrus-imap-perl22 (>= ${Source-Version})
 Suggests: sasl2-bin
-Conflicts: cyrus-admin
-Replaces: cyrus21-admin
-Description: Cyrus mail system (administration tool)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains the cyradm tool which can be used to administer 
+Conflicts: cyrus-admin, cyrus21-admin, cyrus22-admin
+Replaces: cyrus21-admin, cyrus22-admin
+Provides: cyrus22-admin
+Description: Cyrus mail system (administration tools)
+ This package provides the administrative tools for the Cyrus IMAPd suite.
+ It contains the cyradm tool which can be used to administer 
  both local and remote Cyrus mail systems.  It also contains sieveshell
  and its deprecated cousin installsieve, which can be used to manage
  sieve scripts.
+ .
+ For more information, please see the cyrus-common-2.2 package.
 
-Package: cyrus22-murder
+Package: cyrus-murder-2.2
 Architecture: any
-Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
-Recommends: cyrus22-imapd (= ${Source-Version}), cyrus22-pop3d (= ${Source-Version})
-Replaces: cyrus21-murder
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
+Recommends: cyrus-imapd-2.2 (= ${Source-Version}), cyrus-pop3d-2.2 (= ${Source-Version})
+Conflicts: cyrus21-murder, cyrus22-murder
+Replaces: cyrus21-murder, cyrus22-murder
+Provides: cyrus22-murder
 Description: Cyrus mail system (proxies and aggregator)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Virtual domain support
-  o Support for POP3 in addition to IMAP
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains the Cyrus IMAPd suite murder aggregator system,
+ i.e. IMAP, POP3  and LMTP proxies, and the mupdate mailbox master daemon.
+ It allows for cluster setups where there are many backend Cyrus spools and
+ frontend proxy servers.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains Cyrus murder aggregator system, i.e. IMAP, POP3
- and LMTP proxies, and the mupdate mailbox master daemon.  It allows for
- cluster setups where there are many backend Cyrus spools and frontend
- proxy servers.
+ For more information, please see the cyrus-common-2.2 package.
+  
 
-Package: cyrus22-nntpd
+Package: cyrus-nntpd-2.2
 Architecture: any
-Depends: cyrus22-common (= ${Source-Version}), ${shlibs:Depends}
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
 Provides: news-transport-system
 Conflicts: news-transport-system
+Replaces: cyrus21-nntpd, cyrus22-nntpd
+Provides: cyrus22-nntpd
 Description: Cyrus mail system (NNTP support)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Support for POP3 in addition to IMAP
-  o Virtual domain support
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains the NNTP (Network News Transfer Protocol) portion of
+ the Cyrus IMAPd suite.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains support for NNTP (Network News Transfer Protocol).
-
-
-Package: cyrus22-clients
+ For more information, please see the cyrus-common-2.2 package.
+ 
+Package: cyrus-clients-2.2
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: cyrus21-clients
-Provides: cyrus21-clients
-Replaces: cyrus21-clients
+Conflicts: cyrus21-clients, cyrus22-clients
+Provides: cyrus22-clients
+Replaces: cyrus21-clients. cyrus22-clients
 Description: Cyrus mail system (test clients)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Support for POP3 in addition to IMAP
-  o Virtual domain support
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains the mupdatetest, sivtest, smtptest, lmtptest,
+ This package contains client tools to test the Cyrus IMAPd suite.
+ It contains the mupdatetest, sivtest, smtptest, lmtptest,
  imtest and pop3test tools which can be used to interactivily talk to 
  a mupdate, sieve, smtp, lmtp, imap or pop3 server.
  The clients are fully SASL-enabled for authentication.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+  
 
-Package: cyrus22-dev
+Package: cyrus-dev-2.2
 Architecture: any
 Section: devel
-Depends: libcyrus-imap-perl22 (>= ${Source-Version}), cyrus22-common (= ${Source-Version}), libsasl2-dev (>= 2.1.9)
-Conflicts: cyrus-dev, cyrus21-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52)
+Depends: libcyrus-imap-perl22 (>= ${Source-Version}), cyrus-common-2.2 (= ${Source-Version}), libsasl2-dev (>= 2.1.9)
+Conflicts: cyrus-dev, cyrus21-dev, cyrus22-dev, libdb3-dev (<< 3.2.9-15), libdb2-dev (<< 2.7.7.0-6), libdb4.2-dev (<<4.2.52)
+Replaces: cyrus22-dev
+Provides: cyrus22-dev
 Description: Cyrus mail system (developer files)
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Support for POP3 in addition to IMAP
-  o Virtual domain support
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
+ This package contains header files and the static library needed 
+ to develop IMAP applications that interface with the Cyrus IMAPd suite.
  .
- Note: Cyrus doesn't support reading from and storing mail in your 
- standard mail spool - it stores mail in a separate directory in its 
- own MH-like format.
- .
- This package contains header files and the static library needed 
- to develop IMAP applications that interface with Cyrus.
+ For more information, please see the cyrus-common-2.2 package.
+  
 
 Package: libcyrus-imap-perl22
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}
-Provides: libcyrus-imap-perl, libcyrus-imap-perl21
+Provides: libcyrus-imap-perl 
 Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21
 Replaces: libcyrus-imap-perl21
 Section: perl
 Description: Interface to Cyrus imap client imclient library
- Cyrus is a fully-featured IMAP daemon, with a number of features not
- found in other IMAP implementations, including:
-  o Designed to handle massive quantities of mail
-  o No need for users to have login accounts
-  o Support for POP3 in addition to IMAP
-  o Virtual domain support
-  o Sieve server-side email filtering
-  o Servers don't run as root
-  o Easy support for mail quotas
-  o SSL support, including secure IMAP
-  o DRAC support for pop/imap-before-smtp
-  o IPv6 support
-  o NNTP support
- For more information, see http://asg.web.cmu.edu/cyrus/.
- .
  The Cyrus::IMAP module provides an interface to the Cyrus imclient
  library.  These are primarily useful for implementing cyradm operations
  within a Perl script; there are easier ways to implement general client
@@ -302,3 +167,6 @@
  .
  The modules that compose Cyrus::SIEVE are also included, but they are
  undocumented upstream.
+ .
+ For more information, please see the cyrus-common-2.2 package.
+  

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.README.Debian (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.README.Debian)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.README.Debian?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.README.Debian&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.README.Debian&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.README.Debian (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.README.Debian Thu Dec  8 03:51:55 2005
@@ -2,7 +2,7 @@
 $Id$
 ---------------------
 
-Refer to the cyrus22-doc package for more information.  There is a lot
+Refer to the cyrus-doc-2.2 package for more information.  There is a lot
 of it, and it will save you hours (or days) of frustating bug-hunting if
 you read them first.
 

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.lintian (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.lintian)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.lintian?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.lintian&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.lintian&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.lintian (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.lintian Thu Dec  8 03:51:55 2005
@@ -1,1 +1,1 @@
-cyrus22-admin: shell-script-fails-syntax-check ./usr/bin/cyradm
+cyrus-admin-2.2: shell-script-fails-syntax-check ./usr/bin/cyradm

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.menu (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.menu)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.menu?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.menu&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.menu&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-admin.menu (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-admin-2.2.menu Thu Dec  8 03:51:55 2005
@@ -1,4 +1,4 @@
-?package(cyrus22-admin):needs="text" section="Apps/System/Admin"\
+?package(cyrus-admin-2.2):needs="text" section="Apps/System/Admin"\
 	hints="Mail,Admin,Cyrus"\
 	title="Cyrus 2.2 cyradm (cyrus at localhost)"\
 	longtitle="Administer local Cyrus IMAPd 2.2 accounts as user cyrus"\

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-clients-2.2.README.Debian (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-clients.README.Debian)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-clients-2.2.README.Debian?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-clients.README.Debian&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-clients-2.2.README.Debian&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-clients.README.Debian (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-clients-2.2.README.Debian Thu Dec  8 03:51:55 2005
@@ -2,7 +2,7 @@
 $Id$
 ---------------------
 
-Refer to the cyrus22-doc package for more information.  There is a lot
+Refer to the cyrus-doc-2.2 package for more information.  There is a lot
 of it, and it will save you hours (or days) of frustating bug-hunting if
 you read them first.
 

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cron.daily (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cron.daily)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cron.daily?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cron.daily&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cron.daily&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cron.daily (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cron.daily Thu Dec  8 03:51:55 2005
@@ -25,7 +25,7 @@
 bakfile=${bak}/cyrus-mboxlist.txt.gz
 CONF=/etc/imapd.conf
 CHKCYRUS=0
-[ -r /etc/default/cyrus22 ] && . /etc/default/cyrus22
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
 umask 022
 
 # 1. backup mailbox database

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.default (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.default)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.default?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.default&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.default&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.default (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.default Thu Dec  8 03:51:55 2005
@@ -1,7 +1,7 @@
 # Defaults for Cyrus IMAPd 2.2 scripts
 # $Id$
-# sourced by /etc/init.d/cyrus22, /usr/sbin/cyrus-makedirs
-# installed at /etc/default/cyrus22 by the maintainer scripts
+# sourced by /etc/init.d/cyrus2.2, /usr/sbin/cyrus-makedirs
+# installed at /etc/default/cyrus2.2 by the maintainer scripts
 #
 
 #

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init Thu Dec  8 03:51:55 2005
@@ -1,14 +1,14 @@
 #! /bin/sh
 #
 ### BEGIN INIT INFO
-# Provides: cyrus22-common
+# Provides: cyrus-common-2.2
 # Required-Start: $syslog $network
 # Required-Stop: $syslog $network
 # Default-Start: 2 3 4 5
 # Default-Stop: S 0 1 6
-# Short-Description: common init system for cyrus22 IMAP/POP3 daemons.
-# Description: common init system for cyrus22 IMAP/POP3 daemons.
-#              start central cyrus22 master process, which can 
+# Short-Description: common init system for cyrus 2.2 IMAP/POP3 daemons.
+# Description: common init system the for cyrus 2.2 IMAP/POP3 daemons.
+#              starts the central cyrus 2.2 master process, which can 
 #              then start various services depending on configuration.
 #              Typically starts IMAP and POP3 daemons, but might also
 #              start an NNTP daemon and various helper daemons for
@@ -29,7 +29,7 @@
 # Overridable defaults
 unset CYRUS_VERBOSE
 unset LISTENQUEUE
-[ -r /etc/default/cyrus22 ] && . /etc/default/cyrus22
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
 
 [ "x${CYRUS_VERBOSE}" != "x" ] && export CYRUS_VERBOSE
 OPTIONS="-d"
@@ -118,7 +118,7 @@
 	  -d /var/spool/cyrus/mail/user -a ! -d /var/spool/cyrus/mail/stage. ] && {
 	  	echo "$0: It appears that you still have an version 1.5 spool" 1>&2
 		echo "$0: that needs to be upgraded. Please refer to the guide" 1>&2
-		echo "$0: at /usr/share/doc/cyrus22-common/UPGRADE.Debian" 1>&2
+		echo "$0: at /usr/share/doc/cyrus-common-2.2/UPGRADE.Debian" 1>&2
 		echo
 		echo "$0: Cyrmaster not started."
 		exit 6
@@ -134,7 +134,7 @@
 		    echo "$0: Database backends mismatch! You must manually" 1>&2
 		    echo "$0: verify and update the Cyrus databases to the" 1>&2
 		    echo "$0: new backends." 1>&2
-		    echo "$0: Please refer to /usr/share/doc/cyrus22-common/README.Debian" 1>&2
+		    echo "$0: Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian" 1>&2
 		    echo "$0: for instructions." 1>&2
 		    echo
 		    echo "$0: Cyrmaster not started."

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.lintian (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.lintian)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.lintian?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.lintian&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.lintian&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.lintian (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.lintian Thu Dec  8 03:51:55 2005
@@ -1,2 +1,2 @@
-cyrus22-common: no-debconf-config
-cyrus22-common: postinst-uses-db-input
+cyrus-common-2.2: no-debconf-config
+cyrus-common-2.2: postinst-uses-db-input

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postinst (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postinst)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postinst?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postinst&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postinst&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postinst (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postinst Thu Dec  8 03:51:55 2005
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postinst script for cyrus22-common
+# postinst script for cyrus-common-2.2
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
 # $Id$
@@ -57,7 +57,7 @@
 	   --gecos "Cyrus Mailsystem User"  cyrus >/dev/null 2>&1 || {
 	   if getent passwd | grep -s -q -E '^cyrus:'; then
 		   echo "Non-system user cyrus found. I will not overwrite a non-system" >&2
-		   echo "user. Remove the user and reinstall cyrus22-common." >&2
+		   echo "user. Remove the user and reinstall cyrus-common-2.2." >&2
 		   exit 1
 	   fi
 	   # unknown adduser error, simply exit
@@ -100,16 +100,16 @@
 		# from the (old) active database types file with the new one
 		if verifydb /usr/lib/cyrus/cyrus-db-types.txt \
 		    < /usr/lib/cyrus/cyrus-db-types.active ; then
-		    db_input high cyrus22-common/warnbackendchange || true
+		    db_input high cyrus-common-2.2/warnbackendchange || true
 		    db_go || true
 		else
 		    cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
-		    db_fset cyrus22-common/warnbackendchange seen false || true
+		    db_fset cyrus-common-2.2/warnbackendchange seen false || true
 		fi
 	else
 		[ -f /usr/lib/cyrus/cyrus-db-types.txt ] && \
 		  cp -p /usr/lib/cyrus/cyrus-db-types.txt /usr/lib/cyrus/cyrus-db-types.active
-		db_fset cyrus22-common/warnbackendchange seen false || true
+		db_fset cyrus-common-2.2/warnbackendchange seen false || true
 	fi
 
 	# Deal with hardwired config changes
@@ -131,9 +131,9 @@
 	db_stop
 
 	# Register initscript, and start it (it is ok if start fails)
-	[ -x /etc/init.d/cyrus22 ] && {
-		update-rc.d cyrus22 defaults >/dev/null
-		invoke-rc.d cyrus22 start || true
+	[ -x /etc/init.d/cyrus2.2 ] && {
+		update-rc.d cyrus2.2 defaults >/dev/null
+		invoke-rc.d cyrus2.2 start || true
 	}
     ;;
 

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postrm (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postrm)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postrm?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postrm&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postrm&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.postrm (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.postrm Thu Dec  8 03:51:55 2005
@@ -1,5 +1,5 @@
 #! /bin/sh
-# postrm script for cyrus22-common
+# postrm script for cyrus-common-2.2
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
 # $Id$
@@ -35,11 +35,11 @@
 
 			# Should we remove our precious data?
 			db_title "Cyrus IMAPd 2.2" || true
-			db_fset cyrus22-common/removespools seen false || true
-			db_input high cyrus22-common/removespools || true
+			db_fset cyrus-common-2.2/removespools seen false || true
+			db_input high cyrus-common-2.2/removespools || true
 			db_go || true
 
-			db_get cyrus22-common/removespools
+			db_get cyrus-common-2.2/removespools
 			[ "${RET}" = "true" ] && {
 				for i in /var/spool/cyrus /var/lib/cyrus \
 				         /var/spool/sieve /etc/sieve ; do
@@ -50,7 +50,7 @@
 				rm -f /usr/lib/cyrus/cyrus-*.active
 			}
 
-			update-rc.d cyrus22 remove >/dev/null
+			update-rc.d cyrus2.2 remove >/dev/null
         	;;
 
 		upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.prerm (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.prerm)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.prerm?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.prerm&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.prerm&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.prerm (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.prerm Thu Dec  8 03:51:55 2005
@@ -1,5 +1,5 @@
 #! /bin/sh
-# prerm script for cyrus22-common
+# prerm script for cyrus-common-2.2
 # Copyright (c) 2002 by Henrique de Moraes Holschuh
 # Distributed under the GNU General Public License version 2
 # $Id$
@@ -23,7 +23,7 @@
 case "$1" in
     remove|upgrade|deconfigure)
     	# Call initscript, if it is there to stop the daemon
- 	invoke-rc.d cyrus22 stop || true
+ 	invoke-rc.d cyrus2.2 stop || true
         ;;
     failed-upgrade)
         ;;

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.templates (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.templates)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.templates?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.templates&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.templates&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.templates (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.templates Thu Dec  8 03:51:55 2005
@@ -1,4 +1,4 @@
-Template: cyrus22-common/warnbackendchange
+Template: cyrus-common-2.2/warnbackendchange
 Type: note
 _Description: Database backends have changed!
  Comparation between /usr/lib/cyrus/cyrus-db-types.txt and
@@ -9,11 +9,11 @@
  might need to be converted manually to the new format, using the
  cvt_cyrusdb(8) utility.
  .
- Please refer to /usr/share/doc/cyrus22-common/README.Debian.database
+ Please refer to /usr/share/doc/cyrus-common-2.2/README.Debian.database
  for more information.  Do not start cyrmaster until you have converted
  the databases to the new format.
 
-Template: cyrus22-common/removespools
+Template: cyrus-common-2.2/removespools
 Type: boolean
 Default: false
 _Description: Remove the Cyrus spools, and user sieve scripts?

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-dev-2.2.links (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-dev.links)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-dev-2.2.links?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-dev.links&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-dev-2.2.links&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-dev.links (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-dev-2.2.links Thu Dec  8 03:51:55 2005
@@ -1,1 +1,2 @@
-usr/share/doc/cyrus22-common usr/share/doc/cyrus22-dev
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-dev-2.2
+

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.doc-base (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.doc-base)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.doc-base?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.doc-base&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.doc-base&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.doc-base (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.doc-base Thu Dec  8 03:51:55 2005
@@ -1,4 +1,4 @@
-Document: cyrus22-manual
+Document: cyrus2.2-manual
 Title: CMU Cyrus 2.2 Manual
 Author: Carnegie Mellon University
 Abstract: This manual describes how to configure and administer 
@@ -6,5 +6,5 @@
 Section: mail
 
 Format: HTML
-Index: /usr/share/doc/cyrus22-doc/html/index.html
-Files: /usr/share/doc/cyrus22-doc/html/*.html
+Index: /usr/share/doc/cyrus-doc-2.2/html/index.html
+Files: /usr/share/doc/cyrus-doc-2.2/html/*.html

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.links (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.links)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.links?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.links&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.links&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-doc.links (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-doc-2.2.links Thu Dec  8 03:51:55 2005
@@ -1,1 +1,1 @@
-usr/share/doc/cyrus22-doc usr/share/doc/cyrus22-common/docs
+usr/share/doc/cyrus-doc-2.2 usr/share/doc/cyrus-common-2.2/docs

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.links (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-imapd.links)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.links?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-imapd.links&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.links&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-imapd.links (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-imapd-2.2.links Thu Dec  8 03:51:55 2005
@@ -1,1 +1,1 @@
-usr/share/doc/cyrus22-common usr/share/doc/cyrus22-imapd
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-imapd-2.2

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs Thu Dec  8 03:51:55 2005
@@ -20,7 +20,7 @@
 
 CYRUSOPTFILESYS=1
 CONF=/etc/imapd.conf
-[ -r /etc/default/cyrus22 ] && . /etc/default/cyrus22
+[ -r /etc/default/cyrus2.2 ] && . /etc/default/cyrus2.2
 
 getconf () {
 	confvalue=`sed --silent -e "/^[[:blank:]]*$1:/ { \
@@ -126,7 +126,7 @@
 # ext3:  Journal data too, since that improves access time a LOT
 #        (maybe in the future, there's a bug in 2.4.18 ext3 w/ +j)
 #
-echo "Trying to optimize Cyrus partitions, edit /etc/default/cyrus22 to disable..."
+echo "Trying to optimize Cyrus partitions, edit /etc/default/cyrus2.2 to disable..."
 partsys="${confdir} ${partitions}"
 filesys=`df -P -T ${partsys} | sed -e "1 d" -e "s/ \+/ /g" | cut -d " " -f 2 | xargs`
 for i in ${filesys} ; do

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs.8
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs.8?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs.8&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs.8&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs.8 (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-makedirs.8 Thu Dec  8 03:51:55 2005
@@ -43,7 +43,7 @@
 to use.  /etc/imapd.conf is assumed, if no parameters are given.
 .SH SEE ALSO
 .BR imapd.conf(5),
-.BR /etc/default/cyrus22
+.BR /etc/default/cyrus2.2
 .SH AUTHOR
 This manual page was written by Henrique de Moraes Holschuh <hmh at debian.org>,
 for the Debian GNU/Linux system (but may be used by others).

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-murder-2.2.links (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-murder.links)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-murder-2.2.links?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-murder.links&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-murder-2.2.links&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-murder.links (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-murder-2.2.links Thu Dec  8 03:51:55 2005
@@ -1,1 +1,1 @@
-usr/share/doc/cyrus22-common usr/share/doc/cyrus22-murder
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-murder-2.2

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.links (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.links?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.links&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-nntpd.links (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-nntpd-2.2.links Thu Dec  8 03:51:55 2005
@@ -1,1 +1,1 @@
-usr/share/doc/cyrus22-common usr/share/doc/cyrus22-nntpd
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-nntpd-2.2

Copied: branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.links (from r223, trunk/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.links)
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.links?view=diff&rev=225&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.links&r1=223&p2=branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.links&r2=225
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-pop3d.links (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/cyrus-pop3d-2.2.links Thu Dec  8 03:51:55 2005
@@ -1,1 +1,2 @@
-usr/share/doc/cyrus22-common usr/share/doc/cyrus22-pop3d
+usr/share/doc/cyrus-common-2.2 usr/share/doc/cyrus-pop3d-2.2
+

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/executable.files
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/executable.files?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/executable.files&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/executable.files&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/executable.files (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/executable.files Thu Dec  8 03:51:55 2005
@@ -9,10 +9,10 @@
 ./contrib/notify_unix/simple_notify.pl
 ./contrib/notify_unix/sql_notify.pl
 ./debian/cyrus-makedirs
-./debian/cyrus22-common.cyrus22.init
-./debian/cyrus22-common.postinst
-./debian/cyrus22-common.postrm
-./debian/cyrus22-common.prerm
+./debian/cyrus-common-2.2.cyrus2.2.init
+./debian/cyrus-common-2.2.postinst
+./debian/cyrus-common-2.2.postrm
+./debian/cyrus-common-2.2.prerm
 ./debian/examples/mboxtocyrus
 ./debian/rules
 ./doc/internal/internationalization.html

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/imapd.conf
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/imapd.conf?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/imapd.conf&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/imapd.conf&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/imapd.conf (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/imapd.conf Thu Dec  8 03:51:55 2005
@@ -15,7 +15,7 @@
 
 # Alternate namespace
 # If enabled, activate the alternate namespace as documented in
-# /usr/share/doc/cyrus22-doc/html/altnamespace.html, where an user's
+# /usr/share/doc/cyrus-doc-2.2/html/altnamespace.html, where an user's
 # subfolders are in the same level as the INBOX
 # See also userprefix and sharedprefix on imapd.conf(5)
 altnamespace: no
@@ -305,7 +305,7 @@
 ##
 ## DEBUGGING
 ##
-# Debugging hook. See /usr/share/doc/cyrus22-common/README.Debian.debug
+# Debugging hook. See /usr/share/doc/cyrus-common-2.2/README.Debian.debug
 # Keep the hook disabled when it is not in use
 #
 # gdb Back-traces

Modified: branches/astronut/cyrus-imapd-2.2.12/debian/rules
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/astronut/cyrus-imapd-2.2.12/debian/rules?view=diff&rev=225&p1=branches/astronut/cyrus-imapd-2.2.12/debian/rules&r1=224&p2=branches/astronut/cyrus-imapd-2.2.12/debian/rules&r2=225
==============================================================================
--- branches/astronut/cyrus-imapd-2.2.12/debian/rules (original)
+++ branches/astronut/cyrus-imapd-2.2.12/debian/rules Thu Dec  8 03:51:55 2005
@@ -10,8 +10,8 @@
 # DebHelper control
 export DH_ALWAYS_EXCLUDE=CVS
 
-export MAINPKG=cyrus22-common
-export DOCPKG=cyrus22-doc
+export MAINPKG=cyrus-common-2.2
+export DOCPKG=cyrus-doc-2.2
 export TMPPKG := $(CURDIR)/debian/tmp
 export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
 export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG)
@@ -226,9 +226,9 @@
 
 	# and logcheck files
 	install -m 644 debian/logcheck.ignore \
-	  $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus22
+	  $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2.2
 	install -m 644 debian/logcheck.ignore \
-	  $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus22
+	  $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2.2
 
 	# Install the stuff needed for upgrades
 	for i in convert-sieve.pl dohash rehash undohash translatesieve \
@@ -243,10 +243,10 @@
 	install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
 
 	# Install imtest and its symlinks
-	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus22-clients/usr/bin
+	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus-clients-2.2/usr/bin
 	for i in $(TMPPKG)/usr/bin/*test ; do \
 		rm -f "$$i" || true ;\
-		(cd $(CURDIR)/debian/cyrus22-clients/usr/bin &&\
+		(cd $(CURDIR)/debian/cyrus-clients-2.2/usr/bin &&\
 		 ln -s imtest `basename $$i`) ;\
 	done
 
@@ -287,7 +287,7 @@
 
 	# Install contrib/ files
 	mkdir -p $(DOCDIR)/contrib
-	xargs < debian/cyrus22-common.contrib -rti cp -r '{}' $(DOCDIR)/contrib
+	xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
 
 	dh_movefiles -i
 
@@ -295,16 +295,16 @@
 	dh_testdir -i
 	dh_testroot -i
 #	dh_installdebconf -i
-	dh_installdocs -p cyrus22-admin -p cyrus22-doc
-	dh_installexamples -p cyrus22-admin
+	dh_installdocs -p cyrus-admin-2.2 -p cyrus-doc-2.2
+	dh_installexamples -p cyrus-admin-2.2
 	dh_installmenu -i
 #	dh_installlogrotate -i
 #	dh_installpam -i
 #	dh_installmime -i
 #	dh_installcron -i
 	dh_installman -i
-	dh_installchangelogs -p cyrus22-admin doc/changes.html
-	dh_installchangelogs -p cyrus22-doc
+	dh_installchangelogs -p cyrus-admin-2.2 doc/changes.html
+	dh_installchangelogs -p cyrus-doc-2.2
 	dh_strip -i
 	dh_link -i
 	dh_compress -i
@@ -321,17 +321,17 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdebconf -a
-	dh_installdocs -p $(MAINPKG) -p cyrus22-clients -p libcyrus-imap-perl22
-	dh_installexamples -p $(MAINPKG) -p libcyrus-imap-perl22 -p cyrus22-clients
+	dh_installdocs -p $(MAINPKG) -p cyrus-clients-2.2 -p libcyrus-imap-perl22
+	dh_installexamples -p $(MAINPKG) -p libcyrus-imap-perl22 -p cyrus-clients-2.2
 	dh_installmenu -a
 #	dh_installlogrotate -a
 #	dh_installpam -a
 #	dh_installmime -a
-	dh_installinit -p $(MAINPKG) --noscripts --name=cyrus22
+	dh_installinit -p $(MAINPKG) --noscripts --name=cyrus2.2
 	dh_installcron -a
 	dh_installman -a
 #	dh_installinfo -a
-	dh_installchangelogs -p $(MAINPKG) -p cyrus22-clients doc/changes.html
+	dh_installchangelogs -p $(MAINPKG) -p cyrus-clients-2.2 doc/changes.html
 	dh_installchangelogs -p libcyrus-imap-perl22 perl/imap/Changes
 	dh_fixperms -a
 	dh_strip -a




More information about the Pkg-Cyrus-imapd-Debian-devel mailing list