[Python-apps-commits] r4624 - in packages/eric/trunk/debian (6 files)
gudjon-guest at users.alioth.debian.org
gudjon-guest at users.alioth.debian.org
Sun Jan 31 09:47:03 UTC 2010
Date: Sunday, January 31, 2010 @ 09:47:01
Author: gudjon-guest
Revision: 4624
Add manpage and fix gen_*_api.py scripts. Not ready for upload
Added:
packages/eric/trunk/debian/debian-manpages/eric4-sqlbrowser.1
packages/eric/trunk/debian/debian-manpages/eric4-webbrowser.1
Modified:
packages/eric/trunk/debian/changelog
packages/eric/trunk/debian/gen_sip_apis.py
packages/eric/trunk/debian/patches/series
packages/eric/trunk/debian/rules
Modified: packages/eric/trunk/debian/changelog
===================================================================
--- packages/eric/trunk/debian/changelog 2010-01-30 23:43:14 UTC (rev 4623)
+++ packages/eric/trunk/debian/changelog 2010-01-31 09:47:01 UTC (rev 4624)
@@ -1,11 +1,13 @@
eric (4.4.0-1) unstable; urgency=low
* New upstream release
- * Change patch system to quilt
+ * Switch to dpkg-source 3.0 (quilt) format
* Patches 03_installer_fix, 04_documentation_paths removed, seem to be
unecessary.
+ * Add manpage eric4-sqlbrowser and eric4-webbrowser
+ * Fix gen_*_api.py scripts
- -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sat, 23 Jan 2010 11:06:27 +0100
+ -- Gudjon I. Gudjonsson <gudjon at gudjon.org> Sun, 31 Jan 2010 10:11:37 +0100
eric (4.3.10-1) unstable; urgency=low
Added: packages/eric/trunk/debian/debian-manpages/eric4-sqlbrowser.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric4-sqlbrowser.1 (rev 0)
+++ packages/eric/trunk/debian/debian-manpages/eric4-sqlbrowser.1 2010-01-31 09:47:01 UTC (rev 4624)
@@ -0,0 +1,70 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ERIC4-SQLBROWSER 1 "January 31, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+eric4-sqlbrowser \- eric4 SQL Browser
+.SH SYNOPSIS
+.B eric4-sqlbrowser
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B eric4-sqlbrowser
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBeric4-sqlbrowser\fP is an SQL browser to manage the content of SQL databases. It can be used from inside the eric4 IDE or as a standalone application.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-\-version
+Show version of program and exit.
+.B \-\-config=configDir
+Use the given directory as the one containing the config files
+.B \-\-nokde
+Don't use KDE widgets
+.SH SEE ALSO
+.BR eric4 (1),
+.BR eric4-api (1),
+.BR eric4-compare (1),
+.BR eric4-configure (1),
+.BR eric4-diff (1),
+.BR eric4-doc (1),
+.BR eric4-editor (1),
+.BR eric4-helpviewer (1),
+.BR eric4-plugininstall (1),
+.BR eric4-pluginrepository (1),
+.BR eric4-qregexp (1),
+.BR eric4-re (1),
+.BR eric4-tray (1),
+.BR eric4-trpreviewer (1),
+.BR eric4-uipreviewer (1),
+.BR eric4-unittest (1),
+.BR eric4-webbrowser (1)
+.br
+.SH AUTHOR
+This manual page was written by Torsten Marek <shlomme at gmx.net>,
+for the Debian project (but may be used by others).
Added: packages/eric/trunk/debian/debian-manpages/eric4-webbrowser.1
===================================================================
--- packages/eric/trunk/debian/debian-manpages/eric4-webbrowser.1 (rev 0)
+++ packages/eric/trunk/debian/debian-manpages/eric4-webbrowser.1 2010-01-31 09:47:01 UTC (rev 4624)
@@ -0,0 +1,72 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH ERIC4-WEBBROWSER 1 "January 31, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+eric4-webbrowser \- eric4 web browser
+.SH SYNOPSIS
+.B eric4-webbrowser
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B eric4-webbrowser
+command.
+This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBeric4-webbrowser\fP is a web browser to read the HTML pages for the Qt API and the eric4 documentation. It can be used from inside the eric4 IDE or as a standalone application.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.B \-\-config=configDir
+Use the given directory as the one containing the config files
+.B \-\-nokde
+Don't use KDE widgets
+.B \-\-search=word
+Search for the given word
+.SH SEE ALSO
+.BR eric4 (1),
+.BR eric4-api (1),
+.BR eric4-compare (1),
+.BR eric4-configure (1),
+.BR eric4-diff (1),
+.BR eric4-doc (1),
+.BR eric4-editor (1),
+.BR eric4-helpviewer (1),
+.BR eric4-plugininstall (1),
+.BR eric4-pluginrepository (1),
+.BR eric4-qregexp (1),
+.BR eric4-re (1),
+.BR eric4-sqlbrowser (1),
+.BR eric4-tray (1),
+.BR eric4-trpreviewer (1),
+.BR eric4-uipreviewer (1),
+.BR eric4-unittest (1),
+.br
+.SH AUTHOR
+This manual page was written by Torsten Marek <shlomme at gmx.net>,
+for the Debian project (but may be used by others).
Modified: packages/eric/trunk/debian/gen_sip_apis.py
===================================================================
--- packages/eric/trunk/debian/gen_sip_apis.py 2010-01-30 23:43:14 UTC (rev 4623)
+++ packages/eric/trunk/debian/gen_sip_apis.py 2010-01-31 09:47:01 UTC (rev 4624)
@@ -1,9 +1,10 @@
#!/usr/bin/env python
+# -*- coding: utf-8 -*-
# Copyright (c) 2002-2004 Detlev Offenbach <detlev at die-offenbachs.de>
# Adapted for usage with Debian by Torsten Marek <shlomme at gmx.net>
import os
import sys
-import pyqtconfig
+import PyQt4.pyqtconfig as pyqtconfig
apidir = sys.argv[1]
if not os.path.isdir(apidir):
@@ -35,13 +36,15 @@
qtsipdir = os.path.abspath(pyqtconfig._pkg_config['pyqt_sip_dir'])
modules = pyqtconfig._pkg_config['pyqt_modules'].split()
+#createAPIFiles(qtsipdir, modules, [],
+# lambda x: pyqtconfig._pkg_config["pyqt_%s_sip_flags" % (x,)].split())
createAPIFiles(qtsipdir, modules, [],
- lambda x: pyqtconfig._pkg_config["pyqt_%s_sip_flags" % (x,)].split())
+ lambda x: pyqtconfig._pkg_config["pyqt_sip_flags"].split())
try:
- import pykdeconfig
- kdesipdir = "/usr/share/sip/kde3"
+ import PyKDE4.pykdeconfig as pykdeconfig
+ kdesipdir = "/usr/share/sip/PyKDE4"
modules = pykdeconfig._pkg_config['pykde_modules'].split()
extraimport = []
@@ -52,6 +55,6 @@
extraimport.extend(["-I", qtsipdir])
createAPIFiles(kdesipdir, modules, extraimport,
- lambda x: pykdeconfig._pkg_config["pykde_kde_sip_flags"].split(" "))
+ lambda x: pykdeconfig._pkg_config["pykde_kde_sip_flags"].split())
except:
- pass
+ print "Error: No PyKDE4 api files generated"
Modified: packages/eric/trunk/debian/patches/series
===================================================================
--- packages/eric/trunk/debian/patches/series 2010-01-30 23:43:14 UTC (rev 4623)
+++ packages/eric/trunk/debian/patches/series 2010-01-31 09:47:01 UTC (rev 4624)
@@ -2,3 +2,4 @@
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-30 23:43:14 UTC (rev 4623)
+++ packages/eric/trunk/debian/rules 2010-01-31 09:47:01 UTC (rev 4624)
@@ -6,13 +6,11 @@
ERICDIR=debian/eric/usr/share/eric/modules
QTAPIFILE=debian/apis/pyqt.api
-#KDEAPIFILE=debian/apis/pykde.api
+KDEAPIFILE=debian/apis/pykde.api
PYTHONAPIFILE=debian/apis/python.api
-APIFILES=debian/apis/*.api
-#APIFILES=$(QTAPIFILE) $(PYTHONAPIFILE) # $(KDEAPIFILE)
-include /usr/share/quilt/quilt.make
+APIFILES=$(QTAPIFILE) $(PYTHONAPIFILE) $(KDEAPIFILE)
-clean: unpatch
+clean:
dh_testdir
dh_testroot
find . -name "*.pyc" -exec rm {} \;
@@ -26,9 +24,9 @@
# generate API files
mkdir -p debian/apis
python debian/gen_sip_apis.py debian/apis/
- #PYTHONPATH="" python debian/gen_python_api.py debian/apis/
+ python debian/gen_python_api.py debian/apis/
sort -u debian/apis/qt*.api > $(QTAPIFILE)
-# sort -u debian/apis/k*.api debian/apis/dcop.api > $(KDEAPIFILE)
+ sort -u debian/apis/k*.api debian/apis/dcop.api > $(KDEAPIFILE)
touch apifile-stamp
build:
@@ -55,7 +53,7 @@
# 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/APIs
for i in $(APIFILES); do \
install -o root -g root -m 644 $$i \
@@ -68,7 +66,7 @@
rm -rf debian/eric/usr/share/eric/modules/ThirdParty
# Build architecture-independent files here.
-binary: $(QUILT_STAMPFN) install
+binary: install
dh_testdir -i
dh_testroot -i
dh_installchangelogs
More information about the Python-apps-commits
mailing list