[pkg-db-commits] [db-defaults] 08/14: Update from 5.3 to 6.0

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to annotated tag debian/1%5.3.21_exp1
in repository db-defaults.

commit be405495fea7f33b2a222b603616b14e11a0ba52
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 11 10:14:08 2013 +0200

    Update from 5.3 to 6.0
---
 debian/compat        |  2 +-
 debian/control       | 28 +++++++++++++--------------
 debian/db-util.links | 54 ++++++++++++++++++++++++++--------------------------
 debian/gbp.conf      |  4 ++--
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/debian/compat b/debian/compat
index c793025..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
\ No newline at end of file
+9
diff --git a/debian/control b/debian/control
index 656da27..ab59f70 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libdevel
 Priority: extra
 Maintainer: Debian Berkeley DB Group <pkg-db-devel at lists.alioth.debian.org>
 Uploaders: Ondřej Surý <ondrej at debian.org>
-Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9)
 Vcs-Browser: http://git.debian.org/?p=pkg-db/db-defaults.git
 Vcs-Git: git://git.debian.org/pkg-db/db-defaults.git
 
@@ -13,8 +13,8 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Priority: extra
-Depends: libdb5.3-dev, ${misc:Depends}
-Conflicts: libdb4.6-dev, libdb4.7-dev, libdb4.8-dev, libdb5.1-dev
+Depends: libdb6.0-dev, ${misc:Depends}
+Conflicts: libdb4.6-dev, libdb4.7-dev, libdb4.8-dev, libdb5.1-dev, libdb5.3-dev
 Description: Berkeley Database Libraries [development]
  This empty package depends on the recommended development package
  containing headers and static libraries for the Berkeley database
@@ -24,7 +24,7 @@ Package: db-util
 Architecture: all
 Section: utils
 Priority: extra
-Depends: db5.3-util, ${misc:Depends}
+Depends: db6.0-util, ${misc:Depends}
 Description: Berkeley Database Utilities
  This empty package depends on the recommended utilities package
  containing different tools for manipulating databases and installs
@@ -34,7 +34,7 @@ Package: db-upgrade-util
 Architecture: all
 Section: utils
 Priority: extra
-Depends: db4.7-util, db4.8-util, db5.1-util, ${misc:Depends}
+Depends: db5.1-util, ${misc:Depends}
 Description: Berkeley Database Utilities (old versions)
  This empty package depends on the old (from previous stable release)
  utilities package containing different tools for manipulating
@@ -52,8 +52,8 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Priority: extra
-Depends: libdb5.3++-dev, ${misc:Depends}
-Conflicts: libdb4.6++-dev, libdb4.7++-dev, libdb4.8++-dev, libdb5.1++-dev
+Depends: libdb6.0++-dev, ${misc:Depends}
+Conflicts: libdb4.6++-dev, libdb4.7++-dev, libdb4.8++-dev, libdb5.1++-dev, libdb5.3++-dev
 Description: Berkeley Database Libraries for C++ [development]
  This empty package depends on the recommended development package
  containing headers and static libraries for the Berkeley database
@@ -64,8 +64,8 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Priority: extra
-Depends: libdb5.3-sql-dev, ${misc:Depends}
-Conflicts: libdb5.1-sql-dev
+Depends: libdb6.0-sql-dev, ${misc:Depends}
+Conflicts: libdb5.1-sql-dev, libdb5.3-sql-dev
 Description: Berkeley Database Libraries [SQL development]
  This empty package depends on the recommended development package
  containing headers and static libraries for the Berkeley database
@@ -76,8 +76,8 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Priority: extra
-Depends: libdb5.3-java-dev, ${misc:Depends}
-Conflicts: libdb4.6-java-dev, libdb4.7-java-dev, libdb4.8-java-dev, libdb5.1-java-dev
+Depends: libdb6.0-java-dev, ${misc:Depends}
+Conflicts: libdb4.6-java-dev, libdb4.7-java-dev, libdb4.8-java-dev, libdb5.1-java-dev, libdb5.3-java-dev
 Description: Berkeley Database Libraries for Java [development]
  This empty package depends on the recommended package containing the
  Java interface for the Berkeley database library.
@@ -87,8 +87,8 @@ Architecture: all
 Multi-Arch: foreign
 Section: java
 Priority: extra
-Depends: libdb5.3-java, ${misc:Depends}
-Conflicts: libdb5.1-java
+Depends: libdb6.0-java, ${misc:Depends}
+Conflicts: libdb5.1-java, libdb5.3-java
 Description: Berkeley Database Libraries for Java
  This empty package depends on the recommended package containing the
  Java interface for the Berkeley database library.
diff --git a/debian/db-util.links b/debian/db-util.links
index 7bddc8d..0de17bf 100644
--- a/debian/db-util.links
+++ b/debian/db-util.links
@@ -1,27 +1,27 @@
-usr/bin/db5.3_archive usr/bin/db_archive
-usr/bin/db5.3_checkpoint usr/bin/db_checkpoint
-usr/bin/db5.3_deadlock usr/bin/db_deadlock
-usr/bin/db5.3_dump usr/bin/db_dump
-usr/bin/db5.3_hotbackup usr/bin/db_hotbackup
-usr/bin/db5.3_load usr/bin/db_load
-usr/bin/db5.3_log_verify usr/bin/db_log_verify
-usr/bin/db5.3_printlog usr/bin/db_printlog
-usr/bin/db5.3_recover usr/bin/db_recover
-usr/bin/db5.3_replicate usr/bin/db_replicate
-usr/bin/db5.3_sql usr/bin/db_sql
-usr/bin/db5.3_stat usr/bin/db_stat
-usr/bin/db5.3_upgrade usr/bin/db_upgrade
-usr/bin/db5.3_verify usr/bin/db_verify
-usr/share/man/man1/berkeley_db5.3_svc.1.gz usr/share/man/man1/berkeley_db_svc.1.gz
-usr/share/man/man1/db5.3_archive.1.gz usr/share/man/man1/db_archive.1.gz
-usr/share/man/man1/db5.3_checkpoint.1.gz usr/share/man/man1/db_checkpoint.1.gz
-usr/share/man/man1/db5.3_codegen.1.gz usr/share/man/man1/db_codegen.1.gz
-usr/share/man/man1/db5.3_deadlock.1.gz usr/share/man/man1/db_deadlock.1.gz
-usr/share/man/man1/db5.3_dump.1.gz usr/share/man/man1/db_dump.1.gz
-usr/share/man/man1/db5.3_hotbackup.1.gz usr/share/man/man1/db_hotbackup.1.gz
-usr/share/man/man1/db5.3_load.1.gz usr/share/man/man1/db_load.1.gz
-usr/share/man/man1/db5.3_printlog.1.gz usr/share/man/man1/db_printlog.1.gz
-usr/share/man/man1/db5.3_recover.1.gz usr/share/man/man1/db_recover.1.gz
-usr/share/man/man1/db5.3_stat.1.gz usr/share/man/man1/db_stat.1.gz
-usr/share/man/man1/db5.3_upgrade.1.gz usr/share/man/man1/db_upgrade.1.gz
-usr/share/man/man1/db5.3_verify.1.gz usr/share/man/man1/db_verify.1.gz
+usr/bin/db6.0_archive usr/bin/db_archive
+usr/bin/db6.0_checkpoint usr/bin/db_checkpoint
+usr/bin/db6.0_deadlock usr/bin/db_deadlock
+usr/bin/db6.0_dump usr/bin/db_dump
+usr/bin/db6.0_hotbackup usr/bin/db_hotbackup
+usr/bin/db6.0_load usr/bin/db_load
+usr/bin/db6.0_log_verify usr/bin/db_log_verify
+usr/bin/db6.0_printlog usr/bin/db_printlog
+usr/bin/db6.0_recover usr/bin/db_recover
+usr/bin/db6.0_replicate usr/bin/db_replicate
+usr/bin/db6.0_sql usr/bin/db_sql
+usr/bin/db6.0_stat usr/bin/db_stat
+usr/bin/db6.0_upgrade usr/bin/db_upgrade
+usr/bin/db6.0_verify usr/bin/db_verify
+usr/share/man/man1/berkeley_db6.0_svc.1.gz usr/share/man/man1/berkeley_db_svc.1.gz
+usr/share/man/man1/db6.0_archive.1.gz usr/share/man/man1/db_archive.1.gz
+usr/share/man/man1/db6.0_checkpoint.1.gz usr/share/man/man1/db_checkpoint.1.gz
+usr/share/man/man1/db6.0_codegen.1.gz usr/share/man/man1/db_codegen.1.gz
+usr/share/man/man1/db6.0_deadlock.1.gz usr/share/man/man1/db_deadlock.1.gz
+usr/share/man/man1/db6.0_dump.1.gz usr/share/man/man1/db_dump.1.gz
+usr/share/man/man1/db6.0_hotbackup.1.gz usr/share/man/man1/db_hotbackup.1.gz
+usr/share/man/man1/db6.0_load.1.gz usr/share/man/man1/db_load.1.gz
+usr/share/man/man1/db6.0_printlog.1.gz usr/share/man/man1/db_printlog.1.gz
+usr/share/man/man1/db6.0_recover.1.gz usr/share/man/man1/db_recover.1.gz
+usr/share/man/man1/db6.0_stat.1.gz usr/share/man/man1/db_stat.1.gz
+usr/share/man/man1/db6.0_upgrade.1.gz usr/share/man/man1/db_upgrade.1.gz
+usr/share/man/man1/db6.0_verify.1.gz usr/share/man/man1/db_verify.1.gz
diff --git a/debian/gbp.conf b/debian/gbp.conf
index ff66b31..251dc74 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
-debian-branch = debian-sid
+debian-branch = master
 debian-tag = debian/%(version)s
-upstream-branch = upstream-sid
+upstream-branch = upstream
 upstream-tag = upstream/%(version)s
 pristine-tar = False
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db-defaults.git