[debian-edu-commits] debian-edu/ 01/08: Install all LaTeX files into default location.
Dominik George
natureshadow-guest at moszumanska.debian.org
Tue Jan 16 00:42:38 UTC 2018
This is an automated email from the git hooks/post-receive script.
natureshadow-guest pushed a commit to branch master
in repository sdaps.
commit 7b665ed94016cf2b59682282da0b2d4ce78c9a43
Author: Dominik George <nik at naturalnet.de>
Date: Tue Jan 16 00:28:24 2018 +0100
Install all LaTeX files into default location.
---
debian/install | 1 +
debian/patches/remove_latex_copy.patch | 46 ++++++++++++++++++++++++++++++++++
debian/patches/remove_qrcode.patch | 35 --------------------------
debian/patches/series | 2 +-
sdaps/setuptex/__init__.py | 20 ---------------
setup.py | 6 -----
6 files changed, 48 insertions(+), 62 deletions(-)
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..cda47a4
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+tex/* usr/share/texlive/texmf-dist/sdaps
\ No newline at end of file
diff --git a/debian/patches/remove_latex_copy.patch b/debian/patches/remove_latex_copy.patch
new file mode 100644
index 0000000..8a0ebd8
--- /dev/null
+++ b/debian/patches/remove_latex_copy.patch
@@ -0,0 +1,46 @@
+From: Dominik George <nik at naturalnet.de>
+Subject: Use LaTeX files in standard location instead of copying
+--- a/setup.py
++++ b/setup.py
+@@ -190,12 +190,6 @@ the tools to later analyse the scanned d
+ ('share/sdaps/ui',
+ glob.glob("sdaps/gui/*.ui")
+ ),
+- ('share/sdaps/tex', glob.glob('tex/*.cls')
+- ),
+- ('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
+@@ -89,26 +89,6 @@ def setup(survey, questionnaire_tex, add
+
+ write_latex_override_file(survey, draft=True)
+
+- # Copy class and dictionary files
+- 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)))
+-
+ for add_file in extra_files:
+ shutil.copyfile(add_file, survey.path(os.path.basename(add_file)))
+
diff --git a/debian/patches/remove_qrcode.patch b/debian/patches/remove_qrcode.patch
deleted file mode 100644
index 6006b1f..0000000
--- a/debian/patches/remove_qrcode.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
index 5336c50..eab3587 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove_qrcode.patch
+remove_latex_copy.patch
diff --git a/sdaps/setuptex/__init__.py b/sdaps/setuptex/__init__.py
index f9ceab4..a1faebb 100644
--- a/sdaps/setuptex/__init__.py
+++ b/sdaps/setuptex/__init__.py
@@ -89,26 +89,6 @@ def setup(survey, questionnaire_tex, additionalqobjects=None, extra_files=[]):
write_latex_override_file(survey, draft=True)
- # Copy class and dictionary files
- 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)))
-
for add_file in extra_files:
shutil.copyfile(add_file, survey.path(os.path.basename(add_file)))
diff --git a/setup.py b/setup.py
index 9ed6042..1cfe669 100755
--- a/setup.py
+++ b/setup.py
@@ -190,12 +190,6 @@ the tools to later analyse the scanned data, and create a report.
('share/sdaps/ui',
glob.glob("sdaps/gui/*.ui")
),
- ('share/sdaps/tex', glob.glob('tex/*.cls')
- ),
- ('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,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/sdaps.git
More information about the debian-edu-commits
mailing list