[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[texworks] 47/73: Imported Debian patch 0.5~svn1363-1



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

preining pushed a commit to branch master
in repository texworks.

commit 0c0089c05b0a9aeb58ad2a471ffca38e5f40bdce
Merge: 18ef939 b16143c
Author: Atsuhito KOHDA <kohda@debian.org>
Date:   Wed May 14 16:24:12 2014 +0900

    Imported Debian patch 0.5~svn1363-1

 CMake/Modules/COPYING-CMAKE-MODULES           |   2 +-
 README                                        |   2 +-
 TeXworks.plist.in                             |   2 +-
 debian/changelog                              |  15 +++
 debian/control                                |   8 +-
 debian/patch-cm                               |  31 +++++++
 debian/rules                                  | 127 +++++++++----------------
 debian/texworks-help-en.install               |   1 +
 debian/texworks-scripting-lua.install         |   1 +
 debian/texworks-scripting-python.install      |   1 +
 debian/texworks.install                       |   2 +
 man/texworks.1                                |   2 +-
 plugins-src/TWLuaPlugin/TWLuaPlugin.cpp       |   2 +-
 plugins-src/TWLuaPlugin/TWLuaPlugin.h         |   2 +-
 plugins-src/TWPythonPlugin/TWPythonPlugin.cpp |   2 +-
 plugins-src/TWPythonPlugin/TWPythonPlugin.h   |   2 +-
 res/TeXworks.rc                               |   2 +-
 src/CMakeLists.txt                            |   5 +
 src/ClickableLabel.cpp                        |   2 +-
 src/ClickableLabel.h                          |   2 +-
 src/ClosableTabWidget.cpp                     |   2 +-
 src/ClosableTabWidget.h                       |   2 +-
 src/CommandlineParser.cpp                     |   2 +-
 src/CommandlineParser.h                       |   2 +-
 src/CompletingEdit.h                          |   2 +-
 src/ConfigurableApp.cpp                       |   2 +-
 src/ConfigurableApp.h                         |   2 +-
 src/ConfirmDelete.cpp                         |   2 +-
 src/ConfirmDelete.h                           |   2 +-
 src/DefaultBinaryPaths.h                      |   3 +
 src/DefaultBinaryPathsWin.h                   |   2 +-
 src/DefaultPrefs.h                            |   2 +-
 src/FindDialog.cpp                            |   2 +-
 src/HardWrapDialog.cpp                        |   2 +-
 src/HardWrapDialog.h                          |   2 +-
 src/PDFDocks.cpp                              |   2 +-
 src/PDFDocks.h                                |   2 +-
 src/ResourcesDialog.cpp                       |   2 +-
 src/ResourcesDialog.h                         |   2 +-
 src/ScriptManager.cpp                         |   2 +-
 src/ScriptManager.h                           |   2 +-
 src/SvnRev.h                                  |   4 +-
 src/TWApp.cpp                                 |   6 +-
 src/TWApp.h                                   |   2 +-
 src/TWScript.cpp                              |   2 +-
 src/TWScript.h                                |   2 +-
 src/TWScriptAPI.cpp                           |   2 +-
 src/TWScriptAPI.h                             |   2 +-
 src/TWScriptable.cpp                          |   2 +-
 src/TWScriptable.h                            |   2 +-
 src/TWSystemCmd.cpp                           |   2 +-
 src/TWSystemCmd.h                             |   2 +-
 src/TWTextCodecs.cpp                          |   2 +-
 src/TWTextCodecs.h                            |   2 +-
 src/TWUtils.cpp                               |   2 +-
 src/TWVersion.h                               |   2 +-
 src/TeXDocks.cpp                              |   2 +-
 src/TeXDocks.h                                |   2 +-
 src/TeXDocument.cpp                           |   3 +-
 src/TeXDocument.h                             |   2 +-
 src/TeXHighlighter.cpp                        |   6 +-
 src/TeXHighlighter.h                          |   6 +-
 src/TemplateDialog.cpp                        |   2 +-
 src/TemplateDialog.h                          |   2 +-
 src/main.cpp                                  |   4 +-
 src/synctex_parser.c                          |  24 ++---
 src/synctex_parser_utils.c                    |   8 +-
 src/synctex_parser_utils.h                    |  11 +--
 trans/TeXworks_ru.qm                          | Bin 57677 -> 57760 bytes
 trans/TeXworks_ru.ts                          |   4 +
 updateCopyrights.py                           | 128 ++++++++++++++++++++++++++
 updateSyncTeX.sh                              |  14 +++
 72 files changed, 340 insertions(+), 170 deletions(-)

diff --cc debian/changelog
index 0ba2da8,0000000..92b52e9
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,194 -1,0 +1,209 @@@
++texworks (0.5~svn1363-1) unstable; urgency=medium
++
++  * New Upstream Release (rev 1363).
++  * Adopt new build system with CMake.
++   - Rewrite debian/rules for it.
++   - Enabling PythonPlugin with modification of CMakeLists.txt .
++   - To build texworks-help-en, modify CMakeLists.txt and src/TWUtils.cpp
++     but should be refined.  See debian/patch-cm.
++   - Set hardened build flags.
++  * Cleaning lintian warnings.
++   - Stop installing unnecessary COPYING.
++   - Bump Standards-Version to 3.9.5 .
++
++ -- Atsuhito KOHDA <kohda@debian.org>  Wed, 14 May 2014 16:24:12 +0900
++
 +texworks (0.5~svn1351-1) unstable; urgency=medium
 +
 +  * New Upstream Release (rev 1351).
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 27 Jan 2014 14:06:54 +0900
 +
 +texworks (0.5~svn1302-1) unstable; urgency=low
 +
 +  * New Upstream Release (rev 1302).
 +
 + -- Atsuhito Kohda <kohda@debian.org>  Fri, 30 Aug 2013 15:02:31 +0900
 +
 +texworks (0.5~svn1288-1) unstable; urgency=low
 +
 +  * New Upstream Release (rev 1288).
 +  * Fixed rules clean target.  obj -> objs
 +  * Fixed control file.  Added zlib1g-dev to Build-Depends field.
 +    (Closes: #710102)
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Tue, 04 Jun 2013 14:11:27 +0900
 +
 +texworks (0.5~svn1035-1) unstable; urgency=low
 +
 +  * New Upstream Release (rev 1035).
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 25 Feb 2013 15:40:07 +0900
 +
 +texworks (0.5~svn1031-1) unstable; urgency=low
 +
 +  * New Upstrean Release (rev 1031).
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Wed, 23 Jan 2013 14:16:22 +0900
 +
 +texworks (0.5~svn1026-1) unstable; urgency=low
 +
 +  * New Upstrean Release (rev 1026).
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Thu, 26 Sep 2012 16:48:05 +0900
 +
 +texworks (0.5~svn1007-1) unstable; urgency=low
 +
 +  * New Upstream Release (rev 1007).
 +  * Updated copyright file: added Charlie Sharpsteen as Upstream Authors.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Wed, 02 May 2012 16:27:37 +0900
 +
 +texworks (0.5~svn956-1) unstable; urgency=low
 +
 +  * New Upstream Release (rev 956).
 +  * Fixed hunspell dictionaries problem with a setting -DTW_DICPATH in rules.
 +    (Closes: #657702)
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Tue, 31 Jan 2012 08:55:10 +0900
 +
 +texworks (0.5~svn952-1) unstable; urgency=low
 +
 +  * New Upstream Release (rev 952).
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 12 Dec 2011 15:44:20 +0900
 +
 +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).
 +  * Applied a patch suggested by Jakub Wilk <jwilk AT debian.org>
 +    (Closes: #632393)
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 26 Sep 2011 15:39:22 +0900
 +
 +texworks (0.5~svn930-1) unstable; urgency=low
 +
 +  * New upstream release (rev 930).
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Thu, 18 Aug 2011 11:22:40 +0900
 +
 +texworks (0.5~svn862-1) unstable; urgency=low
 +
 +  * New upstream release (rev 862).
 +  * Installed manual borrowed from the latest stable version 0.4.3
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Thu, 14 Jul 2011 08:24:37 +0900
 +
 +texworks (0.5~svn843-1) unstable; urgency=low
 +
 +  * New upstream release (rev. 846).
 +    I tested to build the package on AMD64 and found no problem.
 +    (Closes: #628276)
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 13 Jun 2011 17:50:43 +0900
 +
 +texworks (0.5~svn808-1) unstable; urgency=low
 +
 +  * New Upstream Release (rev. 808).  (Closes: #625543)
 +  * Fixed/Updated copyright file; added Stefan Löffler as Upstream Authors.
 +  * Updated README.Debian a bit.
 +  * Changed to use texworks.desktop, texworks.1 and .png files
 +    of source trees instead of obsolete ones under debian.
 +    To do so, refined rules file a bit.
 +  * Updated control file and removed unnecessary texworks.menu and COPYING.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Fri, 06 May 2011 12:54:27 +0900
 +
 +texworks (0.4.0-2) unstable; urgency=low
 +
 +  * Added english manual.
 +  * Updated Build-Depends; removed sharutils and replaced python2.6-dev with
 +    python-dev
 +  * Removed obsolete debian/patch-print and debian/document-print.png.enc
 +  * Added texworks-help-en package which included manual for texworks.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 04 Apr 2011 13:42:12 +0900
 +
 +texworks (0.4.0-1) unstable; urgency=low
 +
 +  * New Upstream Release, now 0.4.0. (Rev. 759).
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Tue, 22 Mar 2011 09:16:16 +0900
 +
 +texworks (0.3~svn741-1) unstable; urgency=low
 +
 +  * New Upstream Release. (Rev. 741)
 +  * Removed printing support.  Now it will offer to open the document
 +    in the system's default viewer.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Tue, 21 Dec 2010 21:17:41 +0900
 +
 +texworks (0.3~svn671-2) unstable; urgency=low
 +
 +  * Uploaded to unstable.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Thu, 19 Aug 2010 15:15:38 +0900
 +
 +texworks (0.3~svn671-1) experimental; urgency=low
 +
 +  * New Upstream Release. (Rev.671)
 +  * Updated patches.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Tue, 03 Aug 2010 15:31:17 +0900
 +
 +texworks (0.3~svn606-1) experimental; urgency=low
 +
 +  * New Upstream Release. (Rev.606)
 +  * Updated patches.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Thu, 15 Apr 2010 08:15:38 +0900
 +
 +texworks (0.3~svn569-3) experimental; urgency=low
 +
 +  * Fixed TWPythonPlugin compilation problems on AMD64 by consulting
 +    a package of Stefan Löffler.  (Closes: #570841)
 +  * Modified TW_HELPPATH as a package of Stefan Löffler.  I expect one can
 +    use a texworks-help-en package by Stefan Löffler now.
 +  * Added LuaTeX in a list of Typeset engines for experiment.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 22 Feb 2010 12:52:39 +0900
 +
 +texworks (0.3~svn569-2) experimental; urgency=low
 +
 +  * Added Lua and Python scripting plugins.  These are called
 +    texworks-scripting-lua and texworks-scripting-python following packages
 +    (Ubuntu version) of Stefan Löffler.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Thu, 18 Feb 2010 09:14:31 +0900
 +
 +texworks (0.3~svn569-1) experimental; urgency=low
 +
 +  * SVN version for experiment.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Mon, 15 Feb 2010 22:09:05 +0900
 +
 +texworks (0.2.3-2) unstable; urgency=low
 +
 +  * Rebuild under poppler 0.12  (Closes: #551435)
 +  * Added note on synctex feature in README.Debian
 +  * Fixed copyright file to express Jérôme Laurens correctly
 +  * Added texlive-latex-base and texlive-xetex to Recommends and Suggests
 +    respectively.
 +  * Moved "uudecode debian/document-print.png.enc" to configure-stamp
 +    from build-stamp because configure searched it.
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Sun, 18 Oct 2009 19:16:52 +0900
 +
 +texworks (0.2.3-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #538211)
 +
 + -- Atsuhito KOHDA <kohda@debian.org>  Sun, 11 Oct 2009 15:25:52 +0900
diff --cc debian/control
index 18fc0d4,0000000..b23fe79
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,44 -1,0 +1,44 @@@
 +Source: texworks
 +Section: editors
 +Priority: extra
 +Maintainer: Atsuhito KOHDA <kohda@debian.org>
- Build-Depends: debhelper (>= 7), libhunspell-dev, qt4-dev-tools, libpoppler-qt4-dev, libdbus-1-dev, liblua5.1-0-dev, python-dev, zlib1g-dev
- Standards-Version: 3.8.3
++Build-Depends: debhelper (>= 7), pkg-config, cmake (>= 2.8.6), libhunspell-dev, libqt4-dev, libpoppler-qt4-dev, liblua5.2-dev, python-dev, zlib1g-dev
++Standards-Version: 3.9.5
 +Homepage: http://www.tug.org/texworks/
 +
 +Package: texworks
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Recommends: texlive-latex-base, texworks-help-en
++Recommends: gsfonts, poppler-data, texlive-latex-base, texworks-help-en
 +Suggests: texlive-xetex, texworks-scripting-lua, texworks-scripting-python
 +Description: Environment for authoring TeX (LaTeX, ConTeXt, etc) documents
 + An environment for authoring TeX (LaTeX, ConTeXt, etc) documents, with
 + a Unicode-based, TeX-aware editor, integrated PDF viewer, and a clean,
 + simple interface accessible to casual and non-technical users.
 + .
 + TeXworks is inspired by Dick Koch's award-winning TeXShop program for
 + Mac OS X, which has made quality typesetting through TeX accessible to
 + a wider community of users, without a technical or intimidating face.
 + The goal of TeXworks is to deliver a similarly integrated, easy-to-use
 + environment for users on other platforms, especially GNU/Linux and Windows.
 +
 +Package: texworks-scripting-lua
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, texworks
 +Description: Plugin to bring Lua scripting to TeXworks
 + .
 + For further information, see http://tug.org/texworks/
 +
 +Package: texworks-scripting-python
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, texworks
 +Description: Plugin to bring Python scripting to TeXworks
 + .
 + For further information, see http://tug.org/texworks/
 +
 +Package: texworks-help-en
 +Architecture: all
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${misc:Depends}
 +Recommends: texworks
 +Description: English help files for TeXworks
 + For furter information, see http://tug.org/texworks/
diff --cc debian/patch-cm
index 0000000,0000000..676f432
new file mode 100644
--- /dev/null
+++ b/debian/patch-cm
@@@ -1,0 -1,0 +1,31 @@@
++--- CMakeLists.txt~	2014-05-15 10:53:07.125865154 +0900
+++++ CMakeLists.txt	2014-05-15 11:02:06.981435376 +0900
++@@ -110,7 +110,7 @@
++ 
++ # Options controlling the creation of scripting language plugins.
++ OPTION(WITH_LUA "Build TeXworks Lua plugin?" ON)
++-OPTION(WITH_PYTHON "Build TeXworks Python plugin?" OFF)
+++OPTION(WITH_PYTHON "Build TeXworks Python plugin?" ON)
++ 
++ # On OS X we default to linking against the Python libraries provided by Apple
++ # even if other Pythons are available. This helps when building
++@@ -121,7 +121,7 @@
++ ENDIF ()
++ 
++ IF (UNIX AND NOT APPLE)
++-  SET(TeXworks_HELP_DIR share/doc/texworks-help CACHE PATH "Path where TeXworks looks for help files")
+++  SET(TeXworks_HELP_DIR share/texworks-help CACHE PATH "Path where TeXworks looks for help files")
++   SET(TeXworks_DIC_DIR /usr/share/myspell/dicts CACHE PATH "Path where TeXworks looks for spellchecking dictionaries")
++   SET(TeXworks_DOCS_DIR share/doc/texworks CACHE PATH "Path in which documentation files are installed")
++   SET(TeXworks_ICON_DIR share/pixmaps CACHE PATH "Path in which icons are installed")
++--- src/TWUtils.cpp~	2014-05-14 16:18:49.217408113 +0900
+++++ src/TWUtils.cpp	2014-05-15 11:01:26.641465563 +0900
++@@ -51,6 +51,8 @@
++ #endif
++ #ifndef TW_HELPPATH
++ #define TW_HELPPATH "/usr/local/share/texworks-help"
+++#else
+++#define TW_HELPPATH "/usr/share/texworks-help"
++ #endif
++ #endif
++ 
diff --cc debian/rules
index 88d3bd9,0000000..c4ac5a3
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,149 -1,0 +1,106 @@@
 +#!/usr/bin/make -f
 +# -*- makefile -*-
 +# Sample debian/rules that uses debhelper.
 +# This file was originally written by Joey Hess and Craig Small.
 +# As a special exception, when this file is copied by dh-make into a
 +# dh-make output file, you may use that output file without restriction.
 +# This special exception was added by Craig Small in version 0.37 of dh-make.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
- export PYTHON = $(shell pyversions -d)
- 
- USDIR=$(CURDIR)/debian/texworks/usr/share
- PLIDIR=plugins-src/TWLuaPlugin
- PLIPYT=plugins-src/TWPythonPlugin
++# For hardening in case CMake
++DPKG_EXPORT_BUILDFLAGS = 1
++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
- #	qmake-qt4 
++	patch -p0 < ./debian/patch-cm
++	mkdir build && cd build && cmake .. -DTW_BUILD_ID='Debian' -DCMAKE_INSTALL_PREFIX='$(CURDIR)/debian/tmp/usr' && cd ..
 +
 +	touch configure-stamp
 +
 +build: build-arch build-indep
 +build-arch: build-stamp
- build-indep: build-stamp
++build-indep: 
 +
 +build-stamp: configure-stamp  
 +	dh_testdir
- 
- 	# Add here commands to compile the package.
- 	# Lua plugin
- 	cd $(PLIDIR) && qmake-qt4 -after \
- 	'QMAKE_CXXFLAGS -= -DTW_BUILD_ID=personal -DTW_HELPPATH=\\\"/usr/local/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/local/lib/texworks\\\"' \
- 	'QMAKE_CXXFLAGS += -DTW_BUILD_ID=Debian -DTW_HELPPATH=\\\"/usr/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/lib/texworks\\\"' \
- 	'target.path = /usr/lib/texworks' \
- 	&& $(MAKE)
- 	# Python plugin
- 	cd $(PLIPYT) && qmake-qt4 -after \
- 	'QMAKE_CXXFLAGS -= -DTW_BUILD_ID=personal -DTW_HELPPATH=\\\"/usr/local/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/local/lib/texworks\\\"' \
- 	'QMAKE_CXXFLAGS += -DTW_BUILD_ID=Debian -DTW_HELPPATH=\\\"/usr/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/lib/texworks\\\"' \
- 	'target.path = /usr/lib/texworks' \
- 	&& $(MAKE)
- 	qmake-qt4 \
- 	'INSTALL_PREFIX = /usr' \
- 	-after \
- 	'QMAKE_CXXFLAGS -= -DTW_BUILD_ID=personal -DTW_HELPPATH=\\\"/usr/local/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/local/lib/texworks\\\" -DTW_DICPATH=\\\"/usr/share/myspell/dicts\\\"' \
- 	'QMAKE_CXXFLAGS += -DTW_BUILD_ID=Debian -DTW_HELPPATH=\\\"/usr/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/lib/texworks\\\" -DTW_DICPATH=\\\"/usr/share/hunspell\\\"' \
- 	TeXworks.pro \
- 	&& $(MAKE)
- 	#docbook-to-man debian/texworks.sgml > texworks.1
- 
++	cd build && $(MAKE)
 +	touch $@
 +
++
 +clean: 
 +	dh_testdir
 +	dh_testroot
- 	rm -f build-stamp configure-stamp 
- 
- 	# Add here commands to clean up after the build process.
- 	if [ -f Makefile ]; then $(MAKE) clean; fi
- 	rm -f ./texworks ./Makefile src/DefaultBinaryPaths.h
- 	if [ -d moc ]; then rmdir moc; fi
- 	if [ -d objs ]; then rmdir objs; fi
- 	if [ -d rcc ]; then rmdir rcc; fi
- 	if [ -d ui ]; then rmdir ui; fi
- 	if [ -f $(PLIDIR)/Makefile ]; then cd $(PLIDIR) && $(MAKE) clean; fi
- 	if [ -d $(PLIDIR)/moc ]; then rmdir $(PLIDIR)/moc; fi
- 	if [ -d $(PLIDIR)/objs ]; then rmdir $(PLIDIR)/objs; fi
- 	if [ -d $(PLIDIR)/rcc ]; then rmdir $(PLIDIR)/rcc; fi
- 	if [ -d $(PLIDIR)/ui ]; then rmdir $(PLIDIR)/ui; fi
- 	if [ -f $(PLIPYT)/Makefile ]; then cd $(PLIPYT) && $(MAKE) clean; fi
- 	if [ -d $(PLIPYT)/moc ]; then rmdir $(PLIPYT)/moc; fi
- 	if [ -d $(PLIPYT)/objs ]; then rmdir $(PLIPYT)/objs; fi
- 	if [ -d $(PLIPYT)/rcc ]; then rmdir $(PLIPYT)/rcc; fi
- 	if [ -d $(PLIPYT)/ui ]; then rmdir $(PLIPYT)/ui; fi
- 	patch -NRp1 < ./debian/patch-py || true
++	rm -rf build build-stamp configure-stamp
 +
- 	rm -f $(PLIDIR)/libTWLuaPlugin.so $(PLIDIR)/Makefile
- 	rm -f $(PLIPYT)/libTWPythonPlugin.so $(PLIPYT)/Makefile
++	patch -NRp1 < ./debian/patch-py || true
++	patch -NRp0 < ./debian/patch-cm || true
 +
 +	dh_clean 
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_prep  
- 	dh_installdirs -A
- 
- 	# Add here commands to install the package into debian/texworks.
- 	qmake-qt4 \
- 	'INSTALL_PREFIX = /usr' \
- 	-after \
- 	'QMAKE_CXXFLAGS -= -DTW_BUILD_ID=personal -DTW_HELPPATH=\\\"/usr/local/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/local/lib/texworks\\\" -DTW_DICPATH=\\\"/usr/share/myspell/dicts\\\"' \
- 	'QMAKE_CXXFLAGS += -DTW_BUILD_ID=Debian -DTW_HELPPATH=\\\"/usr/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/lib/texworks\\\" -DTW_DICPATH=\\\"/usr/share/hunspell\\\"' \
- 	TeXworks.pro \
- 	&& $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/texworks install
- 	# unnecessary file(lintial warning)
- 	rm -f $(CURDIR)/debian/texworks/usr/share/doc/texworks/COPYING*
- 	install -m 755 -p "$(PLIDIR)/libTWLuaPlugin.so" \
- 	$(CURDIR)/debian/texworks-scripting-lua/usr/lib/texworks
- 	install -m 755 -p "$(PLIPYT)/libTWPythonPlugin.so" \
- 	$(CURDIR)/debian/texworks-scripting-python/usr/lib/texworks
- 	# Install the manual
- 	rm -rf $(CURDIR)/debian/texworks/usr/share/texworks-help/en
- 	cp -r manual $(CURDIR)/debian/texworks-help-en/usr/share/texworks-help/TeXworks-manual
++	dh_installdirs
++
 +
 +# Build architecture-independent files here.
 +binary-indep: install
- # We have nothing to do by default.
++	dh_testdir
++	dh_testroot
++	dh_prep
++
++	dh_installchangelogs
++	dh_installdirs
++	dh_installdocs
++
++	# Install the manual
++#	mkdir --parents $(CURDIR)/debian/tmp/usr/share/texworks-help/
++#	cp -r manual $(CURDIR)/debian/tmp/usr/share/texworks-help/TeXworks-manual
++
++	dh_compress
++	dh_fixperms
++	dh_installdeb
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
 +
 +# Build architecture-dependent files here.
 +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
++	rm $(CURDIR)/debian/tmp/usr/share/doc/texworks/COPYING
++
 +	dh_installchangelogs 
- 	dh_installdocs
++	dh_installdocs -XCOPYING
 +	dh_installexamples
- #	dh_install
++	dh_install
++	rm -r $(CURDIR)/debian/texworks/usr/share/texworks-help
 +	dh_installmenu
- #	dh_installdebconf
- #	dh_installlogrotate
- #	dh_installemacsen
- #	dh_installpam
- #	dh_installmime
- #	dh_python
- #	dh_installinit
- #	dh_installcron
- #	dh_installinfo
 +	dh_installman 
 +	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
- #	dh_perl
- #	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install configure
 +#%:
 +#	dh  $@
diff --cc debian/texworks-help-en.install
index 0000000,0000000..b090235
new file mode 100644
--- /dev/null
+++ b/debian/texworks-help-en.install
@@@ -1,0 -1,0 +1,1 @@@
++debian/tmp/usr/share/texworks-help
diff --cc debian/texworks-scripting-lua.install
index 0000000,0000000..2960477
new file mode 100644
--- /dev/null
+++ b/debian/texworks-scripting-lua.install
@@@ -1,0 -1,0 +1,1 @@@
++debian/tmp/usr/lib/texworks/libTWLuaPlugin.so
diff --cc debian/texworks-scripting-python.install
index 0000000,0000000..eee9071
new file mode 100644
--- /dev/null
+++ b/debian/texworks-scripting-python.install
@@@ -1,0 -1,0 +1,1 @@@
++debian/tmp/usr/lib/texworks/libTWPythonPlugin.so
diff --cc debian/texworks.install
index 0000000,0000000..a4ffe7f
new file mode 100644
--- /dev/null
+++ b/debian/texworks.install
@@@ -1,0 -1,0 +1,2 @@@
++debian/tmp/usr/bin*
++debian/tmp/usr/share*
diff --cc src/DefaultBinaryPaths.h
index 0000000,0000000..60e868b
new file mode 100644
--- /dev/null
+++ b/src/DefaultBinaryPaths.h
@@@ -1,0 -1,0 +1,3 @@@
++// Default paths to TeX binaries, for TeXworks
++// Generated by /home/atsuhito/misc/pack/TeXworks/texworks-0.5~svn1363/getDefaultBinPaths.sh
++#define DEFAULT_BIN_PATHS "/usr/local/texlive/2013/bin/x86_64-linux:/usr/local/texlive/2012/bin/x86_64-linux:/usr/local/texlive/2011/bin/x86_64-linux:/usr/local/texlive/2010/bin/x86_64-linux:/usr/local/texlive/2009/bin/x86_64-linux:/usr/local/texlive/2008/bin/x86_64-linux:/usr/local/texlive/2007/bin/x86_64-linux:/usr/local/bin:/usr/bin"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texworks.git


Reply to: