← Back to branch summary

~ubuntu-branches/ubuntu/lucid/virtuoso-opensource/lucid

« back to all changes in this revision

Viewing changes to debian/patches/rpmlint-fixes.diff

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-02-05 01:22:09 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100205012209-h2dhz20vxpx55oam
Tags: 6.1.0-0ubuntu1
* New upstream release
* Sync with Debian packaging from Git
 - Add no_do_os_calls.diff patch, don't allow do_os_calls
 - Install to /usr/lib/virtuoso instead of /usr/bin, not a user
   binary
 - virtuoso-t installed to /usr/lib/virtuoso/
* Update build-gmake-to-make.patch
* Add package virtuoso-nepomuk to install only the files needed by nepomuk
* Remove virtuoso-nepomuk files from virtuoso-opensource-6.0-bin and libvirtodbc0
* Add virtuoso-opensource-6.0-bin.links to link to virtuoso-t from /usr/bin
* libvirtodbc0 and virtuoso-opensource-6.0-bin depends on virtuoso-nepomuk
* Remove build-dep on libwbxml2-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/rpmlint-fixes.diff
1
 
--- libsrc/Wi/sqlovdb.c.sav       2009-10-09 21:20:49.000000000 +0200
2
 
+++ libsrc/Wi/sqlovdb.c   2009-10-09 21:22:07.000000000 +0200
3
 
@@ -104,7 +104,7 @@
4
 
   return loc;
5
 
 }
6
 
 
7
 
-#define NO_VDB GPF_T1 ("This build does not include virtual database support.")
8
 
+#define NO_VDB do { GPF_T1 ("This build does not include virtual database support."); abort(); } while(0)
9
 
 
10
 
 void
11
 
 sqlo_table_new_locus (sqlo_t * so, df_elt_t * tb_dfe, remote_ds_t * rds, dk_set_t col_preds, dk_set_t * after_test, dk_set_t after_join_test, dk_set_t * vdb_join_test)
12
 
 
13
 
--- libsrc/Wi/http_client.c.sav 2009-10-10 21:26:33.000000000 +0200
14
 
+++ libsrc/Wi/http_client.c     2009-10-10 21:38:06.000000000 +0200
15
 
@@ -411,7 +411,7 @@
16
 
   socksreq[8] = 0; /* no name */
17
 
   if (name)
18
 
     {
19
 
-      strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8);
20
 
+      strncat ((char*)socksreq + 8, name, sizeof(socksreq) - 8 - strlen(name) - 1);
21
 
       socksreq[sizeof (socksreq) - 1] = 0;
22
 
       packetsize = 9 + strlen ((char *) socksreq + 8);
23
 
     }