[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.4+dfsg1-7-28-ga5e772b

Maximiliano Curia maxy at gnuservers.com.ar
Sat Jul 20 11:05:36 UTC 2013


The following commit has been merged in the master branch:
commit e2cb216cbf11b99983468ddbd6b41bef73feaabf
Merge: 3bca242aed8f37cc178e185f31a66d7224944037 c7d72863c30f957cd9438aa7ab6ff7902c790c19
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Jul 20 13:00:48 2013 +0200

    Merge with 6.1.4+dfsg1-7.
    
    6.1.4+dfsg1-7 unstable; urgency=low
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/series

diff --combined debian/changelog
index aa4c795,73d3127..9579e96
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,40 +1,79 @@@
 +virtuoso-opensource (6.1.6+dfsg-3) UNRELEASED; urgency=low
 +
 +  * Remove mono package for armhf.
 +  * Update path: do_not_depend_on_MAXPATHLEN.patch.
++  * Merge with 6.1.4+dfsg1-7.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 12 Jun 2013 10:11:31 +0200
 +
 +virtuoso-opensource (6.1.6+dfsg-2) experimental; urgency=low
 +
 +  * New patch: do_not_depend_on_MAXPATHLEN.patch.
 +  * Add _GNU_SOURCE definition.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Mon, 10 Jun 2013 15:50:21 +0200
 +
 +virtuoso-opensource (6.1.6+dfsg-1) experimental; urgency=low
 +
 +  [ José Manuel Santamaría Lema ]
 +  * New upstream release.
 +  * Update patches:
 +    - remove portable-method-for-escaping-symbol-gawk.diff, applied upstream.
 +    - refresh other patches to make them apply without any offset.
 +
 +  [ Ralf Jung ]
 +  * Update VCS links
 +
 +  [ Maximiliano Curia ]
 +  * Update aclocal and automake versions.
 +  * Migrate to dh 9.
 +  * Update dirs files.
 +  * Update install files.
 +  * Update Pre-Depends for m-a.
 +  * New patch, disable-full-test-suite.patch.
 +  * New patch, check_log_fix.patch.
 +  * Use relative paths for the odbc drivers.
 +  * Update libvirtodbc0 debconf use.
 +
 + -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Thu, 06 Jun 2013 10:34:05 +0200
 +
+ virtuoso-opensource (6.1.4+dfsg1-7) unstable; urgency=low
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Add Sune and myself to Uploaders.
+ 
+   [ Ralf Jung ]
+   * init script: Use start-stop-daemon (Closes: 704521)
+   * init script: Do not use "set -e", that's incompatible with
+     lsb/init-scripts
+   * init script: Stop attemtping to restart when stopping failed
+   * Change maintainer to Debian Krap team
+   * Remove obsolete DM-Upload-Allowed
+ 
+  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Apr 2013 21:30:26 +0200
+ 
+ virtuoso-opensource (6.1.4+dfsg1-6) unstable; urgency=low
+ 
+   * Add safer-timeout.patch, avoids random FTBFS'es. These random FTBFS'es
+     depend on the time of the day and are more prone to happen on slow
+     architectures. (Closes: #699785)
+   * Remove build-short-timeout.patch, no longer needed because of
+     safer-timeout.patch.
+ 
+  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Mon, 25 Feb 2013 13:49:33 +0100
+ 
+ virtuoso-opensource (6.1.4+dfsg1-5) unstable; urgency=low
+ 
+   * Remove arm and armfh also from libvirtuoso5.5-cil list of architectures.
+ 
+  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 02 Feb 2013 17:15:43 +0100
+ 
+ virtuoso-opensource (6.1.4+dfsg1-4) unstable; urgency=low
+ 
+   * Update mono architectures: remove arm and armfh. (Closes: 695743)
+ 
+  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Fri, 01 Feb 2013 17:55:57 +0100
+ 
  virtuoso-opensource (6.1.4+dfsg1-3) unstable; urgency=low
  
    * The previous upload didn't actually fix the bug #677286: "unowned files
diff --combined debian/control
index 0e82191,107d1ca..bde5f68
--- a/debian/control
+++ b/debian/control
@@@ -2,18 -2,19 +2,20 @@@ Source: virtuoso-opensourc
  Section: database
  Priority: optional
  Maintainer: Debian Krap Maintainers <debian-qt-kde at lists.debian.org>
- Uploaders: Maximiliano Curia <maxy at debian.org>
+ Uploaders: Lisandro Damian Nicanor Pérez Meyer <lisandro at debian.org>,
 - Sune Vuorela <sune at debian.org>
 -Standards-Version: 3.9.3
++ Sune Vuorela <sune at debian.org>,
++ Maximiliano Curia <maxy at debian.org>
 +Standards-Version: 3.9.4
  Homepage: http://virtuoso.openlinksw.com/wiki/main/Main/
 -Vcs-Browser: https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=pkg-virtuoso/pkg-virtuoso.git
 -Vcs-Git: git://anonscm.alioth.debian.org/git/pkg-virtuoso/pkg-virtuoso.git
 -Build-Depends: cdbs, debhelper (>= 9), autotools-dev, autoconf (>=2.57),
 - automake (>=1.10), libtool (>=1.5.16), flex (>=2.5.4), bison (>=1.35),
 - gperf (>=2.7.2), gawk (>=3.1.1), m4 (>=1.4.1), make (>=3.79.1),
 - libssl-dev (>=0.9.7), libreadline-dev, zlib1g-dev, libxml2-dev, libpcre3-dev,
 - libldap2-dev, net-tools,
 - mono-devel (>= 2.4.3) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 armel sparc s390x ppc64],
 - cli-common-dev (>= 0.8~) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 armel sparc s390x ppc64],
 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-virtuoso/pkg-virtuoso.git
 +Vcs-Git: git://anonscm.debian.org/pkg-virtuoso/pkg-virtuoso.git
 +Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-kde-tools, autotools-dev,
 + autoconf (>= 2.57), automake (>= 1.10), libtool (>= 1.5.16), flex (>= 2.5.4),
 + bison (>= 1.35), gperf (>= 2.7.2), gawk (>= 3.1.1), m4 (>= 1.4.1),
 + make (>= 3.79.1), libssl-dev (>= 0.9.7), libreadline-dev, zlib1g-dev,
 + libxml2-dev, libpcre3-dev, libldap2-dev, net-tools,
 + mono-devel (>= 2.4.3) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armel sparc s390x ppc64],
 + cli-common-dev (>= 0.8~) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armel sparc s390x ppc64],
   docbook2x, po-debconf, libwbxml2-dev, libmagickwand-dev
  
  Package: virtuoso-opensource
@@@ -76,7 -77,7 +78,7 @@@ Description: high-performance database 
  
  Package: virtuoso-opensource-6.1
  Architecture: any
 -Pre-Depends: dpkg (>= 1.15.7.2~)
 +Pre-Depends: dpkg (>= 1.15.7.2~), ${misc:Pre-Depends}
  Depends: virtuoso-opensource-6.1-common (= ${binary:Version}),
   virtuoso-opensource-6.1-bin (= ${binary:Version}),
   libvirtodbc0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
@@@ -286,7 -287,6 +288,7 @@@ Description: high-performance database 
  # default configuration is available at http://localhost:8890/fct.
  
  Package: libvirtodbc0
 +Pre-Depends: ${misc:Pre-Depends}
  Depends: virtuoso-opensource-6.1-common (= ${binary:Version}),
   odbcinst, ${shlibs:Depends}, ${misc:Depends}
  Architecture: any
@@@ -301,7 -301,7 +303,7 @@@ Description: high-performance database 
  
  Package: libvirtuoso5.5-cil
  Section: cli-mono
 -Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 armel sparc s390x ppc64
 +Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armel sparc s390x ppc64
  Depends: ${cli:Depends}, ${misc:Depends}
  Description: high-performance database - Mono assemblies
   OpenLink Virtuoso is a high-performance object-relational SQL database.
diff --combined debian/patches/series
index 45c5a5d,d5e2094..0a1ebdf
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,7 +1,6 @@@
  use-debian-default-csharp-compiler.patch
  config-debian-paths.patch
  config-universal-variables.patch
- build-short-timeout.patch
  ftbfs-kfreebsd.patch
  repack-oat.patch
  repack-tutorial.patch
@@@ -10,6 -10,4 +9,7 @@@ repack-zlib.patc
  build-generated-code-multiple-outputs.patch
  build-gmake-to-make.patch
  ignore-netstat-failure.patch
 +disable-full-test-suite.patch
 +check_log_fix.patch
 +do_not_depend_on_MAXPATHLEN.patch
+ safer-timeout.patch

-- 
Git repository for pkg-virtuoso



More information about the Pkg-virtuoso-commits mailing list