Author: tille
Date: 2011-02-09 16:00:40 +0000 (Wed, 09 Feb 2011)
New Revision: 5941
Added:
trunk/packages/arb/trunk/debian/patches/no_xview_dependency.patch
Modified:
trunk/packages/arb/trunk/debian/changelog
trunk/packages/arb/trunk/debian/control
trunk/packages/arb/trunk/debian/patches/series
Log:
Really remove xview-client dependency.
Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog 2011-02-09 12:35:37 UTC (rev
5940)
+++ trunk/packages/arb/trunk/debian/changelog 2011-02-09 16:00:40 UTC (rev
5941)
@@ -1,4 +1,4 @@
-arb (5.2-1) UNRELEASED; urgency=low
+arb (5.2-1) unstable; urgency=low
* New upstream version
* Standards-Version: 3.9.1 (no changes needed)
@@ -10,14 +10,16 @@
- Brazilian Portuguese (thanks to Gustavo Jordan
<[email protected]>)
Closes: #596647
- * Drop xview dependency in debian/control
- FIXME: Patches for SH/* need to be written
+ * Drop xview-clients Suggests in debian/control and replace any occurence
+ of textedit (which is part of xview-clients) by editor via
+ debian/patches/no_xview_dependency.patch
Closes: 612534
* debian/patches/20_Makefiles: clean up some errors in clean target
* debian/patches/20_config.makefiles: Really get the DEB_BUILD_ARCH_BITS
applied
+ * Build-Depends: time
- -- Andreas Tille <[email protected]> Wed, 09 Feb 2011 08:53:32 +0100
+ -- Andreas Tille <[email protected]> Wed, 09 Feb 2011 16:56:15 +0100
arb (5.1-1) unstable; urgency=low
Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control 2011-02-09 12:35:37 UTC (rev
5940)
+++ trunk/packages/arb/trunk/debian/control 2011-02-09 16:00:40 UTC (rev
5941)
@@ -4,7 +4,7 @@
Maintainer: Debian Med Packaging Team
<[email protected]>
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <[email protected]>
-Build-Depends: dpkg-dev (>= 1.15.4), debhelper (>= 7.1), quilt,
+Build-Depends: dpkg-dev (>= 1.15.4), debhelper (>= 7.1), quilt (>= 0.47),
libxml2-utils, lynx, sablotron, libtiff4-dev, libxaw7-dev, openjdk-6-jdk |
default-jdk,
freeglut3-dev | libglu-dev, libglew1.5-dev, libpng12-dev, x11proto-print-dev,
libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc, chrpath, xutils-dev,
libmotif-dev
Added: trunk/packages/arb/trunk/debian/patches/no_xview_dependency.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/no_xview_dependency.patch
(rev 0)
+++ trunk/packages/arb/trunk/debian/patches/no_xview_dependency.patch
2011-02-09 16:00:40 UTC (rev 5941)
@@ -0,0 +1,81 @@
+Author: Andreas Tille <[email protected]>
+Date: Wed, 09 Feb 2011 16:56:15 +0100
+Description: Make sure we do not have a hidden Dependency
+ from xview-clients via the usage of texteditor
+
+--- arbsrc_6779.orig/lib/arb_default/edit.arb
++++ arbsrc_6779/lib/arb_default/edit.arb
+@@ -155,7 +155,7 @@
+ %) /*tools*/
+
+ textedit %% (%
+- command "textedit * &"
++ command "editor * &"
+ %) /*textedit*/
+
+ submission %% (%
+--- arbsrc_6779.orig/lib/arb_default/ntree.arb
++++ arbsrc_6779/lib/arb_default/ntree.arb
+@@ -491,7 +491,7 @@
+
+ etc_check_gcg %% (%
+ fetch "fetch"
+- textedit "textedit"
++ textedit "editor"
+ minlen %i 400
+ exclude_0 ""
+ exclude_1 ""
+--- arbsrc_6779.orig/SH/arb_hindex
++++ arbsrc_6779/SH/arb_hindex
+@@ -5,4 +5,4 @@
+ rm -f $file
+ grep TITLE *.hlp | sed -e "s/^\(.\{1,15\}\)TITLE/\1 TITLE/g" -e "s/TITLE/
TITLE/g" >$file
+ ls *.ps >>$file
+-textedit $file&
++editor $file&
+--- arbsrc_6779.orig/SH/arb_textedit
++++ arbsrc_6779/SH/arb_textedit
+@@ -4,16 +4,19 @@
+ echo '$ARB_TEXTEDIT not set! Searching for an editor..'
+ echo ''
+
+- # try to find an editor (order = basic to convinient; last found is
used):
+-
+- if [ -x "`which edit`" ] ; then ARB_TEXTEDIT=edit ; fi
+- if [ -x "`which vi`" ] ; then ARB_TEXTEDIT=vi ; fi
+- if [ -x "`which emacs`" ] ; then ARB_TEXTEDIT=emacs ; fi
+- if [ -x "`which xemacs`" ] ; then ARB_TEXTEDIT=xemacs ; fi
+- if [ -x "`which textedit`" ] ; then ARB_TEXTEDIT=textedit ; fi
+- if [ -x "`which xedit`" ] ; then ARB_TEXTEDIT=xedit ; fi
+- if [ -x "`which gedit`" ] ; then ARB_TEXTEDIT=gedit ; fi
+- if [ -x "`which kwrite`" ] ; then ARB_TEXTEDIT=kwrite ; fi
++ # prefer Debian default editor
++ if [ -x "`which editor`" ] ; then
++ ARB_TEXTEDIT=editor
++ else
++ # try to find an editor (order = basic to convinient; last
found is used):
++ if [ -x "`which edit`" ] ; then ARB_TEXTEDIT=edit ; fi
++ if [ -x "`which vi`" ] ; then ARB_TEXTEDIT=vi ; fi
++ if [ -x "`which emacs`" ] ; then ARB_TEXTEDIT=emacs ; fi
++ if [ -x "`which xemacs`" ] ; then ARB_TEXTEDIT=xemacs ; fi
++ if [ -x "`which xedit`" ] ; then ARB_TEXTEDIT=xedit ; fi
++ if [ -x "`which gedit`" ] ; then ARB_TEXTEDIT=gedit ; fi
++ if [ -x "`which kwrite`" ] ; then ARB_TEXTEDIT=kwrite ; fi
++ fi
+
+ if [ -z "$ARB_TEXTEDIT" ]; then
+ echo "Can't guess an editor. Even 'vi' seems to be absent."
+--- arbsrc_6779.orig/SH/arb_history
++++ arbsrc_6779/SH/arb_history
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-textedit $ARBHOME/lib/history &
++editor $ARBHOME/lib/history &
+--- arbsrc_6779.orig/SH/arb_index
++++ arbsrc_6779/SH/arb_index
+@@ -6,4 +6,4 @@
+ arb_replace 'TITLE\t=\t\t\tTITLE:UP=\t\t\t\tUP:SUB=\t\t\t\tSUB' index
+
+ ls ../ps/*.ps >>index
+-textedit index &
++editor index &
Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series 2011-02-09 12:35:37 UTC
(rev 5940)
+++ trunk/packages/arb/trunk/debian/patches/series 2011-02-09 16:00:40 UTC
(rev 5941)
@@ -4,3 +4,4 @@
20_Makefiles
20_tmpfile_issue.patch
tmpfile_CVE-2008-5378.patch
+no_xview_dependency.patch
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
