[texworks] 49/73: Imported Debian patch 0.5~svn1363-2
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texworks.
commit 1ca6930446b98454f03e001edbc8a7f70a273481
Author: Atsuhito KOHDA <kohda@debian.org>
Date: Fri May 23 09:46:37 2014 +0900
Imported Debian patch 0.5~svn1363-2
---
debian/changelog | 11 +++++++++++
debian/rules | 22 ++++++++++++----------
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 92b52e9..a8cc0d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+texworks (0.5~svn1363-2) unstable; urgency=medium
+
+ * In previous packaging, I made mistake but yet I don't get a decent fix,
+ the followings are only workaroud.
+ * Fixed build process to set TW_PLUGINPATH correctly with an option
+ -DTeXworks_PLUGIN_DIR='/usr/lib/texworks'.
+ * Removed unnecessary patches and set the option -DWITH_PYTHON=ON and
+ -DTeXworks_HELP_DIR='/usr/share/texworks-help'.
+
+ -- Atsuhito KOHDA <kohda@debian.org> Fri, 23 May 2014 09:46:37 +0900
+
texworks (0.5~svn1363-1) unstable; urgency=medium
* New Upstream Release (rev 1363).
diff --git a/debian/rules b/debian/rules
index c4ac5a3..4792533 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,14 +15,16 @@ include /usr/share/dpkg/buildflags.mk
CFLAGS+=$(CPPFLAGS)
CXXFLAGS+=$(CPPFLAGS)
+
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- patch -p1 < ./debian/patch-py
- patch -p0 < ./debian/patch-cm
- mkdir build && cd build && cmake .. -DTW_BUILD_ID='Debian' -DCMAKE_INSTALL_PREFIX='$(CURDIR)/debian/tmp/usr' && cd ..
-
+# patch -p0 < ./debian/patch-cm
+ mkdir build && cd build && cmake .. -DTW_BUILD_ID='Debian' -DCMAKE_INSTALL_PREFIX='$(CURDIR)/debian/tmp/usr' -DTeXworks_PLUGIN_DIR='/usr/lib/texworks' -DTeXworks_HELP_DIR='/usr/share/texworks-help' && cd ..
+ cd build && $(MAKE) texworks && mv texworks ../texworks-good && cd ..
+ rm -rf build && mkdir build && \
+ cd build && cmake .. -DTW_BUILD_ID='Debian' -DCMAKE_INSTALL_PREFIX='$(CURDIR)/debian/tmp/usr' -DWITH_PYTHON=ON && cd ..
touch configure-stamp
build: build-arch build-indep
@@ -39,9 +41,8 @@ clean:
dh_testdir
dh_testroot
rm -rf build build-stamp configure-stamp
-
- patch -NRp1 < ./debian/patch-py || true
- patch -NRp0 < ./debian/patch-cm || true
+ rm -f ./texworks-good
+# patch -NRp0 < ./debian/patch-cm || true
dh_clean
@@ -78,10 +79,11 @@ binary-indep: install
binary-arch: install
dh_testdir
dh_testroot
-
- cd build && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
-# rm -r $(CURDIR)/debian/tmp/usr/share/doc/texworks-help
+# INSTALL_ROOT=$(CURDIR)/debian/tmp
+ cd build && $(MAKE) install
+ mv $(CURDIR)/debian/tmp/usr/share/doc/texworks-help $(CURDIR)/debian/tmp/usr/share/texworks-help
rm $(CURDIR)/debian/tmp/usr/share/doc/texworks/COPYING
+ mv ./texworks-good $(CURDIR)/debian/tmp/usr/bin/texworks
dh_installchangelogs
dh_installdocs -XCOPYING
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texworks.git
Reply to: