[Pkg-freeipa-devel] pki: Changes to 'ubuntu'

[Timo Aaltonen]

 debian/changelog |    2 +-
 debian/control   |   12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 0c6af31a6583e133fd09cd6a75a3da8517586885
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Mar 19 15:24:35 2012 +0200

    bump the version for ppa

diff --git a/debian/changelog b/debian/changelog
index 5ed9131..cfeea16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pki (9.0+git20120312-0ubuntu0.1) precise; urgency=low
+pki (9.0+git20120312-0ubuntu0.2) precise; urgency=low
 
   * Merge from Debian git.
 

commit e44e6595f2f39ae857404895eb05846b3861eea0
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Mar 19 15:24:14 2012 +0200

    change the maintainer address

diff --git a/debian/control b/debian/control
index 2e5107c..4602fde 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pki
 Section: java
 Priority: extra
-Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu FreeIPA <freeipa at lists.launchpad.net>
+XSBC-Original-Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0), pkg-config, quilt,
  cmake,

commit a568361a0365828793445ece68f0fb5a893dfc09
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Mar 19 15:20:24 2012 +0200

    pki-common and pki-ca should prefer the dogtag theme packages

diff --git a/debian/control b/debian/control
index c756665..2e5107c 100644
--- a/debian/control
+++ b/debian/control
@@ -164,7 +164,7 @@ Architecture: all
 Depends: ${java:Depends}, ${misc:Depends},
  libpki-common-java (= ${binary:Version}),
  libpki-symkey-java (>= ${binary:Version}),
- pki-common-theme,
+ dogtag-pki-common-theme | pki-common-theme,
  pki-java-tools (= ${binary:Version}),
  pki-setup (= ${binary:Version}),
  libcommons-codec-java,
@@ -228,7 +228,7 @@ Package: pki-ca
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends},
  libpki-ca-java (= ${binary:Version}),
- pki-ca-theme,
+ dogtag-pki-ca-theme | pki-ca-theme,
  pki-common,
 # pki-selinux,
 Description: Certificate System - Certificate Authority

commit de5b81229d6fa8e5202e35c3774de24d43065e1a
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Sun Mar 18 10:14:33 2012 +0200

    update the maintainer address and repo location

diff --git a/debian/control b/debian/control
index b4b0eef..c756665 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pki
 Section: java
 Priority: extra
-Maintainer: Timo Aaltonen <tjaalton at ubuntu.com>
+Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
+Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends: debhelper (>= 8.0.0), pkg-config, quilt,
  cmake,
  javahelper,
@@ -25,8 +26,8 @@ Build-Depends: debhelper (>= 8.0.0), pkg-config, quilt,
  apache2-threaded-dev,
 Standards-Version: 3.9.3
 Homepage: http://pki.fedoraproject.org
-Vcs-Git: git://git.debian.org/collab-maint/pki-core.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/pki-core.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-freeipa/pki-core.git
+Vcs-Browser: http://git.debian.org/?p=pkg-freeipa/pki-core.git;a=summary
 
 Package: dogtag-pki
 Architecture: all