[SVN] r861 - in /branches/cyrus23/cyrus-imapd-2.3-development/debian: cyrus-admin-2.3.lintian cyrus-admin-2.3.lintian-overrides cyrus-common-2.3.lintian cyrus-common-2.3.lintian-overrides libcyrus-imap-perl23.lintian rules source.lintian-overrides

[debian at incase.de]

Author: myon
Date: Mon Jan 18 20:51:44 2010
New Revision: 861

URL: https://mail.incase.de/viewcvs?rev=861&root=cyrus22&view=rev
Log:
convert to use dh_lintian

Added:
    branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian-overrides
      - copied, changed from r860, branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian
    branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian-overrides
      - copied, changed from r860, branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian
Removed:
    branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian
    branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian
    branches/cyrus23/cyrus-imapd-2.3-development/debian/libcyrus-imap-perl23.lintian
    branches/cyrus23/cyrus-imapd-2.3-development/debian/source.lintian-overrides
Modified:
    branches/cyrus23/cyrus-imapd-2.3-development/debian/rules

Copied: branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian-overrides (from r860, branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian)
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian-overrides?p2=branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian-overrides&p1=branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian&r1=3D860&r2=861&rev=861&root=cyrus22&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-admin-2.3.lintian-overrides Mon Jan 18 20:51:44 2010
@@ -1,1 +1,2 @@
+# cyradm is half shell script, half pod.
 cyrus-admin-2.3: shell-script-fails-syntax-check ./usr/bin/cyradm

Copied: branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian-overrides (from r860, branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian)
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian-overrides?p2=branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian-overrides&p1=branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian&r1=860&r2=861&rev=861&root=cyrus22&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/cyrus-common-2.3.lintian-overrides Mon Jan 18 20:51:44 2010
@@ -1,4 +1,4 @@
-cyrus-common-2.2: no-debconf-config
-cyrus-common-2.2: postinst-uses-db-input
-cyrus-common-2.2: dir-or-file-in-var-run var/run/cyrus/
-cyrus-common-2.2: dir-or-file-in-var-run var/run/cyrus/socket/
+# In the postinst, we only show a popup.
+# In the postrm, we ask if the user wants to purge the mailstore.
+cyrus-common-2.3 binary: no-debconf-config
+cyrus-common-2.3 binary: postinst-uses-db-input

Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/rules
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/rules?rev=861&root=cyrus22&r1=860&r2=861&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/rules (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/rules Mon Jan 18 20:51:44 2010
@@ -282,11 +282,7 @@
 		 ln -s imtest `basename $$i`) ;\
 	done
 	# Lintian overrides
-	cd debian ; \
-	for i in *.lintian ; do \
-		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
-		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
-	done
+	dh_lintian
 	dh_install -a --sourcedir=$(TMPPKG)
 	touch install-arch-stamp
 
@@ -324,6 +320,8 @@
 	dh_installdocs -p cyrus-admin-2.3 -p cyrus-doc-2.3
 	dh_installexamples -p cyrus-admin-2.3
 	dh_installmenu -i
+	# Wipe stray .svn dirs
+	find cyrus-doc-2.3/usr/share/doc -name .svn | xargs -r rm -rf
 #	dh_installlogrotate -i
 #	dh_installpam -i
 #	dh_installmime -i