Author: osallou-guest Date: 2013-10-07 08:06:07 +0000 (Mon, 07 Oct 2013) New Revision: 14801
Added: trunk/packages/logol/trunk/debian/patches/fix_swipl_module_declaration Modified: trunk/packages/logol/trunk/debian/changelog trunk/packages/logol/trunk/debian/control trunk/packages/logol/trunk/debian/get-orig-source.sh trunk/packages/logol/trunk/debian/patches/series trunk/packages/logol/trunk/debian/rules Log: new upstream release, fix vcs urls Modified: trunk/packages/logol/trunk/debian/changelog =================================================================== --- trunk/packages/logol/trunk/debian/changelog 2013-10-06 04:33:58 UTC (rev 14800) +++ trunk/packages/logol/trunk/debian/changelog 2013-10-07 08:06:07 UTC (rev 14801) @@ -1,3 +1,9 @@ +logol (1.6.3-1) UNRELEASED; urgency=low + + * Remove patch for doc generation after swi-prolog fix + + -- Olivier Sallou <[email protected]> Mon, 02 Sep 2013 08:54:46 +0200 + logol (1.6.2-3) unstable; urgency=low * Fix swi-prolog compilation (Closes: #719030). Modified: trunk/packages/logol/trunk/debian/control =================================================================== --- trunk/packages/logol/trunk/debian/control 2013-10-06 04:33:58 UTC (rev 14800) +++ trunk/packages/logol/trunk/debian/control 2013-10-07 08:06:07 UTC (rev 14801) @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> Uploaders: Olivier Sallou <[email protected]> -Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/logol/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/logol/trunk/ -Build-Depends: debhelper (>= 8.0.0),default-jdk (>= 1:1.6),ant,ruby (>=1.8),rubygems, gawk, swi-prolog (>=6.4.1), +Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/logol/trunk/ +Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/logol/ +Build-Depends: debhelper (>= 8.0.0),default-jdk (>= 1:1.6),ant,ruby (>=1.8),rubygems, gawk, swi-prolog (>=6.4.3), libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java, libcommons-collections3-java, libcommons-configuration-java, libcommons-lang-java, libcommons-logging-java, libxalan2-java, libxerces2-java, junit4, libgnumail-java, liblog4j1.2-java,texlive, texlive-latex-extra, tex4ht, libncursesw5-dev, ruby-cassiopee, ant-optional @@ -26,7 +26,7 @@ Package: logol-bin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, swi-prolog(>=6.4.1), libncursesw5 +Depends: ${shlibs:Depends}, ${misc:Depends}, swi-prolog(>=6.4.3), libncursesw5 Description: Pattern matching tool using Logol language This package contains the Prolog binaries used by Logol to parse the sequence and match the grammar. Modified: trunk/packages/logol/trunk/debian/get-orig-source.sh =================================================================== --- trunk/packages/logol/trunk/debian/get-orig-source.sh 2013-10-06 04:33:58 UTC (rev 14800) +++ trunk/packages/logol/trunk/debian/get-orig-source.sh 2013-10-07 08:06:07 UTC (rev 14801) @@ -16,7 +16,7 @@ UTAR="${PKG}_${VERSION}.orig.tar.bz2" mv ../${UTAR} . -tar xfj ${UTAR} +tar xfJ ${UTAR} mv ${PKG}-${VERSION} ${PKG}-${VERSION}.orig Added: trunk/packages/logol/trunk/debian/patches/fix_swipl_module_declaration =================================================================== --- trunk/packages/logol/trunk/debian/patches/fix_swipl_module_declaration (rev 0) +++ trunk/packages/logol/trunk/debian/patches/fix_swipl_module_declaration 2013-10-07 08:06:07 UTC (rev 14801) @@ -0,0 +1,13 @@ +Subject: fix module declaration for swipl, different from sicstus-prolog. +Description: for swipl, default used in packaging, the module declaration is different. This patch fix this difference. Upstream manage both +Forwarded: No +Author: Olivier Sallou <[email protected]> +Last-Updated: 2013-10-07 +--- a/prolog/logol.pl ++++ b/prolog/logol.pl +@@ -1,4 +1,4 @@ +-:- module(logol,[writeFinalMatches/0,isMin/5,replaceMatch/4,appendMatch/3,getCounter/1,config/1,optimalmatch/5,matchstore/2,isMax/3,parseResults/2,checkAlphabetPercentage/3,mapListExact/2,mapListGlobal/2,mapListLocal/2,mapListLocal0/2,matchExist/2,mapModels/3,externalinterfacewithspacer/2,externalinterface/2,notpred_pos/6,between/3,notexact_pos/6,notexact/3,matchExist/1,mapModels/2,mapList/2,mydb/1,matchlist/2,isexactwithgaponly/5,isexactwithgaponly_pos/5,setParent/2,getParent/2,logData/2,logolMain/5,cut_sequence/3,isequal/2,isexact_pos/4,isexactwithgapanderror_pos/5,isexactwitherroronly_pos/5,spacer_withresult_pos/5,wordSize_pos/4,getPosition_pos/3,wordContent_pos/4,checkPosition_pos/4,anySpacer_pos/7,repeatPredicate_pos/14,testOverlap_pos/5,getsuffixmatch_pos/12,getWordContent/4,openSequenceStream/2,closeSequenceStream/0,getCharsFromPosition/3,getNChar/3,resetParamList/3,getKnownVariables/2,getPosition/3,myCost/4,getDistance/3,initResultFile/1,closeResultFile/1,getParentVariable/ 2,is4me/5,outputfile/1,writeallresult/2,maxsize/1,getresult/2,offset/1,setSequence/2,computeCost/2,getsuffixmatch/12,writeSequence/2,sequenceData/3,suffixmatch/9,repeatPredicate/14,anySpacer/5,anySpacer/7,any/2,isoverlap/5,morphism/3,spacer_withresult/5,isexact/3,isexact/4,isexact/5,isexactwithgapanderror/4,isexactwithgapanderror/5,isexactwitherroronly/4,isexactwitherroronly/5,matrix/3, iscompequal/2,getcomplement/2,getreversecomplement/2,applymorphism/4, checkCost/4,cost/4,parentalCost/4,varDefinition/5,saveVariable/8,getVariable/9,removeVariable/1,wordSize/3,wordSize/4,percent/3,percent2int/3,checkCost/4,checkCost/5,checkPosition/3,checkPosition/5,checkRelativePosition/4,getContent/3,getContent/4,pushResult/2,countAlphabet/4,isexactwithdistinctgapanderror_pos/7],[assertions,basicmodes,functions,regtypes,hiord]). ++:- module(logol,[writeFinalMatches/0,isMin/5,replaceMatch/4,appendMatch/3,getCounter/1,config/1,optimalmatch/5,matchstore/2,isMax/3,parseResults/2,checkAlphabetPercentage/3,mapListExact/2,mapListGlobal/2,mapListLocal/2,mapListLocal0/2,matchExist/2,mapModels/3,externalinterfacewithspacer/2,externalinterface/2,notpred_pos/6,between/3,notexact_pos/6,notexact/3,matchExist/1,mapModels/2,mapList/2,mydb/1,matchlist/2,isexactwithgaponly/5,isexactwithgaponly_pos/5,setParent/2,getParent/2,logData/2,logolMain/5,cut_sequence/3,isequal/2,isexact_pos/4,isexactwithgapanderror_pos/5,isexactwitherroronly_pos/5,spacer_withresult_pos/5,wordSize_pos/4,getPosition_pos/3,wordContent_pos/4,checkPosition_pos/4,anySpacer_pos/7,repeatPredicate_pos/14,testOverlap_pos/5,getsuffixmatch_pos/12,getWordContent/4,openSequenceStream/2,closeSequenceStream/0,getCharsFromPosition/3,getNChar/3,resetParamList/3,getKnownVariables/2,getPosition/3,myCost/4,getDistance/3,initResultFile/1,closeResultFile/1,getParentVariable/ 2,is4me/5,outputfile/1,writeallresult/2,maxsize/1,getresult/2,offset/1,setSequence/2,computeCost/2,getsuffixmatch/12,writeSequence/2,sequenceData/3,suffixmatch/9,repeatPredicate/14,anySpacer/5,anySpacer/7,any/2,isoverlap/5,morphism/3,spacer_withresult/5,isexact/3,isexact/4,isexact/5,isexactwithgapanderror/4,isexactwithgapanderror/5,isexactwitherroronly/4,isexactwitherroronly/5,matrix/3, iscompequal/2,getcomplement/2,getreversecomplement/2,applymorphism/4, checkCost/4,cost/4,parentalCost/4,varDefinition/5,saveVariable/8,getVariable/9,removeVariable/1,wordSize/3,wordSize/4,percent/3,percent2int/3,checkCost/4,checkCost/5,checkPosition/3,checkPosition/5,checkRelativePosition/4,getContent/3,getContent/4,pushResult/2,countAlphabet/4,isexactwithdistinctgapanderror_pos/7],[]). + + + /** <module> Logol Prolog API Modified: trunk/packages/logol/trunk/debian/patches/series =================================================================== --- trunk/packages/logol/trunk/debian/patches/series 2013-10-06 04:33:58 UTC (rev 14800) +++ trunk/packages/logol/trunk/debian/patches/series 2013-10-07 08:06:07 UTC (rev 14801) @@ -2,5 +2,4 @@ fixDrmmato6.2 setDebianDirs fix_doc_generation -harden_swipl_declarations -fix_pldoc2tex_generation +fix_swipl_module_declaration Modified: trunk/packages/logol/trunk/debian/rules =================================================================== --- trunk/packages/logol/trunk/debian/rules 2013-10-06 04:33:58 UTC (rev 14800) +++ trunk/packages/logol/trunk/debian/rules 2013-10-07 08:06:07 UTC (rev 14801) @@ -11,6 +11,7 @@ dh $@ override_dh_auto_build: + mv tools/pldoc.sty tools/pldoc.sty.upstream dh_auto_build -- $(DEB_ANT_ARGS) ant -f build.xml doc @@ -23,10 +24,9 @@ if [ -e debian/logol ]; then chmod -f 755 debian/logol/usr/share/logol/tools/*.sh; fi if [ -e debian/logol ]; then chmod -f 755 debian/logol/usr/share/logol/tools/*.rb; fi if [ -e debian/logol ]; then chmod -f 755 debian/logol/usr/share/logol/tools/mycostfunction; fi - # Not available, requires pldoc, not currently available in Debian SWI-Prolog - #cp Doc/logolParser.pdf debian/logol/usr/share/doc/logol/ override_dh_clean: + if [ -e tools/pldoc.sty.upstream ]; then mv tools/pldoc.sty.upstream tools/pldoc.sty; fi dh_clean rm -f Swi*.xml rm -f prolog/*.exe _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
