[SCM] Debian packaging for OpenSAML 2.0 branch, debian, updated. debian/2.0-1-5-g1bd71bd

[Ferenc Wagner]

The following commit has been merged in the debian branch:
commit 4311b8729c9e7d980f3fcfffb8a4cca64e4af55e
Author: Ferenc Wagner <wferi at niif.hu>
Date:   Thu May 15 00:07:11 2008 +0200

    Leave XML schemas at their original place, which conflicts with opensaml-schemas

diff --git a/debian/control b/debian/control
index f324569..1270d2b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: opensaml2
 Section: libs
-Priority: optional
+Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>
 Build-Depends: debhelper (>= 5), autotools-dev, liblog4cpp5-dev, libxerces27-dev | libxerces28-dev,
@@ -21,6 +21,7 @@ Description: Open source SAML library
 Package: opensaml2-schemas
 Section: text
 Architecture: any
+Conflicts: opensaml-schemas
 Description: OpenSAML development Headers
  OpenSAML is an open source implementation of the OASIS Security Assertion
  Markup Language Specification. It contains a set of open source C++ classes
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index e7b51ee..1e29d4d 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,7 +1,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkgxmldir = $(datadir)/xml/@PACKAGE at 2
+pkgxmldir = $(datadir)/xml/@PACKAGE@
 
 schemafiles = \
 	cs-sstc-schema-assertion-01.xsd \

-- 
Debian packaging for OpenSAML 2.0