[Python-apps-commits] r4626 - in packages/eric/trunk/debian (5 files)

[gudjon-guest at users.alioth.debian.org]

    Date: Monday, February 1, 2010 @ 06:05:33
  Author: gudjon-guest
Revision: 4626

Still problems with python3 modules. Otherwise ready.

Modified:
  packages/eric/trunk/debian/changelog
  packages/eric/trunk/debian/control
  packages/eric/trunk/debian/manpages
  packages/eric/trunk/debian/patches/series
  packages/eric/trunk/debian/rules

Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog	2010-01-31 10:42:27 UTC (rev 4625)
+++ packages/eric/trunk/debian/changelog	2010-02-01 06:05:33 UTC (rev 4626)
@@ -8,8 +8,10 @@
   * Fix gen_*_api.py scripts
   * Minor changes to other manpages
   * Create separate gen_qt/kde_api.py scripts
+  * Add dependency on python-simplejson
+  * Bump standards version to 3.8.4, no changes needed
 
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Sun, 31 Jan 2010 11:41:59 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org>  Mon, 01 Feb 2010 06:14:43 +0100
 
 eric (4.3.10-1) unstable; urgency=low
 

Modified: packages/eric/trunk/debian/control
===================================================================
--- packages/eric/trunk/debian/control	2010-01-31 10:42:27 UTC (rev 4625)
+++ packages/eric/trunk/debian/control	2010-02-01 06:05:33 UTC (rev 4626)
@@ -6,15 +6,16 @@
 Build-Depends: debhelper (>= 5.0.38), quilt
 Build-Depends-Indep: python-all (>= 2.4.4-2), python-qt4 (>= 4.5), python-qt4-dev (>= 4.5),
  sip4 (>= 4.9), qt4-dev-tools, python-support, python-qscintilla2 (>=2.4-3),
- python-qt-dev, libqt4-dev
+ python-qt-dev, libqt4-dev, python-kde4-dev
 XS-Python-Version: >=2.4
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://eric-ide.python-projects.org/
 
 Package: eric
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-qt4 (>= 4.5), python-sip4 (>=4.9),
- bicyclerepair (>= 0.9-4.1),  python-pygments, python-chardet, python-qscintilla2 (>=2.4-3)
+ bicyclerepair (>= 0.9-4.1), python-pygments, python-chardet, python-qscintilla2 (>=2.4-3),
+ python-simplejson
 Recommends: eric-api-files
 Suggests: qt4-designer, qt4-doc-html, pyqt4-dev-tools,
  qt4-dev-tools, ruby, python-doc, python-qt4-doc, python-kde4-doc, python-profiler,

Modified: packages/eric/trunk/debian/manpages
===================================================================
--- packages/eric/trunk/debian/manpages	2010-01-31 10:42:27 UTC (rev 4625)
+++ packages/eric/trunk/debian/manpages	2010-02-01 06:05:33 UTC (rev 4626)
@@ -15,3 +15,5 @@
 debian/debian-manpages/eric4-pluginrepository.1
 debian/debian-manpages/eric4-pluginuninstall.1
 debian/debian-manpages/eric4-tray.1
+debian/debian-manpages/eric4-webbrowser.1
+debian/debian-manpages/eric4-sqlbrowser.1
\ No newline at end of file

Modified: packages/eric/trunk/debian/patches/series
===================================================================
--- packages/eric/trunk/debian/patches/series	2010-01-31 10:42:27 UTC (rev 4625)
+++ packages/eric/trunk/debian/patches/series	2010-02-01 06:05:33 UTC (rev 4626)
@@ -2,4 +2,3 @@
 02_missing-profile.patch
 03_disable-update-warning.patch
 04_debian_chardet.patch
-debian-changes-4.4.0-1

Modified: packages/eric/trunk/debian/rules
===================================================================
--- packages/eric/trunk/debian/rules	2010-01-31 10:42:27 UTC (rev 4625)
+++ packages/eric/trunk/debian/rules	2010-02-01 06:05:33 UTC (rev 4626)
@@ -8,13 +8,14 @@
 QTAPIFILE=debian/apis/pyqt.api
 KDEAPIFILE=debian/apis/pykde.api
 PYTHONAPIFILE=debian/apis/python.api
-APIFILES=$(QTAPIFILE) $(PYTHONAPIFILE) $(KDEAPIFILE)
+APIFILES=$(QTAPIFILE) $(KDEAPIFILE)
+# $(PYTHONAPIFILE)
 
 clean:
 	dh_testdir
 	dh_testroot
 	find . -name "*.pyc" -exec rm {} \;
-	rm -rf debian/eric debian/apis
+	rm -rf debian/eric debian/apis debian/qtapis debian/kdeapis debian/pyapis
 	rm -f eric4*
 	rm -f *-stamp
 	dh_clean 
@@ -25,10 +26,10 @@
 	mkdir -p debian/qtapis debian/kdeapis debian/pyapis debian/apis
 	python debian/gen_qt_apis.py debian/qtapis/
 	python debian/gen_kde_apis.py debian/kdeapis/
-	python debian/gen_python_api.py debian/pyapis/
+	#python debian/gen_python_api.py debian/pyapis/
 	sort -u debian/qtapis/*.api > $(QTAPIFILE)
 	sort -u debian/kdeapis/*.api > $(KDEAPIFILE)
-	sort -u debian/pyapis/*.api > $(PYAPIFILE)
+	#sort -u debian/pyapis/*.api > $(PYAPIFILE)
 	touch apifile-stamp
 
 build:
@@ -40,11 +41,6 @@
 	python install.py -i debian/eric -x -c -f debian/eric4config.debian
 	dh_installdirs -i
 
-	for i in $(ERICDIR)/*.py $(ERICDIR)/DebugClients/Python/PyCoverage.py; do\
-		sed -e "/^\#\!.*/ d" $$i > $$i.temp;\
-		mv $$i.temp $$i;\
-	done
-
 	for i in debian/i18n/*.ts; do\
 		lrelease-qt4 $$i -qm debian/eric/usr/share/qt4/translations/`basename $$i .ts`.qm;\
 	done
@@ -54,21 +50,23 @@
 	rm -f $(ERICDIR)/install*.py
 
 #   copy API files
-	cp eric/APIs/Python/eric4.api debian/eric-api-files/usr/share/eric/api
-	mv debian/eric/usr/share/eric/*.api debian/eric-api-files/usr/share/eric/APIs
+	mv debian/eric/usr/share/eric/api/* debian/eric-api-files/usr/share/eric/api
 
 	for i in $(APIFILES); do \
 		install -o root -g root -m 644 $$i \
-			debian/eric-api-files/usr/share/eric/api/; \
+			debian/eric-api-files/usr/share/eric/api/python; \
 	done
 
-#   remove README-PyXML.txt
+#	remove README-PyXML.txt
 	rm -f debian/eric/usr/share/doc/eric/README-PyXML.txt
-#   remove the ThirdParty libraries
+#	remove the ThirdParty libraries
 	rm -rf debian/eric/usr/share/eric/modules/ThirdParty
 
+binary: binary-indep binary-arch
+binary-arch:
+
 # Build architecture-independent files here.
-binary: install
+binary-indep: install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs
@@ -85,4 +83,4 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-.PHONY: clean binary install
+.PHONY: clean binary-indep binary-arch binary install