[Python-apps-commits] r12877 - in packages/eric/trunk/debian (8 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sun Mar 6 10:06:56 UTC 2016
Date: Sunday, March 6, 2016 @ 10:06:55
Author: gudjon-guest
Revision: 12877
* New upstream release
* Update translations directory to
/usr/share/qt5/translations (Closes: #815747)
* Add dependency on python3-pyqt5.qtsvg (Closes: #815749)
* Add translations to .deb file (Closes: #815747)
* Bump standards version to 3.9.7
* Remove eric.menu file
* Change VCS field from http to https
* Chinese translation file renamed from zh_CN.GB2312 to zh_CN in upstream
* Add patch 08_fix_segfault which is needed only for version 6.1.2
* Add patch 09_message_filter to avoid unimportant error messages
Added:
packages/eric/trunk/debian/patches/08_fix_segfault.patch
packages/eric/trunk/debian/patches/09_message_filter.patch
Modified:
packages/eric/trunk/debian/changelog
packages/eric/trunk/debian/control
packages/eric/trunk/debian/eric6config.debian
packages/eric/trunk/debian/patches/series
packages/eric/trunk/debian/rules
Deleted:
packages/eric/trunk/debian/eric.menu
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2016-03-05 13:10:37 UTC (rev 12876)
+++ packages/eric/trunk/debian/changelog 2016-03-06 10:06:55 UTC (rev 12877)
@@ -1,3 +1,19 @@
+eric (6.1.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Update translations directory to
+ /usr/share/qt5/translations (Closes: #815747)
+ * Add dependency on python3-pyqt5.qtsvg (Closes: #815749)
+ * Add translations to .deb file (Closes: #815747)
+ * Bump standards version to 3.9.7
+ * Remove eric.menu file
+ * Change VCS field from http to https
+ * Chinese translation file renamed from zh_CN.GB2312 to zh_CN in upstream
+ * Add patch 08_fix_segfault which is needed only for version 6.1.2
+ * Add patch 09_message_filter to avoid unimportant error messages
+
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sun, 28 Feb 2016 11:02:03 +0100
+
eric (6.0.8-1) unstable; urgency=medium
* New upstream release
Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control 2016-03-05 13:10:37 UTC (rev 12876)
+++ packages/eric/trunk/debian/control 2016-03-06 10:06:55 UTC (rev 12877)
@@ -11,10 +11,10 @@
pyqt5-dev,
python3-sip-dev
X-Python3-Version: >=3.0
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
Homepage: http://eric-ide.python-projects.org/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/eric/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/eric/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/eric/trunk/
Package: eric
Architecture: all
@@ -25,6 +25,7 @@
python3-pyqt5.qsci,
python3-pyqt5.qtsql,
python3-pyqt5.qtwebkit,
+ python3-pyqt5.qtsvg,
${misc:Depends}
Recommends: eric-api-files
Suggests: pyqt5-dev-tools,
Deleted: packages/eric/trunk/debian/eric.menu
===================================================================
--- packages/eric/trunk/debian/eric.menu 2016-03-05 13:10:37 UTC (rev 12876)
+++ packages/eric/trunk/debian/eric.menu 2016-03-06 10:06:55 UTC (rev 12877)
@@ -1,7 +0,0 @@
-?package(eric):\
- needs="X11" \
- section="Applications/Programming"\
- title="eric" \
- longtitle="eric Python IDE" \
- command="/usr/bin/eric" \
- icon="/usr/share/pixmaps/eric.xpm"
Modified: packages/eric/trunk/debian/eric6config.debian
===================================================================
--- packages/eric/trunk/debian/eric6config.debian 2016-03-05 13:10:37 UTC (rev 12876)
+++ packages/eric/trunk/debian/eric6config.debian 2016-03-06 10:06:55 UTC (rev 12877)
@@ -7,7 +7,7 @@
'ericStylesDir' : "/usr/share/eric/Styles",
'ericDocDir' : "/usr/share/doc/eric",
'ericExamplesDir' : "/usr/share/doc/eric/Examples",
- 'ericTranslationsDir' : "/usr/share/qt4/translations",
+ 'ericTranslationsDir' : "/usr/share/qt5/translations",
'ericTemplatesDir' : "/usr/share/eric/DesignerTemplates",
'ericCodeTemplatesDir' : "/usr/share/eric/CodeTemplates",
'ericOthersDir' : "/usr/share/eric",
Added: packages/eric/trunk/debian/patches/08_fix_segfault.patch
===================================================================
--- packages/eric/trunk/debian/patches/08_fix_segfault.patch (rev 0)
+++ packages/eric/trunk/debian/patches/08_fix_segfault.patch 2016-03-06 10:06:55 UTC (rev 12877)
@@ -0,0 +1,13 @@
+Fix error in version 6.1.2 that causes help windows to fail.
+Fixed in version 6.1.3, patch will be removed
+--- a/eric/Helpviewer/HelpWindow.py
++++ b/eric/Helpviewer/HelpWindow.py
+@@ -2252,7 +2252,7 @@
+
+ self.syncManager().close()
+
+- self.zoomManager().close()
++ #self.zoomManager().close()
+
+ self.__virusTotal.close()
+
Added: packages/eric/trunk/debian/patches/09_message_filter.patch
===================================================================
--- packages/eric/trunk/debian/patches/09_message_filter.patch (rev 0)
+++ packages/eric/trunk/debian/patches/09_message_filter.patch 2016-03-06 10:06:55 UTC (rev 12877)
@@ -0,0 +1,12 @@
+Avoids popups when an QXcbConnection error occurs. The error message
+is unimportant.
+--- a/eric/E5Gui/E5ErrorMessage.py
++++ b/eric/E5Gui/E5ErrorMessage.py
+@@ -41,6 +41,7 @@
+ "eric6messagefilters")
+
+ self.__defaultFilters = [
++ "QXcbConnection:",
+ "QFont::",
+ "QCocoaMenu::removeMenuItem",
+ "QCocoaMenu::insertNative",
Modified: packages/eric/trunk/debian/patches/series
===================================================================
--- packages/eric/trunk/debian/patches/series 2016-03-05 13:10:37 UTC (rev 12876)
+++ packages/eric/trunk/debian/patches/series 2016-03-06 10:06:55 UTC (rev 12877)
@@ -5,3 +5,5 @@
05_desktop.patch
06_no_blacklist.patch
07_webbrowser.patch
+08_fix_segfault.patch
+09_message_filter.patch
Modified: packages/eric/trunk/debian/rules
===================================================================
--- packages/eric/trunk/debian/rules 2016-03-05 13:10:37 UTC (rev 12876)
+++ packages/eric/trunk/debian/rules 2016-03-06 10:06:55 UTC (rev 12877)
@@ -9,11 +9,9 @@
QTAPIFILE=debian/apis/pyqt.api
KDEAPIFILE=debian/apis/pykde.api
PYTHONAPIFILE=debian/apis/python.api
-APIFILES=
-#$(QTAPIFILE)
+APIFILES= $(QTAPIFILE) $(PYTHONAPIFILE)
# $(KDEAPIFILE)
-# $(PYTHONAPIFILE)
-LAN=cs de en es fr it pt ru tr zh_CN.GB2312
+LAN=cs de en es fr it pt ru tr zh_CN
clean:
dh_testdir
@@ -29,7 +27,9 @@
apifile-stamp:
# generate API files
- #mkdir -p debian/qtapis debian/kdeapis debian/pyapis debian/apis
+ #mkdir -p debian/qtapis
+ #mkdir -p debian/apis
+ #debian/kdeapis debian/pyapis debian/apis
#python3 debian/gen_qt_apis.py debian/qtapis/
#python debian/gen_kde_apis.py debian/kdeapis/
#python debian/gen_python_api.py debian/pyapis/
@@ -49,9 +49,9 @@
python3 install.py -i debian/eric -x -c -f debian/eric6config.debian
dh_installdirs -i
- #for i in transl-*/eric/i18n/*.ts; do\
- # lrelease-qt4 $$i -qm debian/eric/usr/share/qt4/translations/`basename $$i .ts`.qm;\
- #done
+ for i in transl-*/eric/i18n/*.ts; do\
+ lrelease-qt4 $$i -qm debian/eric/usr/share/qt5/translations/`basename $$i .ts`.qm;\
+ done
rm -f debian/eric/usr/share/doc/eric/LICENSE.GPL3
rm -f $(ERICDIR)/LICENSE.GPL3
@@ -81,8 +81,8 @@
dh_testdir -i
dh_testroot -i
dh_installchangelogs
- dh_installdocs -i --exclude=LICENSE.GPL3
- dh_installmenu -i
+ dh_installdocs -i --exclude=LICENSE.GPL3 --exclude=README
+ #dh_installmenu -i
dh_installman -i
dh_install -i -X__pycache__
dh_link -i
@@ -120,6 +120,6 @@
wget -q http://sourceforge.net/projects/eric-ide/files/eric6/stable/$$VER/eric6-i18n-$$L-$$VER.tar.gz/download\
-O eric_$$VER.orig-transl-$$L.tar.gz;\
done;\
- mv eric_$$VER.orig-transl-zh_CN.GB2312.tar.gz eric_$$VER.orig-transl-zhCNGB2312.tar.gz
+ #mv eric_$$VER.orig-transl-zh_CN.GB2312.tar.gz eric_$$VER.orig-transl-zhCNGB2312.tar.gz
.PHONY: clean binary-indep binary-arch binary install
More information about the Python-apps-commits
mailing list