[Pkg-mono-svn-commits] rev 3568 - in cli-common/trunk: . debian
Mirco Bauer
meebey at alioth.debian.org
Tue Jan 1 19:55:33 UTC 2008
Author: meebey
Date: 2008-01-01 19:55:33 +0000 (Tue, 01 Jan 2008)
New Revision: 3568
Added:
cli-common/trunk/policy-remove
Modified:
cli-common/trunk/debian/changelog
cli-common/trunk/debian/cli-common-dev.install
cli-common/trunk/debian/cli-common.install
cli-common/trunk/dh_cligacpolicy
cli-common/trunk/gac-package-install
cli-common/trunk/policy-install
cli-common/trunk/postinst-cligacpolicy
cli-common/trunk/postrm-cligacpolicy
Log:
- fixed policy remove handling
Modified: cli-common/trunk/debian/changelog
===================================================================
--- cli-common/trunk/debian/changelog 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/debian/changelog 2008-01-01 19:55:33 UTC (rev 3568)
@@ -1,3 +1,20 @@
+cli-common (0.5.4~pre1) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * debian/cli-common-dev.install:
+ + Added dh_clistrip, which all CLI packages should use to handle .mdb
+ files automatically.
+ * policy-remove:
+ + New script which is used to removes GAC policy files from all GACs.
+ * gac-package-install
+ + Removed the misleading "ignoring" from the error message if an assembly
+ could not be found.
+ * postrm-cligacpolicy:
+ + Don't abuse the policy-install script to remove policies when the package
+ is removed, instead we are using policy-remove now.
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 01 Jan 2008 14:06:55 +0100
+
cli-common (0.5.3) unstable; urgency=low
* dh_clideps:
Modified: cli-common/trunk/debian/cli-common-dev.install
===================================================================
--- cli-common/trunk/debian/cli-common-dev.install 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/debian/cli-common-dev.install 2008-01-01 19:55:33 UTC (rev 3568)
@@ -2,6 +2,7 @@
dh_makeclilibs /usr/bin/
dh_clideps /usr/bin/
dh_clifixperms /usr/bin/
+dh_clistrip /usr/bin/
dh_installcligac /usr/bin/
postinst-cligac /usr/share/debhelper/autoscripts/
Modified: cli-common/trunk/debian/cli-common.install
===================================================================
--- cli-common/trunk/debian/cli-common.install 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/debian/cli-common.install 2008-01-01 19:55:33 UTC (rev 3568)
@@ -3,3 +3,4 @@
gac-package-install /usr/share/cli-common/
gac-package-remove /usr/share/cli-common/
policy-install /usr/share/cli-common/
+policy-remove /usr/share/cli-common/
Modified: cli-common/trunk/dh_cligacpolicy
===================================================================
--- cli-common/trunk/dh_cligacpolicy 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/dh_cligacpolicy 2008-01-01 19:55:33 UTC (rev 3568)
@@ -81,6 +81,16 @@
# Set up debhelper
init();
+{
+ local $/="";
+ open(FILE, 'debian/control');
+ my @filedata = <FILE>;
+ close(FILE);
+ if (!($filedata[0] =~ /Build-Depends(-Indep)?: .*cli-common-dev \(>= 0\.5\.4\)/)) {
+ warning("Warning! No Build-Depends(-Indep) on cli-common-dev (>= 0.5.4)!");
+ }
+}
+
# Go through each of the packages being built
my $errors = 0;
Modified: cli-common/trunk/gac-package-install
===================================================================
--- cli-common/trunk/gac-package-install 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/gac-package-install 2008-01-01 19:55:33 UTC (rev 3568)
@@ -60,7 +60,7 @@
if (! -f $dll)
{
- print STDERR "! Assembly $dll does not exist, ignoring\n";
+ print STDERR "! Assembly $dll does not exist\n";
exit 3;
}
Modified: cli-common/trunk/policy-install
===================================================================
--- cli-common/trunk/policy-install 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/policy-install 2008-01-01 19:55:33 UTC (rev 3568)
@@ -13,8 +13,7 @@
# Remove the old policy, if we have one installed
if [ -f /usr/share/cli-common/packages.d/$POLICY.installcligac ]; then
- /usr/share/cli-common/gac-package-remove $POLICY > /dev/null
- rm -f /usr/share/cli-common/packages.d/$POLICY.installcligac
+ /usr/share/cli-common/policy-remove $ASSEMBLY $VERSION > /dev/null
fi
# Choose the correct one
Copied: cli-common/trunk/policy-remove (from rev 3527, cli-common/trunk/policy-install)
===================================================================
--- cli-common/trunk/policy-remove (rev 0)
+++ cli-common/trunk/policy-remove 2008-01-01 19:55:33 UTC (rev 3568)
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+# This file is actually used to remove entries from a policy.
+
+# Variables
+ASSEMBLY=$1
+VERSION=$2
+COMBINED="$VERSION.$ASSEMBLY"
+POLICY="policy.$VERSION.$ASSEMBLY"
+
+#echo "Removing GAC policy file ($POLICY) from available GACs"
+/usr/share/cli-common/gac-package-remove $POLICY > /dev/null
+rm /usr/share/cli-common/packages.d/$POLICY.installcligac
Modified: cli-common/trunk/postinst-cligacpolicy
===================================================================
--- cli-common/trunk/postinst-cligacpolicy 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/postinst-cligacpolicy 2008-01-01 19:55:33 UTC (rev 3568)
@@ -1,4 +1,3 @@
-if [ "$1" = "configure" ] && [ -x /usr/share/cli-common/policy-install ]
-then
+if [ "$1" = "configure" ] && [ -x /usr/share/cli-common/policy-install ]; then
/usr/share/cli-common/policy-install #ASSEMBLY# #VERSION#
fi
Modified: cli-common/trunk/postrm-cligacpolicy
===================================================================
--- cli-common/trunk/postrm-cligacpolicy 2007-12-27 21:31:10 UTC (rev 3567)
+++ cli-common/trunk/postrm-cligacpolicy 2008-01-01 19:55:33 UTC (rev 3568)
@@ -1,3 +1,3 @@
-if [ -x /usr/share/cli-common/policy-install ] ; then
- /usr/share/cli-common/policy-install #ASSEMBLY# #VERSION#
+if [ -x /usr/share/cli-common/policy-remove ]; then
+ /usr/share/cli-common/policy-remove #ASSEMBLY# #VERSION#
fi
More information about the Pkg-mono-svn-commits
mailing list