[Gsrc-commit] /srv/bzr/gsrc/trunk r1236: clean up sqltutor and fix build

[Brandon Invergo]

------------------------------------------------------------
revno: 1236
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-21 13:22:19 +0100
message:
  clean up sqltutor and fix build
added:
  gnu/sqltutor/config.mk
  gnu/sqltutor/files/
  gnu/sqltutor/files/sqltutor-0.6-fix-build.diff
modified:
  gnu/sqltutor/Makefile
  gnu/sqltutor/sha256sums

=== modified file 'gnu/sqltutor/Makefile'
--- a/gnu/sqltutor/Makefile     2010-06-10 20:16:29 +0000
+++ b/gnu/sqltutor/Makefile     2012-11-21 12:22:19 +0000
@@ -1,16 +1,20 @@
 GARNAME = sqltutor
 GARVERSION = 0.6
+HOME_URL = http://www.gnu.org/software/sqltutor/
+DESCRIPTION = A web-based SQL tutorial
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = sqltutor/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/sqltutor/
-DESCRIPTION = SQLtutor
+PATCHFILES = $(DISTNAME)-fix-build.diff
+
+BUILDDEPS = 
+LIBDEPS = 
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk

=== added file 'gnu/sqltutor/config.mk'
--- a/gnu/sqltutor/config.mk    1970-01-01 00:00:00 +0000
+++ b/gnu/sqltutor/config.mk    2012-11-21 12:22:19 +0000
@@ -0,0 +1,4 @@
+## Configuration options for sqltutor ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/sqltutor/files'
=== added file 'gnu/sqltutor/files/sqltutor-0.6-fix-build.diff'
--- a/gnu/sqltutor/files/sqltutor-0.6-fix-build.diff    1970-01-01 00:00:00 
+0000
+++ b/gnu/sqltutor/files/sqltutor-0.6-fix-build.diff    2012-11-21 12:22:19 
+0000
@@ -0,0 +1,36 @@
+diff -x config.log -x config.status -ru 
work/sqltutor-0.6/cgi.cpp/check_answer.cpp 
work/sqltutor-0.6/cgi.cpp/check_answer.cpp
+--- work/sqltutor-0.6/cgi.cpp/check_answer.cpp 2009-04-01 20:12:56.000000000 
+0200
++++ work/sqltutor-0.6/cgi.cpp/check_answer.cpp 2012-11-21 13:07:42.135517470 
+0100
+@@ -123,7 +123,7 @@
+ 
+   std::vector<pqxx::oid> column_type_user (sql_result_columns);
+   std::vector<pqxx::oid> column_type_tutor(sql_result_columns);
+-  for (size_t i=0; i<sql_result_columns; i++)
++  for (pqxx::tuple::size_type i=0; i<sql_result_columns; i++)
+     {
+       column_type_user [i] = colt( user_result  .column_type(i) );
+       column_type_tutor[i] = colt( answer_result.column_type(i) );
+diff -x config.log -x config.status -ru 
work/sqltutor-0.6/cgi.cpp/show_sql_result.cpp 
work/sqltutor-0.6/cgi.cpp/show_sql_result.cpp
+--- work/sqltutor-0.6/cgi.cpp/show_sql_result.cpp      2009-04-01 
20:12:57.000000000 +0200
++++ work/sqltutor-0.6/cgi.cpp/show_sql_result.cpp      2012-11-21 
13:08:36.065528156 +0100
+@@ -59,7 +59,7 @@
+           break;
+         }
+       form << "<tr>";
+-      for (size_t c=0; c<columns; c++)
++      for (pqxx::tuple::size_type c=0; c<columns; c++)
+         {
+           form << "<td> &nbsp; " << b[c].as(std::string()) << " &nbsp; </td>";
+         }
+diff -x config.log -x config.status -ru 
work/sqltutor-0.6/cgi.cpp/show_table_data.cpp 
work/sqltutor-0.6/cgi.cpp/show_table_data.cpp
+--- work/sqltutor-0.6/cgi.cpp/show_table_data.cpp      2009-04-01 
20:12:57.000000000 +0200
++++ work/sqltutor-0.6/cgi.cpp/show_table_data.cpp      2012-11-21 
13:09:11.618868879 +0100
+@@ -71,7 +71,7 @@
+         for (result::const_iterator d=data.begin(), e=data.end(); d!=e; d++)
+           {
+             form << "<tr>";
+-            for (size_t i=0; i<columns; i++)
++            for (pqxx::tuple::size_type i=0; i<columns; i++)
+               {
+                 form << "<td>" << d[i].as(string()) << "</td>";
+               }

=== modified file 'gnu/sqltutor/sha256sums'
--- a/gnu/sqltutor/sha256sums   2010-06-11 09:39:08 +0000
+++ b/gnu/sqltutor/sha256sums   2012-11-21 12:22:19 +0000
@@ -1,2 +1,3 @@
 af8931dab89706b57df9227bf17e22c6f17cd3ba326237f210c956313579f930  
download/sqltutor-0.6.tar.gz
+6995682758a066f7d094704cd913878a495654632b8d80a5b6c5dd7ad0218d42  
download/sqltutor-0.6-fix-build.diff
 e266f3dab5c11f22d8e41dcb471c878f6846febdc9eff0e826634dd0474e91d4  
download/sqltutor-0.6.tar.gz.sig