[med-svn] r21656 - in trunk/packages/logol/tags: . 1.7.2-3/debian 1.7.2-3/debian/patches
Olivier Sallou
osallou at moszumanska.debian.org
Tue Apr 5 12:46:31 UTC 2016
Author: osallou
Date: 2016-04-05 12:46:31 +0000 (Tue, 05 Apr 2016)
New Revision: 21656
Added:
trunk/packages/logol/tags/1.7.2-3/
trunk/packages/logol/tags/1.7.2-3/debian/changelog
trunk/packages/logol/tags/1.7.2-3/debian/patches/fix_antlr35
trunk/packages/logol/tags/1.7.2-3/debian/patches/series
Removed:
trunk/packages/logol/tags/1.7.2-3/debian/changelog
trunk/packages/logol/tags/1.7.2-3/debian/patches/series
Log:
[svn-buildpackage] Tagging logol 1.7.2-3
Deleted: trunk/packages/logol/tags/1.7.2-3/debian/changelog
===================================================================
--- trunk/packages/logol/trunk/debian/changelog 2016-04-04 19:10:00 UTC (rev 21650)
+++ trunk/packages/logol/tags/1.7.2-3/debian/changelog 2016-04-05 12:46:31 UTC (rev 21656)
@@ -1,169 +0,0 @@
-logol (1.7.2-3) UNRELEASED; urgency=medium
-
- * Team upload.
- * Depend on libmail-java instead of libgnumail-java
-
- -- Emmanuel Bourg <ebourg at apache.org> Fri, 31 Jul 2015 17:17:23 +0200
-
-logol (1.7.2-2) unstable; urgency=medium
-
- * d/patches/fix_swipl72: Fix swipl v7.x compatibility (Closes: #790136).
-
- -- Olivier Sallou <osallou at debian.org> Mon, 29 Jun 2015 11:59:23 +0200
-
-logol (1.7.2-1) unstable; urgency=medium
-
- * New upstream release
- d/control: use Standars 3.9.6
-
- -- Olivier Sallou <osallou at debian.org> Thu, 05 Feb 2015 15:32:25 +0100
-
-logol (1.7.0-2) unstable; urgency=medium
-
- * d/control,d/patches/remove_drmaa_support: Remove libdrmaa-java dependency
- due to gridengine removal from Jessie (#776131).
- d/series: remove drmaa patch
- d/README.Debian: explain non drmaa support of this release
-
- -- Olivier Sallou <osallou at debian.org> Sun, 01 Feb 2015 08:56:52 +0100
-
-logol (1.7.0-1.1) unstable; urgency=high
-
- * Non-maintainer upload.
- * No source changes, rebuild against swi-prolog 6.6.5
- * Urgency high to not hold migration of swi-prolog for much longer
-
- -- Євгеній Мещеряков <eugen at debian.org> Wed, 21 May 2014 21:26:00 +0200
-
-logol (1.7.0-1) unstable; urgency=low
-
- * New upstream release
-
- -- Olivier Sallou <osallou at debian.org> Sat, 08 Feb 2014 13:25:38 +0100
-
-logol (1.6.10-1) unstable; urgency=low
-
- * New upstream release, fix bug on Hamming error search
-
- -- Olivier Sallou <osallou at debian.org> Sat, 08 Feb 2014 13:17:17 +0100
-
-logol (1.6.9-3) unstable; urgency=low
-
- * d/control,d/patches: Remove rubygems dependency, thanks to
- Cédric Boutillier <boutil at debian.org> (Closes: #735579).
- * Upgrade to Standards 3.9.5.
-
- -- Olivier Sallou <osallou at debian.org> Fri, 17 Jan 2014 09:07:38 +0100
-
-logol (1.6.9-2) unstable; urgency=low
-
- * Fix prolog doc generation (Closes: #730916).
-
- -- Olivier Sallou <osallou at debian.org> Sun, 01 Dec 2013 11:55:42 +0100
-
-logol (1.6.9-1) unstable; urgency=low
-
- * New upstream release (bug fixes, add Windows support
- for Sicstus 4.2.x and Swi-prolog).
-
- -- Olivier Sallou <osallou at debian.org> Mon, 11 Nov 2013 10:11:17 +0100
-
-logol (1.6.6-1) unstable; urgency=low
-
- * New upstream releas (bug fixes on morphisms and doc).
-
- -- Olivier Sallou <osallou at debian.org> Wed, 30 Oct 2013 16:21:09 +0100
-
-logol (1.6.5-1) unstable; urgency=low
-
- * New upstream release (memory footprint optimisation in some cases).
-
- -- Olivier Sallou <osallou at debian.org> Fri, 25 Oct 2013 13:48:22 +0200
-
-logol (1.6.4-1) unstable; urgency=low
-
- * New upstream release fixing bugs
-
- -- Olivier Sallou <osallou at debian.org> Tue, 22 Oct 2013 08:35:45 +0200
-
-logol (1.6.3-1) unstable; urgency=low
-
- * New upstream release fixing important bugs on distance search
- * Remove patch for doc generation after swi-prolog fix
-
- -- Olivier Sallou <osallou at debian.org> Mon, 02 Sep 2013 08:54:46 +0200
-
-logol (1.6.2-3) unstable; urgency=low
-
- * Fix swi-prolog compilation (Closes: #719030).
-
- -- Olivier Sallou <osallou at debian.org> Thu, 08 Aug 2013 10:30:12 +0200
-
-logol (1.6.2-2) unstable; urgency=low
-
- [ Olivier Sallou ]
- * Remove deprecated DM-Upload field.
-
- [ Dmitrijs Ledkovs ]
- * Bump standards version to 3.9.4.
- * Remove empty postinst script.
- * Add dependancy on texlive-latex-extra, needed to fix documentation
- FTBFS with new TeX Live.
-
- -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com> Mon, 03 Jun 2013 23:36:49 +0100
-
-logol (1.6.2-1) unstable; urgency=low
-
- * New upstream release (bug fixes)
-
- -- Olivier Sallou <osallou at debian.org> Fri, 24 May 2013 14:37:24 +0200
-
-logol (1.6.1-1) unstable; urgency=low
-
- * New upstream release (bug fixes)
-
- -- Olivier Sallou <osallou at debian.org> Tue, 09 Apr 2013 16:57:33 +0200
-
-logol (1.6.0-1) unstable; urgency=low
-
- * New upstream release with bug fixes
-
- -- Olivier Sallou <osallou at debian.org> Fri, 15 Feb 2013 10:05:50 +0100
-
-logol (1.5.0-6) unstable; urgency=low
-
- [ Olivier Sallou ]
- * debian/control: Fix typo in description (Closes: #685079).
- Thanks to Erik Esterer <erik.esterer at gmail.com>
-
- -- Olivier Sallou <osallou at debian.org> Fri, 17 Aug 2012 08:00:58 +0200
-
-logol (1.5.0-5) unstable; urgency=low
-
- [ Olivier Sallou]
- * Transition package to use default java implementation:
- From james.page at ubuntu.com (Closes: #684158)
- - d/control: BD on default-jdk (>= 1:1.6), switch runtime dependency
- to default-jre | java6-runtime.
- - d/rules: Specify source/target = 1.5 to ensure backwards compatible
- bytecode is built.
-
- -- Olivier Sallou <osallou at debian.org> Tue, 07 Aug 2012 15:18:43 +0200
-
-logol (1.5.0-4) unstable; urgency=low
-
- * debian/postinst: remove directory permissions (Closes: #683647).
-
- -- Olivier Sallou <osallou at debian.org> Thu, 02 Aug 2012 17:09:31 +0200
-
-logol (1.5.0-2) unstable; urgency=low
-
- * Support Arch dependent and arch independent separate builds.
-
- -- Olivier Sallou <osallou at debian.org> Sun, 01 Jul 2012 23:49:16 +0200
-
-logol (1.5.0-1) unstable; urgency=low
-
- * Initial release (Closes: #678373).
-
- -- Olivier Sallou <osallou at debian.org> Thu, 21 Jun 2012 12:50:22 +0200
Copied: trunk/packages/logol/tags/1.7.2-3/debian/changelog (from rev 21655, trunk/packages/logol/trunk/debian/changelog)
===================================================================
--- trunk/packages/logol/tags/1.7.2-3/debian/changelog (rev 0)
+++ trunk/packages/logol/tags/1.7.2-3/debian/changelog 2016-04-05 12:46:31 UTC (rev 21656)
@@ -0,0 +1,172 @@
+logol (1.7.2-3) unstable; urgency=medium
+
+ * Team upload.
+ * Depend on libmail-java instead of libgnumail-java
+ [ Olivier Sallou ]
+ - Fix antlr 3.5 parser generation issue (relates to #820286)
+ Closes: #811185.
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 31 Jul 2015 17:17:23 +0200
+
+logol (1.7.2-2) unstable; urgency=medium
+
+ * d/patches/fix_swipl72: Fix swipl v7.x compatibility (Closes: #790136).
+
+ -- Olivier Sallou <osallou at debian.org> Mon, 29 Jun 2015 11:59:23 +0200
+
+logol (1.7.2-1) unstable; urgency=medium
+
+ * New upstream release
+ d/control: use Standars 3.9.6
+
+ -- Olivier Sallou <osallou at debian.org> Thu, 05 Feb 2015 15:32:25 +0100
+
+logol (1.7.0-2) unstable; urgency=medium
+
+ * d/control,d/patches/remove_drmaa_support: Remove libdrmaa-java dependency
+ due to gridengine removal from Jessie (#776131).
+ d/series: remove drmaa patch
+ d/README.Debian: explain non drmaa support of this release
+
+ -- Olivier Sallou <osallou at debian.org> Sun, 01 Feb 2015 08:56:52 +0100
+
+logol (1.7.0-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * No source changes, rebuild against swi-prolog 6.6.5
+ * Urgency high to not hold migration of swi-prolog for much longer
+
+ -- Євгеній Мещеряков <eugen at debian.org> Wed, 21 May 2014 21:26:00 +0200
+
+logol (1.7.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Olivier Sallou <osallou at debian.org> Sat, 08 Feb 2014 13:25:38 +0100
+
+logol (1.6.10-1) unstable; urgency=low
+
+ * New upstream release, fix bug on Hamming error search
+
+ -- Olivier Sallou <osallou at debian.org> Sat, 08 Feb 2014 13:17:17 +0100
+
+logol (1.6.9-3) unstable; urgency=low
+
+ * d/control,d/patches: Remove rubygems dependency, thanks to
+ Cédric Boutillier <boutil at debian.org> (Closes: #735579).
+ * Upgrade to Standards 3.9.5.
+
+ -- Olivier Sallou <osallou at debian.org> Fri, 17 Jan 2014 09:07:38 +0100
+
+logol (1.6.9-2) unstable; urgency=low
+
+ * Fix prolog doc generation (Closes: #730916).
+
+ -- Olivier Sallou <osallou at debian.org> Sun, 01 Dec 2013 11:55:42 +0100
+
+logol (1.6.9-1) unstable; urgency=low
+
+ * New upstream release (bug fixes, add Windows support
+ for Sicstus 4.2.x and Swi-prolog).
+
+ -- Olivier Sallou <osallou at debian.org> Mon, 11 Nov 2013 10:11:17 +0100
+
+logol (1.6.6-1) unstable; urgency=low
+
+ * New upstream releas (bug fixes on morphisms and doc).
+
+ -- Olivier Sallou <osallou at debian.org> Wed, 30 Oct 2013 16:21:09 +0100
+
+logol (1.6.5-1) unstable; urgency=low
+
+ * New upstream release (memory footprint optimisation in some cases).
+
+ -- Olivier Sallou <osallou at debian.org> Fri, 25 Oct 2013 13:48:22 +0200
+
+logol (1.6.4-1) unstable; urgency=low
+
+ * New upstream release fixing bugs
+
+ -- Olivier Sallou <osallou at debian.org> Tue, 22 Oct 2013 08:35:45 +0200
+
+logol (1.6.3-1) unstable; urgency=low
+
+ * New upstream release fixing important bugs on distance search
+ * Remove patch for doc generation after swi-prolog fix
+
+ -- Olivier Sallou <osallou at debian.org> Mon, 02 Sep 2013 08:54:46 +0200
+
+logol (1.6.2-3) unstable; urgency=low
+
+ * Fix swi-prolog compilation (Closes: #719030).
+
+ -- Olivier Sallou <osallou at debian.org> Thu, 08 Aug 2013 10:30:12 +0200
+
+logol (1.6.2-2) unstable; urgency=low
+
+ [ Olivier Sallou ]
+ * Remove deprecated DM-Upload field.
+
+ [ Dmitrijs Ledkovs ]
+ * Bump standards version to 3.9.4.
+ * Remove empty postinst script.
+ * Add dependancy on texlive-latex-extra, needed to fix documentation
+ FTBFS with new TeX Live.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com> Mon, 03 Jun 2013 23:36:49 +0100
+
+logol (1.6.2-1) unstable; urgency=low
+
+ * New upstream release (bug fixes)
+
+ -- Olivier Sallou <osallou at debian.org> Fri, 24 May 2013 14:37:24 +0200
+
+logol (1.6.1-1) unstable; urgency=low
+
+ * New upstream release (bug fixes)
+
+ -- Olivier Sallou <osallou at debian.org> Tue, 09 Apr 2013 16:57:33 +0200
+
+logol (1.6.0-1) unstable; urgency=low
+
+ * New upstream release with bug fixes
+
+ -- Olivier Sallou <osallou at debian.org> Fri, 15 Feb 2013 10:05:50 +0100
+
+logol (1.5.0-6) unstable; urgency=low
+
+ [ Olivier Sallou ]
+ * debian/control: Fix typo in description (Closes: #685079).
+ Thanks to Erik Esterer <erik.esterer at gmail.com>
+
+ -- Olivier Sallou <osallou at debian.org> Fri, 17 Aug 2012 08:00:58 +0200
+
+logol (1.5.0-5) unstable; urgency=low
+
+ [ Olivier Sallou]
+ * Transition package to use default java implementation:
+ From james.page at ubuntu.com (Closes: #684158)
+ - d/control: BD on default-jdk (>= 1:1.6), switch runtime dependency
+ to default-jre | java6-runtime.
+ - d/rules: Specify source/target = 1.5 to ensure backwards compatible
+ bytecode is built.
+
+ -- Olivier Sallou <osallou at debian.org> Tue, 07 Aug 2012 15:18:43 +0200
+
+logol (1.5.0-4) unstable; urgency=low
+
+ * debian/postinst: remove directory permissions (Closes: #683647).
+
+ -- Olivier Sallou <osallou at debian.org> Thu, 02 Aug 2012 17:09:31 +0200
+
+logol (1.5.0-2) unstable; urgency=low
+
+ * Support Arch dependent and arch independent separate builds.
+
+ -- Olivier Sallou <osallou at debian.org> Sun, 01 Jul 2012 23:49:16 +0200
+
+logol (1.5.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #678373).
+
+ -- Olivier Sallou <osallou at debian.org> Thu, 21 Jun 2012 12:50:22 +0200
Copied: trunk/packages/logol/tags/1.7.2-3/debian/patches/fix_antlr35 (from rev 21654, trunk/packages/logol/trunk/debian/patches/fix_antlr35)
===================================================================
--- trunk/packages/logol/tags/1.7.2-3/debian/patches/fix_antlr35 (rev 0)
+++ trunk/packages/logol/tags/1.7.2-3/debian/patches/fix_antlr35 2016-04-05 12:46:31 UTC (rev 21656)
@@ -0,0 +1,27 @@
+Subject: antlr35 generates issues in parser
+Description: switch to antlr 3.5 (from 3.2) leads to errors.
+This patch fix antlr 3.5 parser generation issues on optional tokens, using workaround in grammar description
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2016-04-05
+Forwarded: no
+Bug: #820286
+--- a/src/logol.g
++++ b/src/logol.g
+@@ -149,7 +149,7 @@
+ tmpcounter = (Integer) Treatment.counters.get(parentId); tmpcounter++; Treatment.counters.put(parentId,tmpcounter);
+ }
+
+- : ( ( op=(',' | ';' | '|')? { if($op!=null && !$op.text.equals(Constants.OP_OR)) { tmpIsAny = Treatment.isAny; tmpIsAnyMin = Treatment.isAnyMin; tmpIsAnyMax = Treatment.isAnyMax; tmpSaveAny = Treatment.saveAny; tmpcounter = (Integer) Treatment.counters.get(parentId); tmpcounter++; Treatment.counters.put(parentId,tmpcounter); }} ( ent=constrainedEntity[parentId,tmpIsAny,tmpIsAnyMin,tmpIsAnyMax,tmpSaveAny] ) ){ if($op==null) {operator=null; tmpdata+=curView.add($ent.predicate,operator,0,tmpcounter); /*tmpcounter = (Integer) counters.get(parentId); tmpcounter++; counters.put(parentId,tmpcounter);*/ } else { operator=$op.text; if(!operator.equals("|")) { /*tmpcounter = (Integer) counters.get(parentId); tmpcounter++; counters.put(parentId,tmpcounter);*/ tmpdata+=curView.add($ent.predicate,operator,0,tmpcounter); /*tmpcounter = (Integer) counters.get(parentId); tmpcounter++; counters.put(parentId,tmpcounter);*/ } else { tmpdata+=curView.add($ent.predicate,operator,0,tmpcounter);}}; } )+ ;
++ : ent0=constrainedEntity[parentId,tmpIsAny,tmpIsAnyMin,tmpIsAnyMax,tmpSaveAny] {operator=null; tmpdata+=curView.add($ent0.predicate,operator,0,tmpcounter); } ( ( op=(',' | ';' | '|') { if($op!=null && !$op.text.equals(Constants.OP_OR)) { tmpIsAny = Treatment.isAny; tmpIsAnyMin = Treatment.isAnyMin; tmpIsAnyMax = Treatment.isAnyMax; tmpSaveAny = Treatment.saveAny; tmpcounter = (Integer) Treatment.counters.get(parentId); tmpcounter++; Treatment.counters.put(parentId,tmpcounter); }} ( ent=constrainedEntity[parentId,tmpIsAny,tmpIsAnyMin,tmpIsAnyMax,tmpSaveAny] ) ){ if($op==null) {operator=null; tmpdata+=curView.add($ent.predicate,operator,0,tmpcounter); /*tmpcounter = (Integer) counters.get(parentId); tmpcounter++; counters.put(parentId,tmpcounter);*/ } else { operator=$op.text; if(!operator.equals("|")) { /*tmpcounter = (Integer) counters.get(parentId); tmpcounter++; counters.put(parentId,tmpcounter);*/ tmpdata+=curView.add($ent.predicate,operator,0,tmpcounter); /*tmpcounter = (Integer) counters.get(parentId); tmpcounter++; counters.put(parentId,tmpcounter);*/ } else { tmpdata+=curView.add($ent.predicate,operator,0,tmpcounter);}}; } )* ;
+
+
+
+@@ -455,7 +455,7 @@
+ Treatment.saveAny = tmpSaveAny;
+ }
+ //: ('repeat(' (view[parentId] parameters?) ')' '+' interval? ) { $lvar.content=$view.value; $lvar.repeatQuantity=$interval.text; $lvar.repeatType=$parameters.type; $lvar.repeatParam=$parameters.intervalParam;} ;
+- : 'repeat(' view[parentId] type=(','|';')? typeinterval=interval? { $lvar.content=$view.value; if($type!=null) { if($type.text.equals(",")) {$lvar.repeatType=1; } else {$lvar.repeatType=2;} $lvar.repeatParam=$typeinterval.text.replaceAll("\%\\w+\%", ""); }} ')+' repeatinterval=interval? {if(repeatinterval!=null) {$lvar.repeatQuantity=$repeatinterval.text.replaceAll("\%\\w+\%", "");} } ;
++ : 'repeat(' view[parentId] type=(','|';') typeinterval=interval? { $lvar.content=$view.value; if($type!=null) { if($type.text.equals(",")) {$lvar.repeatType=1; } else {$lvar.repeatType=2;} $lvar.repeatParam=$typeinterval.text.replaceAll("\%\\w+\%", ""); }} ')+' repeatinterval=interval? {if(repeatinterval!=null) {$lvar.repeatQuantity=$repeatinterval.text.replaceAll("\%\\w+\%", "");} } ;
+ //( op=(','| ';' | '|')? (ent=constrainedEntity[parentId] { $value+=curView.execute($ent.predicate,$op.text,0,countVar); }) )*
+
+ parameters returns [ int type, String intervalParam]
Deleted: trunk/packages/logol/tags/1.7.2-3/debian/patches/series
===================================================================
--- trunk/packages/logol/trunk/debian/patches/series 2016-04-04 19:10:00 UTC (rev 21650)
+++ trunk/packages/logol/tags/1.7.2-3/debian/patches/series 2016-04-05 12:46:31 UTC (rev 21656)
@@ -1,7 +0,0 @@
-remove_drmaa_support
-fixLibPath
-#fixDrmmato6.2
-setDebianDirs
-fix_doc_generation
-remove_rubygems_usage
-fix_swipl72
Copied: trunk/packages/logol/tags/1.7.2-3/debian/patches/series (from rev 21653, trunk/packages/logol/trunk/debian/patches/series)
===================================================================
--- trunk/packages/logol/tags/1.7.2-3/debian/patches/series (rev 0)
+++ trunk/packages/logol/tags/1.7.2-3/debian/patches/series 2016-04-05 12:46:31 UTC (rev 21656)
@@ -0,0 +1,8 @@
+remove_drmaa_support
+fixLibPath
+#fixDrmmato6.2
+setDebianDirs
+fix_doc_generation
+remove_rubygems_usage
+fix_swipl72
+fix_antlr35
More information about the debian-med-commit
mailing list