[texworks] 28/73: Imported Debian patch 0.5~svn939-2
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texworks.
commit 48d4a00ab897bcdafaa6fe7c33949ccaaba34a28
Author: Atsuhito KOHDA <kohda@debian.org>
Date: Thu Sep 29 07:48:29 2011 +0900
Imported Debian patch 0.5~svn939-2
---
debian/changelog | 8 ++++++++
debian/patch-luatex | 2 +-
debian/patch-py | 13 +++++++++++++
debian/rules | 4 ++--
4 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 92be0f6..1f981d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+texworks (0.5~svn939-2) unstable; urgency=low
+
+ * I failed to apply a patch suggested by Jakub Wilk in the previous
+ upload. This time I believe the patch is applied. (Closes: #632393)
+ * Removed unnecessary patch for luatex. It was included in the upstream.
+
+ -- Atsuhito KOHDA <kohda@debian.org> Thu, 29 Sep 2011 07:48:29 +0900
+
texworks (0.5~svn939-1) unstable; urgency=low
* New upstream release (rev 939).
diff --git a/debian/patch-luatex b/debian/patch-luatex
index d430ff4..ae8f8fd 100644
--- a/debian/patch-luatex
+++ b/debian/patch-luatex
@@ -1,6 +1,6 @@
--- src/TWApp.cpp.org 2011-06-14 16:30:33.000000000 +0900
+++ src/TWApp.cpp 2011-06-14 16:33:43.000000000 +0900
-@@ -839,6 +839,8 @@
+@@ -844,6 +844,8 @@
<< Engine("pdfLaTeX", "pdflatex" EXE, QStringList("$synctexoption") << "$fullname", true)
<< Engine("XeTeX", "xetex" EXE, QStringList("$synctexoption") << "$fullname", true)
<< Engine("XeLaTeX", "xelatex" EXE, QStringList("$synctexoption") << "$fullname", true)
diff --git a/debian/patch-py b/debian/patch-py
new file mode 100644
index 0000000..aff9656
--- /dev/null
+++ b/debian/patch-py
@@ -0,0 +1,13 @@
+--- texworks-0.5~svn930.orig/plugins-src/TWPythonPlugin/TWPythonPlugin.pro
++++ texworks-0.5~svn930/plugins-src/TWPythonPlugin/TWPythonPlugin.pro
+@@ -50,8 +50,8 @@
+
+ unix:!macx { # on Unix-ish platforms we should rely on pkgconfig
+ # Python prior to 3.x doesn't register properly with pkg-config
+- INCLUDEPATH += /usr/include/python2.6/
+- LIBS += -lpython2.6
++ INCLUDEPATH += /usr/include/$(PYTHON)/
++ LIBS += -l$(PYTHON)
+
+ # uncomment these lines (and comment those above) to use Python 3
+ # CONFIG += link_pkgconfig
diff --git a/debian/rules b/debian/rules
index 7fe1ab5..276ce9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- patch -p0 < ./debian/patch-luatex
+ patch -p1 < ./debian/patch-py
# qmake-qt4
touch configure-stamp
@@ -77,7 +77,7 @@ clean:
if [ -d $(PLIPYT)/obj ]; then rmdir $(PLIPYT)/obj; fi
if [ -d $(PLIPYT)/rcc ]; then rmdir $(PLIPYT)/rcc; fi
if [ -d $(PLIPYT)/ui ]; then rmdir $(PLIPYT)/ui; fi
- patch -NRp0 < ./debian/patch-luatex || true
+ patch -NRp1 < ./debian/patch-py || true
rm -f $(PLIDIR)/libTWLuaPlugin.so $(PLIDIR)/Makefile
rm -f $(PLIPYT)/libTWPythonPlugin.so $(PLIPYT)/Makefile
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texworks.git
Reply to: