Run of fresh-snapshots for mediawiki2latex

Merge these changes:

git pull https://janitor.debian.net/git/mediawiki2latex fresh-snapshots/main
git pull https://janitor.debian.net/git/mediawiki2latex fresh-snapshots/upstream

Summary

Merged new upstream version: 7.45+git20220126.1.112b8c3 (was: 7.45).

Diff

Branch: main

diff --git a/debian/changelog b/debian/changelog
index 48eb638..6d130bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mediawiki2latex (7.45-2) UNRELEASED; urgency=medium
+mediawiki2latex (7.45+git20220126.1.112b8c3-1) UNRELEASED; urgency=medium
 
   [ Debian Janitor ]
   * Trim trailing whitespace.
@@ -12,7 +12,10 @@ mediawiki2latex (7.45-2) UNRELEASED; urgency=medium
   [ Georges Khaznadar ]
   * bumped Standards-Version: 4.6.0.2
 
- -- Georges Khaznadar <georgesk@debian.org>  Fri, 04 Mar 2022 18:53:20 +0100
+  [ Debian Janitor ]
+  * New upstream snapshot.
+
+ -- Georges Khaznadar <georgesk@debian.org>  Fri, 04 Mar 2022 18:50:37 -0000
 
 mediawiki2latex (7.45-1) unstable; urgency=medium
 
diff --git a/debian/patches/10-Makefile.patch b/debian/patches/10-Makefile.patch
index 7a94934..a93293f 100644
--- a/debian/patches/10-Makefile.patch
+++ b/debian/patches/10-Makefile.patch
@@ -1,6 +1,8 @@
 adaptation of Makefile for the packaging work
---- a/Makefile
-+++ b/Makefile
+Index: mediawiki2latex/Makefile
+===================================================================
+--- mediawiki2latex.orig/Makefile
++++ mediawiki2latex/Makefile
 @@ -1,6 +1,6 @@
 -PREFIX ?= /usr
 -BINDIR = $(PREFIX)/bin
@@ -11,7 +13,7 @@ adaptation of Makefile for the packaging work
  MANDIR = $(SHAREDIR)/man
  MAN1DIR = $(MANDIR)/man1
  VERSION = $(shell awk '/^Version/ {print $$2 ; exit}' mediawiki2latex.cabal)
-@@ -21,12 +21,12 @@
+@@ -21,12 +21,12 @@ mediawiki2latex.1: mediawiki2latex.1.in
  
  
  install: all
diff --git a/src/Load.hs b/src/Load.hs
index a86cc1d..3ef403f 100644
--- a/src/Load.hs
+++ b/src/Load.hs
@@ -155,7 +155,7 @@ runqBookIncludeAction dir
 
 qBookIncludeActionbase :: FullConfig-> WikiUrl -> String ->  ImperativeMonad String
 qBookIncludeActionbase cfg wurl text 
-  =  if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if isInfixOf "Category:" text then return ""
+  =  if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if (isInfixOf "Category:" text) || (isInfixOf "Kategorie:" text) then return ""
                    else
                      do pp <- (liftIO (print d)) >> myfun
                         case pp of
@@ -186,7 +186,7 @@ qBookIncludeAction :: FullConfig-> WikiUrl -> String ->  ImperativeMonad String
 qBookIncludeAction cfg wurl text 
   = do sst <- get
        case (loadacu sst) of
-        Right _ ->   if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if isInfixOf "Category:" text then return "" else if (noparent cfg) && case text of {'/':_->False; _->True} &&(fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
+        Right _ ->   if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if (isInfixOf "Category:" text) || (isInfixOf "Kategorie:" text) then return "" else if (noparent cfg) && case text of {'/':_->False; _->True} &&(fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
                         do pp <- (liftIO (print d)) >> myfun
                            case pp of
                             Just p -> do _ <- addContributors d Nothing
@@ -202,7 +202,7 @@ qBookIncludeAction cfg wurl text
                                           Left base -> put st{loadacu = Left (tempdir: base)}
                                          return x
                             _ -> return  ""
-        Left _ -> if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if isInfixOf "Category:" text then return "" else if (noparent cfg)&& case text of {'/':_->False; _->True} && (fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
+        Left _ -> if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if (isInfixOf "Category:" text) || (isInfixOf "Kategorie:" text) then return "" else if (noparent cfg)&& case text of {'/':_->False; _->True} && (fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
                      do systempdir <- liftIO getTemporaryDirectory
                         tempdir <- liftIO $  createTempDirectory systempdir "MediaWiki2LaTeXBook"
                         liftIO $ B.writeFile (tempdir </> "bookinput") (S.encode (cfg,wurl,text,loadacu sst,audict sst,fullUrl sst))
diff --git a/src/MagicStrings.hs b/src/MagicStrings.hs
index 38dea31..1737f27 100644
--- a/src/MagicStrings.hs
+++ b/src/MagicStrings.hs
@@ -533,7 +533,7 @@ removePrintVersion lem
 
 goodtags1 :: [[Char]]
 goodtags1
-  = ["includeonly", "references", "blockquote", "noinclude",
+  = ["templatestyles", "includeonly", "references", "blockquote", "noinclude",
      "noframes", "frameset", "colgroup", "fieldset", "basefont",
      "!DOCTYPE", "noscript", "address", "acronym", "caption", "strong",
      "applet", "script", "button", "select", "section", "legend", "footer",

Branch: upstream

Tag: upstream/7.45+git20220126.1.112b8c3
diff --git a/src/Load.hs b/src/Load.hs
index a86cc1d..3ef403f 100644
--- a/src/Load.hs
+++ b/src/Load.hs
@@ -155,7 +155,7 @@ runqBookIncludeAction dir
 
 qBookIncludeActionbase :: FullConfig-> WikiUrl -> String ->  ImperativeMonad String
 qBookIncludeActionbase cfg wurl text 
-  =  if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if isInfixOf "Category:" text then return ""
+  =  if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if (isInfixOf "Category:" text) || (isInfixOf "Kategorie:" text) then return ""
                    else
                      do pp <- (liftIO (print d)) >> myfun
                         case pp of
@@ -186,7 +186,7 @@ qBookIncludeAction :: FullConfig-> WikiUrl -> String ->  ImperativeMonad String
 qBookIncludeAction cfg wurl text 
   = do sst <- get
        case (loadacu sst) of
-        Right _ ->   if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if isInfixOf "Category:" text then return "" else if (noparent cfg) && case text of {'/':_->False; _->True} &&(fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
+        Right _ ->   if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if (isInfixOf "Category:" text) || (isInfixOf "Kategorie:" text) then return "" else if (noparent cfg) && case text of {'/':_->False; _->True} &&(fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
                         do pp <- (liftIO (print d)) >> myfun
                            case pp of
                             Just p -> do _ <- addContributors d Nothing
@@ -202,7 +202,7 @@ qBookIncludeAction cfg wurl text
                                           Left base -> put st{loadacu = Left (tempdir: base)}
                                          return x
                             _ -> return  ""
-        Left _ -> if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if isInfixOf "Category:" text then return "" else if (noparent cfg)&& case text of {'/':_->False; _->True} && (fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
+        Left _ -> if isInfixOf "Vorlage" text then return ("{{" ++ text ++ "}}") else if (isInfixOf "Category:" text) || (isInfixOf "Kategorie:" text) then return "" else if (noparent cfg)&& case text of {'/':_->False; _->True} && (fromMaybe False (wurl >>= (return.not.((flip Data.List.isPrefixOf) text).(intercalate "/").(Data.List.dropWhile (=="wiki")).(splitOn "/").url_path.fst))) then return "" else
                      do systempdir <- liftIO getTemporaryDirectory
                         tempdir <- liftIO $  createTempDirectory systempdir "MediaWiki2LaTeXBook"
                         liftIO $ B.writeFile (tempdir </> "bookinput") (S.encode (cfg,wurl,text,loadacu sst,audict sst,fullUrl sst))
diff --git a/src/MagicStrings.hs b/src/MagicStrings.hs
index 38dea31..1737f27 100644
--- a/src/MagicStrings.hs
+++ b/src/MagicStrings.hs
@@ -533,7 +533,7 @@ removePrintVersion lem
 
 goodtags1 :: [[Char]]
 goodtags1
-  = ["includeonly", "references", "blockquote", "noinclude",
+  = ["templatestyles", "includeonly", "references", "blockquote", "noinclude",
      "noframes", "frameset", "colgroup", "fieldset", "basefont",
      "!DOCTYPE", "noscript", "address", "acronym", "caption", "strong",
      "applet", "script", "button", "select", "section", "legend", "footer",

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far. not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1135, max open: 200)
  • ☑ change set 30104046-2e71-4977-b407-e4f3753f4f21 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots mediawiki2latex-dbgsymapt install -t fresh-snapshots mediawiki2latex

Lintian Result

Full worker log Full build log