Merge lp:~logan/ubuntu/raring/swi-prolog/debian-merge into lp:ubuntu/raring/swi-prolog

[Logan Rosen]

[Daniel Holbach (dholbach)]

Good work! :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-08 16:51:24 +0000
+++ debian/changelog	2012-12-19 07:25:26 +0000
@@ -1,3 +1,27 @@
+swi-prolog (5.10.4-4ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Transition package to use default java implementation:
+      + debian/control: BD on default-jdk instead of openjdk-6-jdk, switch
+        primary runtime dependency to default-jre-headless.
+      + debian/patches/java-compat.patch: Set source/target = 1.5 to ensure
+        that backwards compatible bytecode is built.
+  * Dropped changes:
+    - Add Pre-Depends on dpkg (>= 1.15.6) for xz debs; this diff was only
+      needed until after the 12.04 LTS.
+
+ -- Logan Rosen <[e-mail]>  Wed, 19 Dec 2012 00:28:22 -0500
+
+swi-prolog (5.10.4-4) unstable; urgency=medium
+
+  * Build-conflict with libncursesw5-dev, so it will not be used during build
+    instead of lincurses5-dev. This should make dependencies of swi-prolog-nox
+    consistent across architectures (closes: #689583)
+  * debian/gbp.conf - change debian-branch to wheezy-updates
+  * Urgency medium because of fix for an RC bug
+
+ -- Євгеній Мещеряков <[e-mail]>  Mon, 08 Oct 2012 21:54:54 +0200
+
 swi-prolog (5.10.4-3ubuntu2) quantal; urgency=low
 
   * Transition package to use default java implementation:

=== modified file 'debian/control'
--- debian/control	2012-08-08 16:51:24 +0000
+++ debian/control	2012-12-19 07:25:26 +0000
@@ -4,6 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Євгеній Мещеряков <[e-mail]>
 Build-Depends: debhelper (>= 5), autoconf, autotools-dev, libncurses5-dev, libreadline-dev, libgmp-dev, libjpeg-dev, libx11-dev, libxpm-dev, libxt-dev, x11proto-core-dev, chrpath, unixodbc-dev, default-jdk [alpha amd64 armel i386 ia64 mips mipsel powerpc s390 sparc], libxft-dev, libxext-dev, libice-dev, libxinerama-dev
+Build-Conflicts: libncursesw5-dev
 Standards-Version: 3.9.2
 XS-Debian-Vcs-Git: git://anonscm.debian.org/collab-maint/swi-prolog.git
 XS-Debian-Vcs-Browser: http://anonscm.debian.org/git/collab-maint/swi-prolog.git
@@ -11,7 +12,6 @@
 
 Package: swi-prolog
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.6)
 Depends: ${misc:Depends}, swi-prolog-nox (= ${binary:Version}), swi-prolog-x (= ${binary:Version})
 Suggests: swi-prolog-doc, prolog-el
 Description: ISO/Edinburgh-style Prolog interpreter
@@ -31,7 +31,6 @@
 
 Package: swi-prolog-nox
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.6)
 Depends: ${shlibs:Depends}, ${misc:Depends}, libgmp3-dev, libreadline-dev, libncurses5-dev
 Replaces: swi-prolog-clib, swi-prolog-http, swi-prolog-semweb, swi-prolog-sgml, swi-prolog-table
 Breaks: swi-prolog (<< 5.8.2-1)
@@ -55,7 +54,6 @@
 
 Package: swi-prolog-x
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.6)
 Depends: ${shlibs:Depends}, swi-prolog-nox (= ${binary:Version}), ${misc:Depends}
 Replaces: swi-prolog-xpce
 Description: User interface library for SWI-Prolog (with X support)
@@ -79,7 +77,6 @@
 
 Package: swi-prolog-java
 Architecture: alpha amd64 armel i386 ia64 mips mipsel powerpc s390 sparc
-Pre-Depends: dpkg (>= 1.15.6)
 Depends: ${shlibs:Depends}, swi-prolog-nox (= ${binary:Version}), ${misc:Depends}, default-jre-headless | java2-runtime
 Description: Bidirectional interface between SWI-Prolog and Java
  SWI-Prolog is a fast and powerful ISO/Edinburgh-style Prolog compiler with a
@@ -101,7 +98,6 @@
 
 Package: swi-prolog-odbc
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.6)
 Depends: ${shlibs:Depends}, swi-prolog-nox (= ${binary:Version}), ${misc:Depends}
 Description: ODBC library for SWI-Prolog
  SWI-Prolog is a fast and powerful ISO/Edinburgh-style Prolog compiler with a

=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2011-12-15 23:44:28 +0000
+++ debian/gbp.conf	2012-12-19 07:25:26 +0000
@@ -4,7 +4,7 @@
 # the default branch for upstream sources:
 upstream-branch = upstream
 # the default branch for the debian patch:
-debian-branch = master
+debian-branch = wheezy-updates
 # the default tag formats used:
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s