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

[texworks] 20/73: Imported Debian patch 0.5~svn843-1



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

preining pushed a commit to branch master
in repository texworks.

commit ebd20c82bf21f7d5b2c9ad9882cc92a0d7bb0bf1
Merge: 34b4aa3 2e56753
Author: Atsuhito KOHDA <kohda@debian.org>
Date:   Mon Jun 13 17:50:43 2011 +0900

    Imported Debian patch 0.5~svn843-1

 Info.plist                                         |   3 +
 NEWS                                               |  34 +++-
 README                                             |   4 +-
 TeXworks.plist                                     |   3 +
 TeXworks.plist.in                                  |   3 +
 TeXworks.pro                                       |  31 ++--
 debian/changelog                                   |   8 +
 debian/rules                                       |   4 +-
 lib-patches/README                                 |   5 +-
 .../poppler-bogus-memory-allocation-fix.patch      |  14 ++
 lib-patches/poppler-mac-font-handling.patch        |  95 ++++++++--
 plugins-src/TWLuaPlugin/TWLuaPlugin.pro            |   4 +-
 plugins-src/TWPythonPlugin/TWPythonPlugin.pro      |   4 +-
 res/images/TeXworks-128.png                        | Bin 0 -> 25068 bytes
 res/images/TeXworks-doc-128.png                    | Bin 0 -> 13764 bytes
 res/images/back.PSD                                | Bin 3706 -> 0 bytes
 res/images/back.png                                | Bin 678 -> 0 bytes
 res/images/back2.PSD                               | Bin 3641 -> 0 bytes
 res/images/back2.png                               | Bin 1200 -> 0 bytes
 res/images/down.png                                | Bin 594 -> 0 bytes
 res/images/editcopy.png                            | Bin 1468 -> 0 bytes
 res/images/editcut.png                             | Bin 1512 -> 0 bytes
 res/images/editpaste.png                           | Bin 1906 -> 0 bytes
 res/images/editredo.png                            | Bin 1752 -> 0 bytes
 res/images/editundo.png                            | Bin 1746 -> 0 bytes
 res/images/filenew.png                             | Bin 1172 -> 0 bytes
 res/images/fileopen.png                            | Bin 2185 -> 0 bytes
 res/images/filesave.png                            | Bin 1206 -> 0 bytes
 res/images/first.PSD                               | Bin 4341 -> 0 bytes
 res/images/first.png                               | Bin 1309 -> 0 bytes
 res/images/forward.png                             | Bin 655 -> 0 bytes
 res/images/forward2.PSD                            | Bin 3816 -> 0 bytes
 res/images/forward2.png                            | Bin 1189 -> 0 bytes
 res/images/last.PSD                                | Bin 4504 -> 0 bytes
 res/images/last.png                                | Bin 1292 -> 0 bytes
 res/images/searchfind.png                          | Bin 1836 -> 0 bytes
 res/images/up.png                                  | Bin 692 -> 0 bytes
 res/images/zoom.png                                | Bin 0 -> 1567 bytes
 res/resources.qrc                                  |  85 ++++-----
 res/tango/edit-delete.png                          | Bin 2049 -> 0 bytes
 res/tango/edit-select-all.png                      | Bin 631 -> 0 bytes
 res/tango/go-jump.png                              | Bin 1491 -> 0 bytes
 res/tango/text-x-generic.png                       | Bin 744 -> 0 bytes
 res/tango/view-fullscreen.png                      | Bin 1256 -> 0 bytes
 src/CompletingEdit.cpp                             |  10 +-
 src/CompletingEdit.h                               |   2 +-
 src/PDFDocument.cpp                                |  12 +-
 src/PDFDocument.ui                                 |   5 +-
 src/TWApp.cpp                                      |  20 ++-
 src/TWApp.h                                        |   4 +-
 src/TeXDocument.cpp                                |  38 ++--
 src/TeXDocument.ui                                 |   2 +-
 src/TeXHighlighter.cpp                             |   8 +-
 src/TeXHighlighter.h                               |   3 +
 src/main.cpp                                       |   4 +-
 trans/TeXworks_af.ts                               | 190 ++++++++++----------
 trans/TeXworks_ar.ts                               | 190 ++++++++++----------
 trans/TeXworks_ca.ts                               | 190 ++++++++++----------
 trans/TeXworks_cs.ts                               | 190 ++++++++++----------
 trans/TeXworks_de.ts                               | 190 ++++++++++----------
 trans/TeXworks_fo.ts                               | 190 ++++++++++----------
 trans/TeXworks_fr.ts                               | 190 ++++++++++----------
 trans/TeXworks_pl.ts                               | 190 ++++++++++----------
 trans/TeXworks_ru.qm                               | Bin 48608 -> 52915 bytes
 trans/TeXworks_ru.ts                               |  51 +++---
 trans/TeXworks_sl.qm                               | Bin 53171 -> 53185 bytes
 trans/TeXworks_sl.ts                               | 192 ++++++++++-----------
 win32/texworks-setup-script.iss                    |  33 +++-
 68 files changed, 1214 insertions(+), 987 deletions(-)

diff --cc debian/changelog
index 62ccee0,0000000..3f61b33
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,97 -1,0 +1,105 @@@
++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/rules
index 68b801d,0000000..c861101
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,145 -1,0 +1,145 @@@
 +#!/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
 +
 +USDIR=$(CURDIR)/debian/texworks/usr/share
 +PLIDIR=plugins-src/TWLuaPlugin
 +PLIPYT=plugins-src/TWPythonPlugin
 +
 +configure: configure-stamp
 +configure-stamp:
 +	dh_testdir
 +	# Add here commands to configure the package.
- 	patch -p1 < ./debian/patch-luatex
++#	patch -p1 < ./debian/patch-luatex
 +#	qmake-qt4 
 +
 +	touch configure-stamp
 +
 +
 +build: build-stamp
 +
 +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\\\"' \
 +	'QMAKE_CXXFLAGS += -DTW_BUILD_ID=Debian -DTW_HELPPATH=\\\"/usr/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/lib/texworks\\\"' \
 +	TeXworks.pro \
 +	&& $(MAKE)
 +	#docbook-to-man debian/texworks.sgml > texworks.1
 +
 +	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 obj ]; then rmdir obj; 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)/obj ]; then rmdir $(PLIDIR)/obj; 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)/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 -NRp1 < ./debian/patch-luatex || true
++#	patch -NRp1 < ./debian/patch-luatex || true
 +
 +	rm -f $(PLIDIR)/libTWLuaPlugin.so $(PLIDIR)/Makefile
 +	rm -f $(PLIPYT)/libTWPythonPlugin.so $(PLIPYT)/Makefile
 +
 +	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\\\"' \
 +	'QMAKE_CXXFLAGS += -DTW_BUILD_ID=Debian -DTW_HELPPATH=\\\"/usr/share/texworks-help\\\" -DTW_PLUGINPATH=\\\"/usr/lib/texworks\\\"' \
 +	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
 +#	cp -r manual $(CURDIR)/debian/texworks-help-en/usr/share/texworks-help/TeXworks-manual
 +
 +# Build architecture-independent files here.
 +binary-indep: install
 +# We have nothing to do by default.
 +
 +# Build architecture-dependent files here.
 +binary-arch: install
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs 
 +	dh_installdocs
 +	dh_installexamples
 +#	dh_install
 +	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  $@

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


Reply to: