[debian-edu-commits] debian-edu/ 08/10: Add patch to remove qrcode.sty.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository sdaps.

commit d8e680a4c82344d38793da51299f892c801f0bbb
Author: Dominik George <nik at naturalnet.de>
Date:   Mon Jan 15 22:47:09 2018 +0100

    Add patch to remove qrcode.sty.
---
 debian/patches/remove_qrcode.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/remove_qrcode.patch b/debian/patches/remove_qrcode.patch
new file mode 100644
index 0000000..6006b1f
--- /dev/null
+++ b/debian/patches/remove_qrcode.patch
@@ -0,0 +1,35 @@
+From: Dominik George <nik at naturalnet.de>
+Subject: Remove duplicated qrcode.sty in favour of texlive copy
+--- a/setup.py
++++ b/setup.py
+@@ -194,8 +194,6 @@ the tools to later analyse the scanned d
+                   ),
+                   ('share/sdaps/tex', glob.glob('tex/*.tex')
+                   ),
+-                  ('share/sdaps/tex', glob.glob('tex/*.sty')
+-                  ),
+                   ],
+       cmdclass = { "build" : build_extra.build_extra,
+                    "build_i18n" :  sdaps_build_i18n,
+--- a/sdaps/setuptex/__init__.py
++++ b/sdaps/setuptex/__init__.py
+@@ -93,19 +93,16 @@ def setup(survey, questionnaire_tex, add
+         if paths.local_run:
+             cls_file = os.path.join(paths.source_dir, 'tex', 'sdaps.cls')
+             code128_file = os.path.join(paths.source_dir, 'tex', 'code128.tex')
+-            qrcode_style = os.path.join(paths.source_dir, 'tex', 'qrcode.sty')
+             dict_files = os.path.join(paths.build_dir, 'tex', '*.dict')
+             dict_files = glob.glob(dict_files)
+         else:
+             cls_file = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', 'sdaps.cls')
+             code128_file = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', 'code128.tex')
+-            qrcode_style = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', 'qrcode.sty')
+             dict_files = os.path.join(paths.prefix, 'share', 'sdaps', 'tex', '*.dict')
+             dict_files = glob.glob(dict_files)
+ 
+         shutil.copyfile(cls_file, survey.path('sdaps.cls'))
+         shutil.copyfile(code128_file, survey.path('code128.tex'))
+-        shutil.copyfile(qrcode_style, survey.path('qrcode.sty'))
+         for dict_file in dict_files:
+             shutil.copyfile(dict_file, survey.path(os.path.basename(dict_file)))
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5336c50
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_qrcode.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/sdaps.git