r10538 - in /desktop/unstable/gnome-orca/debian: ./ patches/
mlang at users.alioth.debian.org
mlang at users.alioth.debian.org
Mon Apr 30 01:59:30 UTC 2007
Author: mlang
Date: Mon Apr 30 01:59:29 2007
New Revision: 10538
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10538
Log:
Convert to cdbs
Added:
desktop/unstable/gnome-orca/debian/patches/01_no_default_desktop_item.patch
- copied unchanged from r10537, desktop/unstable/gnome-orca/debian/patches/01_no_default_desktop_item.dpatch
desktop/unstable/gnome-orca/debian/patches/02_libbrlapi_fix.patch
- copied unchanged from r10537, desktop/unstable/gnome-orca/debian/patches/02_libbrlapi_fix.dpatch
desktop/unstable/gnome-orca/debian/patches/03_manpage_fix.patch
- copied unchanged from r10537, desktop/unstable/gnome-orca/debian/patches/03_manpage_fix.dpatch
desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch
- copied, changed from r10537, desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch
Removed:
desktop/unstable/gnome-orca/debian/patches/00list
desktop/unstable/gnome-orca/debian/patches/01_no_default_desktop_item.dpatch
desktop/unstable/gnome-orca/debian/patches/02_libbrlapi_fix.dpatch
desktop/unstable/gnome-orca/debian/patches/03_manpage_fix.dpatch
desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch
Modified:
desktop/unstable/gnome-orca/debian/control
desktop/unstable/gnome-orca/debian/control.in
desktop/unstable/gnome-orca/debian/gnome-orca-common.install
desktop/unstable/gnome-orca/debian/gnome-orca.install
desktop/unstable/gnome-orca/debian/rules
Modified: desktop/unstable/gnome-orca/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/control?rev=10538&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/control (original)
+++ desktop/unstable/gnome-orca/debian/control Mon Apr 30 01:59:29 2007
@@ -3,15 +3,45 @@
Priority: optional
Maintainer: Kartik Mistry <kartik.mistry at gmail.com>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>
-Build-Depends: debhelper (>= 5.0.38), dpatch, at-spi, autotools-dev, gnome-pkg-tools (>= 0.10), libatspi-dev (>= 1.7.6), libbonobo2-dev (>= 2.14.0), libbrlapi1-dev (>= 3.7.2), libglib2.0-dev (>= 2.10.0), libgnome-speech3-dev (>= 0.3.10), libxml-parser-perl, pkg-config, python-dev (>= 2.4), python-at-spi, python-glade2, python-gnome2-dev, python-gtk2-dev, python-pyorbit-dev (>= 2.14.0), python-support (>= 0.5.6)
+Build-Depends: debhelper (>= 5.0.38),
+ dpatch,
+ at-spi,
+ autotools-dev,
+ gnome-pkg-tools (>= 0.10),
+ libatspi-dev (>= 1.7.6),
+ libbonobo2-dev (>= 2.14.0),
+ libbrlapi1-dev (>= 3.7.2),
+ libglib2.0-dev (>= 2.10.0),
+ libgnome-speech3-dev (>= 0.3.10),
+ libxml-parser-perl,
+ pkg-config,
+ python-dev (>= 2.4),
+ python-at-spi,
+ python-glade2,
+ python-gnome2-dev,
+ python-gtk2-dev,
+ python-pyorbit-dev (>= 2.14.0),
+ python-support (>= 0.5.6)
Standards-Version: 3.7.2
Package: gnome-orca
Architecture: any
Section: gnome
Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, at-spi, libatspi1.0-0 (>= 1.7.6) libgnome-speech3 (>= 0.3.10), python-at-spi, python-pyorbit (>= 2.14.0), python-gtk2 (>= 2.4), python-glade2, python-gnome2 (>= 2.6.2), gnome-orca-common (= ${source:Version})
-Recommends: brltty, gnome-mag (>= 0.12.5), wget
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ at-spi,
+ libatspi1.0-0 (>= 1.7.6) libgnome-speech3 (>= 0.3.10),
+ python-at-spi,
+ python-pyorbit (>= 2.14.0),
+ python-gtk2 (>= 2.4),
+ python-glade2,
+ python-gnome2 (>= 2.6.2),
+ gnome-orca-common (= ${source:Version})
+Recommends: brltty,
+ gnome-mag (>= 0.12.5),
+ wget
XB-Python-Version: ${python:Versions}
Description: Scriptable screen reader
Orca defines a set of default behaviors (reactions to application events) and
Modified: desktop/unstable/gnome-orca/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/control.in?rev=10538&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/control.in (original)
+++ desktop/unstable/gnome-orca/debian/control.in Mon Apr 30 01:59:29 2007
@@ -3,8 +3,7 @@
Priority: optional
Maintainer: Kartik Mistry <kartik.mistry at gmail.com>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5.0.38),
- dpatch,
+Build-Depends: cdbs,
at-spi,
autotools-dev,
gnome-pkg-tools (>= 0.10),
Modified: desktop/unstable/gnome-orca/debian/gnome-orca-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/gnome-orca-common.install?rev=10538&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/gnome-orca-common.install (original)
+++ desktop/unstable/gnome-orca/debian/gnome-orca-common.install Mon Apr 30 01:59:29 2007
@@ -1,6 +1,6 @@
-usr/lib/python*/site-packages/orca/*.py
-usr/lib/python*/site-packages/orca/scripts/*.py
-usr/share/applications/*
-usr/share/icons/*
-usr/share/locale/*
-usr/share/orca/*
+debian/tmp/usr/lib/python*/site-packages/orca/*.py
+debian/tmp/usr/lib/python*/site-packages/orca/scripts/*.py
+debian/tmp/usr/share/applications/*
+debian/tmp/usr/share/icons/*
+debian/tmp/usr/share/locale/*
+debian/tmp/usr/share/orca/*
Modified: desktop/unstable/gnome-orca/debian/gnome-orca.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/gnome-orca.install?rev=10538&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/gnome-orca.install (original)
+++ desktop/unstable/gnome-orca/debian/gnome-orca.install Mon Apr 30 01:59:29 2007
@@ -1,2 +1,2 @@
-usr/bin/*
-usr/lib/python*/site-packages/orca/*.so
+debian/tmp/usr/bin/*
+debian/tmp/usr/lib/python*/site-packages/orca/*.so
Copied: desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch (from r10537, desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch?rev=10538&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.dpatch (original)
+++ desktop/unstable/gnome-orca/debian/patches/04_solaris_specific_fixes.patch Mon Apr 30 01:59:29 2007
@@ -1,25 +1,39 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 04_solaris_spcific_fixes.dpatch by <kartik.mistry at gmail.com>
-## Thanks to Mario Lang for this!
-## DP: Fixes of solaris specific in src/orca/orca (Closes: #408875)
+The orca startup shell script seems to contain some *isms.
+Remove solaris specific PATH components, use set -e, and other cleanups.
- at DPATCH@
-
---- gnome-orca-2.17.5-orig/src/orca/orca 2007-02-02 14:15:17.000000000 +0530
-+++ gnome-orca-2.17.5/src/orca/orca 2007-02-02 14:17:49.000000000 +0530
-@@ -28,9 +28,12 @@
- # __copyright__ = "Copyright (c) 2005-2006 Sun Microsystems Inc."
- # __license__ = "LGPL"
+--- gnome-orca-2.18.1/src/orca/orca.in.orig 2007-04-09 21:59:57.000000000 +0200
++++ gnome-orca-2.18.1/src/orca/orca.in 2007-04-30 03:54:43.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh -e
+ #
+ # Orca
+ #
+@@ -30,7 +30,7 @@
-+# We are making set -e required!
-+set -e
-+
# Set the user's $PATH for this script.
--#
+ #
-export PATH="/usr/ccs/bin:/usr/bin:/usr/sbin:/bin:/usr/sfw/bin:/usr/openwin/bin:/usr/X11R6/bin"
-+# Removing Solaris specific paths from below
+export PATH="/usr/bin:/usr/sbin:/bin:/usr/X11R6/bin"
# If you set RUNONCE to "true", then this will just run Orca once and quit.
#
-
+@@ -55,16 +55,8 @@
+ # do not want a background process that periodically pings Orca to see
+ # if it is responding.
+ #
+-IFS=:
+-WGETCMD=
+-WATCHDOG=0
+-for dir in $PATH:/usr/sfw/bin:/usr/local/bin; do
+- test -x "$dir/wget" && {
+- WGETCMD="$dir/wget"
+- WATCHDOG=1
+- break
+- }
+-done
++WATCHDOG=1
++WGETCMD=`which wget || WATCHDOG=0`
+
+ # Cleans up any orca-related processes that might be running,
+ # restricting it to those processes owned by the user. These include
Modified: desktop/unstable/gnome-orca/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-orca/debian/rules?rev=10538&op=diff
==============================================================================
--- desktop/unstable/gnome-orca/debian/rules (original)
+++ desktop/unstable/gnome-orca/debian/rules Mon Apr 30 01:59:29 2007
@@ -1,84 +1,10 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Debian GNOME Maintainers
+include /usr/share/cdbs/1/rules/buildcore.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-
-include /usr/share/dpatch/dpatch.make
-
-# get-orig-source target to retrieve the upstream tarball
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := orca
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp patch-stamp
-configure-stamp:
- dh_testdir
- ./configure CFLAGS="$(CFLAGS)" --prefix=/usr --mandir=${prefix}/share/man --infodir=${prefix}/share/info --sysconfdir=/etc --localstatedir=/var
- touch $@
-
-build: build-stamp
-
-build-stamp: configure-stamp patch-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-clean:: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) distclean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -i ChangeLog
- dh_installdocs -i
- dh_install --sourcedir=debian/tmp
- dh_pysupport
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -a ChangeLog
- dh_installdocs -a
- dh_install -a --sourcedir=debian/tmp
- dh_installman -a
- dh_pysupport -a
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
More information about the pkg-gnome-commits
mailing list