Bug#707903: RFS: drgeo/1.1.0-10.3 [NMU, RC]

2017-04-21 Thread Patrick Hetu 

drgeo is not in jessie and won't be in stretch, so there is no need to
hurry with patching this upstream version from 2005.

https://git.gnome.org/browse/archive/drgeo/log/
This looks very dead.

#736535 mentions an active fork (that seems to be quite different).


Yes, it use the pharo framework (smalltalk) now but it's released as
a vm snapshot so harder to package...


What drgeo needs is an active maintainer who packages code that is
also maintained upstream.

Trying to revive 2005 code after it has already missed two Debian
releases doesn't make much sense.


Indeed, this package fill the gap while we are waiting for the newer 
version to be packaged.



do you really need to patch:
Makefile.in.in


I'm afraid so, otherwise intltoolize gives an error.


and add a new config.rpath file?


No indeed, I added gettext as a dependency and I'm copy the file before 
the build instead.



also, please drop the last part of the patch:
@@ -443,4 +443,4 @@

;(new-figure "Ma figure")
;(define a (Numeric "a" 'free 0 0 1))
-;(define p (Point "o" 'intersection a a))
\ Pas de fin de ligne à la fin du fichier
+;(define p (Point "o" 'intersection a a))


Done.

The new version is here:

 
https://mentors.debian.net/debian/pool/main/d/drgeo/drgeo_1.1.0-10.3.dsc


Patrick

Bug#860496: RFS: drgeo/1.1.0-10.3 [NMU, RC]

2017-04-18 Thread Patrick Hetu 

On Mon, Apr 17, 2017 at 05:59:11PM -0400, Patrick Hetu wrote:
>   * Fixed compatibility with Guile 2.0. (Closes: #707903)


Thank you for your work to fix this bug.

What is the source of the patch you have added?


I did the patch myself.


Also, your changelog needs to be much more detailed.  You should list
each change to the debian/ directory on its own line.  For example, 
the

changes to d/rules and d/control.

Further, since this is an NMU and now a QA upload, it is inappropriate
to bump the standards version.  You should limit your changes to those
necessary to fix the RC bug.


Ok, I think I fixed those issues, can you take new a look at:

 
https://mentors.debian.net/debian/pool/main/d/drgeo/drgeo_1.1.0-10.3.dsc


thanks,

Patrick

Bug#860496: RFS: drgeo/1.1.0-10.3 [NMU, RC]

2017-04-17 Thread Patrick Hetu 

Package: sponsorship-requests
Severity: important

Dear mentors,

 I am looking for a sponsor for my package "drgeo"

* Package name: drgeo
  Version : 1.1.0-10.3
  Upstream Author : https://mentors.debian.net/package/drgeo
* URL : http://directory.fsf.org/wiki/Dr._geo
* License : GPLv2 or later
  Section : math

 It builds this binary packages:

   drgeo - interactive geometry software

 To access further information about this package, please visit the 
following URL:


 https://mentors.debian.net/package/drgeo


 Alternatively, one can download the package with dget using this 
command:


   dget -x 
https://mentors.debian.net/debian/pool/main/d/drgeo/drgeo_1.1.0-10.3.dsc


 Changes since the last upload:

 * Fixed compatibility with Guile 2.0. (Closes: #707903)

--
Sincerely,
Patrick Hetu

Bug#707903: drgeo: Migrate to guile-2.0?

2017-04-16 Thread Patrick Hetu 

user debian-rele...@lists.debian.org
usertags  bsp-2017-04-ca-montreal
thanks

Hi all,

I was sad too to not have drgeo in Debian Edu so I've made this patch 
to make it compatible with Guile 2.0 and 2.2.
It needs to run autoreconf so I added dh_autoreconf to the build phase 
in the rules file.

Also I've deactivated undo/redo  because it was segfaulting.

If it works for you, I'll do a nmu and try to get a sponsor for it.

Regards,

Patrick
Seulement dans ../drgeo-1.1.0/: compile
Seulement dans ../drgeo-1.1.0/: config.rpath
diff -ur drgeo-1.1.0/configure.ac ../drgeo-1.1.0/configure.ac
--- drgeo-1.1.0/configure.ac	2005-07-17 17:24:30.0 -0400
+++ ../drgeo-1.1.0/configure.ac	2017-04-14 15:05:35.773811254 -0400
@@ -4,7 +4,7 @@
 
 AC_PROG_INTLTOOL
 
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
@@ -31,14 +31,10 @@
 PKG_CHECK_MODULES(DRGEO,gtk+-2.0 libglade-2.0 libxml-2.0)
 AC_SUBST(DRGEO_CFLAGS)
 AC_SUBST(DRGEO_LIBS)
+GUILE_PKG([2.2 2.0])
 GUILE_PROGS
-
-dnl **
-dnl * 	DEFINE EXTRA 
-dnl **
-
 GUILE_FLAGS
-
+GUILE_SITE_DIR
 
 dnl **
 dnl *	CREATE OUTPUT VARIABLE 		 *
diff -ur drgeo-1.1.0/debian/rules ../drgeo-1.1.0/debian/rules
--- drgeo-1.1.0/debian/rules	2014-09-07 14:03:04.0 -0400
+++ ../drgeo-1.1.0/debian/rules	2017-04-16 08:29:14.625061078 -0400
@@ -25,6 +25,7 @@
 build-stamp:
 	dh_testdir
 	cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
+	dh_autoreconf
 	CFLAGS="${EXTRACFLAGS}" ./configure --prefix=/usr
 	$(MAKE)
 	touch build-stamp
@@ -33,6 +34,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp config.guess config.sub
+	dh_autoreconf_clean
 	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
diff -ur drgeo-1.1.0/drgenius_config.cc ../drgeo-1.1.0/drgenius_config.cc
--- drgeo-1.1.0/drgenius_config.cc	2003-11-24 16:24:11.0 -0500
+++ ../drgeo-1.1.0/drgenius_config.cc	2017-04-15 18:35:02.381072441 -0400
@@ -46,7 +46,7 @@
   scm = g_strconcat ("(set! ",conf, " (drgeoConfigSet '",
 		 attr, " \"", value, "\" ", conf, "))",
 		 NULL);
-  gh_eval_str (scm);
+  scm_c_eval_string (scm);
   g_free (scm);
 
 }
@@ -77,10 +77,10 @@
   scm = g_strconcat ("(drgeoConfigGet '",
 		 attr, "  userConf)",
 		 NULL);
-  ret = gh_eval_str (scm);
+  ret = scm_c_eval_string (scm);
   g_free (scm);
   g_free(value);
-  value = gh_scm2newstr (ret, NULL);
+  value = scm_to_locale_string (ret);
   return value;
 }
 
@@ -195,7 +195,7 @@
 		   "/preferences.scm\" \"", filename, "\"))", NULL);
 
   
-  gh_eval_str (scm);
+  scm_c_eval_string (scm);
   g_free (scm);
 
   g_free (filename);
@@ -212,7 +212,7 @@
   
   scm = g_strconcat ("(drgeoConfigSave \"", filename, "\" userConf)", NULL);
 
-  gh_eval_str (scm);
+  scm_c_eval_string (scm);
   g_free (scm);
   g_free (filename);
 }
@@ -223,7 +223,7 @@
   GtkWidget *w;
 
   /* First set a copy of the user preferences */
-  gh_eval_str ("(define dialogConf userConf)");
+  scm_c_eval_string ("(define dialogConf userConf)");
   
 
   /***/
@@ -403,7 +403,7 @@
 {
   GtkWidget *w;
 
-  gh_eval_str ("(define userConf dialogConf)");
+  scm_c_eval_string ("(define userConf dialogConf)");
 
   cachePreferedValue ();
 
diff -ur drgeo-1.1.0/drgenius_config.h ../drgeo-1.1.0/drgenius_config.h
--- drgeo-1.1.0/drgenius_config.h	2004-04-29 16:05:20.0 -0400
+++ ../drgeo-1.1.0/drgenius_config.h	2017-04-14 14:47:16.363178919 -0400
@@ -25,7 +25,7 @@
 #ifndef DRGENIUS_CONFIG_H
 #define DRGENIUS_CONFIG_H
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff -ur drgeo-1.1.0/drgenius_main.cc ../drgeo-1.1.0/drgenius_main.cc
--- drgeo-1.1.0/drgenius_main.cc	2004-04-09 16:00:04.0 -0400
+++ ../drgeo-1.1.0/drgenius_main.cc	2017-04-15 18:24:18.000604742 -0400
@@ -25,7 +25,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -60,7 +60,7 @@
 
 
 void
-main_prog (int argc, char *argv[])
+main_prog (void *data, int argc, char *argv[])
 {
   int arg;
 
@@ -84,62 +84,62 @@
   loadUserPreferences ();
 
   /* declare drgeo API in guile */
-  gh_new_procedure ("move", (SCM (*) ()) drgeo_scm_move, 2, 0, 0);
-  gh_new_procedure ("getAbscissa", (SCM (*) ()) drgeo_scm_getAbscissa, 1, 0, 0);
-  gh_new_procedure ("setAbscissa", (SCM (*) ()) drgeo_scm_setAbscissa, 2, 0, 0);
-  gh_new_procedure ("getCoordinates", (SCM (*) ()) drgeo_scm_getCoordinates, 1, 0, 0);
-  gh_new_procedure ("setCoordinates", (SCM (*) ()) drgeo_scm_setCoordinates, 2, 0, 0);
-  gh_new_procedure ("getUnit", (SCM (*) ()) drgeo_scm_getUnit, 1, 0, 0);
-  gh_new_procedure ("getNormal", (SCM (*) ()) drgeo_scm_getNormal, 1, 0, 0);
-  gh_new_procedure ("getSlope", (SCM (*) ()) drgeo_scm_getSlope, 1, 0, 0);
-  gh_new_procedure ("getNorm", (SCM (*) ())