A first attempt at integrating dma-migrate as a separate binary package.

diff --git a/changelog b/changelog
index fcb59c486e0583a17ed43ee5f65ccf28a24be597..9d4b6355b46eb906f98302532e9d1e6aa9b0412c 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,6 +1,5 @@
 dma (0.0.2009.08.29-1) UNRELEASED; urgency=low
 
-  TODO: integrate dma-migrate
   TODO: make sure the double-bounce program works with the new queue format
 
   * New upstream version:
@@ -23,6 +22,8 @@ dma (0.0.2009.08.29-1) UNRELEASED; urgency=low
   * Use dpkg-buildflags from dpkg-dev >= 1.15.7~ to get the default
     values for CFLAGS, CPPFLAGS, and LDFLAGS; no longer rely on
     dpkg-buildpackage to set them by default.
+  * Add the dma-migrate utility (in a separate binary package) to convert
+    spool files to the new queue format (M* and Q* files for each message)
 
  -- Peter Pentchev <roam@ringlet.net>  Wed, 02 Jun 2010 14:10:05 +0300
 

diff --git a/control b/control
index aa755c491e05153e58974e2fa82c6c811a109e43..c514a30ee1b90e915a54175e43dfc4eb2256c883 100644 (file)
--- a/control
+++ b/control
@@ -14,7 +14,7 @@ Depends: liblockfile1 (>> 1.01), ${shlibs:Depends}, ${misc:Depends}
 Provides: mail-transport-agent
 Conflicts: mail-transport-agent
 Replaces: mail-transport-agent
-Recommends: safecat
+Recommends: dma-migrate, safecat
 Description: lightweight mail transport agent
  The DragonFly Mail Agent is a small Mail Transport Agent (MTA),
  designed for home and office use.  It accepts mails from local Mail
@@ -25,3 +25,12 @@ Description: lightweight mail transport agent
  dma is not intended as a replacement for full-featured MTAs like
  Sendmail, Postfix, or Exim.  Consequently, dma does not listen on
  port 25 for incoming connections.
+
+Package: dma-migrate
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Enhances: dma
+Description: migration utility for the DragonFly Mail Agent's spool files
+ The dma-migrate utility examines the DragonFly Mail Agent's mail queue
+ and performs any conversions from old message file formats to the most
+ recent one as needed.

diff --git a/dma-migrate.dirs b/dma-migrate.dirs
new file mode 100644 (file)
index 0000000..b174b44
--- /dev/null
+++ b/dma-migrate.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/man/man8

diff --git a/dirs b/dma.dirs
similarity index 100%
rename from dirs
rename to dma.dirs

diff --git a/rules b/rules
index 371ff2e9096e7d3406d7410fc92772cb4ec24df8..f29656f86aa2548749b5ad988d14cb68c635668c 100755 (executable)
--- a/rules
+++ b/rules
@@ -24,16 +24,23 @@ export CFLAGS CPPFLAGS LDFLAGS
 
 override_dh_auto_build:
        pmake
+       cd debian/migrate && pmake
 
 override_dh_auto_clean:
        pmake clean
+       cd debian/migrate && pmake clean
 
 override_dh_auto_install:
        pmake DESTDIR=$(CURDIR)/debian/$(PACKAGE) BINDIR=/usr/sbin install
+       cd debian/migrate && pmake DESTDIR=$(CURDIR)/debian/dma-migrate BINDIR=/usr/sbin install
        install -d -o root -g mail -m 770 $(CURDIR)/debian/$(PACKAGE)/var/spool/dma
 
 override_dh_fixperms:
        dh_fixperms -Xusr/sbin/dma -Xvar/spool/dma -Xetc/dma
 
+override_dh_installchangelogs:
+       dh_installchangelogs -p dma
+       dh_installchangelogs -p dma-migrate debian/migrate/NEWS
+
 %:
        dh $@