Merge branch 'debian'

diff --git a/debian/changelog b/debian/changelog
index f2c4bba..55b60ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+opensaml2 (2.1-1) UNRELEASED; urgency=low
+
+  [ Russ Allbery ]
+  * New upstream bug-fix release.
+  * Bump SONAME of libsaml following upstream's versioning.  The names of
+    libsaml2-dev and libsaml2-doc have not changed; the "2" in those names
+    refers to the major version of the package, not to the SONAME of the
+    library.
+  
+  [ Ferenc Wagner ]
+  * Fix watch file for upstream directory structure.
+
+ -- Ferenc Wagner <wferi@niif.hu>  Fri, 22 Aug 2008 15:06:19 +0200
+
 opensaml2 (2.0-1) unstable; urgency=low
 
   [ Ferenc Wagner ]

diff --git a/debian/control b/debian/control
index f711fb9..5570ffb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: https://spaces.internet2.edu/display/OpenSAML/Home
 Vcs-Git: git://git.debian.org/git/pkg-shibboleth/opensaml2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-shibboleth/opensaml2.git
 
-Package: libsaml2
+Package: libsaml3
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

diff --git a/debian/copyright b/debian/copyright
index 145f60e..7d0f951 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,10 +3,10 @@ Upstream-Author: Internet2
 Packaged-By: Ferenc Wágner <wferi@niif.hu>
 Packaged-Date: Mon, 28 Apr 2008 14:55:31 +0200
 Original-Source-Location:
- http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.0/
+ http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.1/
 
 Files: *
-Copyright: 2001-2007 Internet2
+Copyright: 2001-2008 Internet2
 License: Apache-2.0
 
 Files: acx_pthread.m4

diff --git a/debian/libsaml2.install b/debian/libsaml3.install
similarity index 100%
rename from debian/libsaml2.install
rename to debian/libsaml3.install

diff --git a/debian/watch b/debian/watch
index 93338d2..9320437 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.0/opensaml-(.*)\.tar\.gz
+http://shibboleth.internet2.edu/downloads/opensaml/cpp/latest/opensaml-(.*)\.tar\.gz