Hello,
Please find the NMU patch for 1.1.3-5.3.
Cheers,
Thomas
diff -u ivtools-1.1.3/config/site.def.DEBIAN
ivtools-1.1.3/config/site.def.DEBIAN
--- ivtools-1.1.3/config/site.def.DEBIAN
+++ ivtools-1.1.3/config/site.def.DEBIAN
@@ -49,9 +49,8 @@
MakeDir(dest) @@\
$(INSTALL) -c $(INSTLIBFLAGS) Concat(lib,libname.so.rev) dest @@\
[EMAIL PROTECTED] [ -f dest/Concat(lib,libname.so) ]; then exit 0; else
\ @@\
- pushd dest; \ @@\
- $(LN) Concat(lib,libname.so.rev) Concat(lib,libname.so.maj);\ @@\
- $(LN) Concat(lib,libname.so.maj) Concat(lib,libname.so); popd; fi
+ $(LN) Concat(lib,libname.so.rev) dest/Concat(lib,libname.so.maj);\ @@\
+ $(LN) Concat(lib,libname.so.maj) dest/Concat(lib,libname.so); fi
diff -u ivtools-1.1.3/src/scripts/ivmkmf ivtools-1.1.3/src/scripts/ivmkmf
--- ivtools-1.1.3/src/scripts/ivmkmf
+++ ivtools-1.1.3/src/scripts/ivmkmf
@@ -27,13 +27,13 @@
case "$do_all" in
yes) set -x
- imake -T template -I/usr/X11R6/lib/ivtools/config -DCURDIR=\`pwd\`
-DUseInstalled &&
+ imake -T template -I/usr/lib/ivtools/config -DCURDIR=\`pwd\` -DUseInstalled
&&
make Makefile ARCH=LINUX UseInstalled=1 &&
make Makefiles ARCH=LINUX UseInstalled=1 &&
make depend UseInstalled=1
;;
*) set -x
- imake -T template -I/usr/X11R6/lib/ivtools/config -DCURDIR=\`pwd\`
-DUseInstalled
+ imake -T template -I/usr/lib/ivtools/config -DCURDIR=\`pwd\` -DUseInstalled
make Makefile ARCH=LINUX UseInstalled=1
;;
esac
diff -u ivtools-1.1.3/debian/changelog ivtools-1.1.3/debian/changelog
--- ivtools-1.1.3/debian/changelog
+++ ivtools-1.1.3/debian/changelog
@@ -1,3 +1,11 @@
+ivtools (1.1.3-5.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove bashism from config/site.def.DEBIAN (Closes: #372649).
+ * Remove remaining references to /usr/X11R6 (Closes: #378525, #380123).
+
+ -- Thomas Girard <[EMAIL PROTECTED]> Sat, 29 Jul 2006 23:09:12 +0200
+
ivtools (1.1.3-5.2) unstable; urgency=low
* Non-maintainer upload.
diff -u ivtools-1.1.3/debian/rules ivtools-1.1.3/debian/rules
--- ivtools-1.1.3/debian/rules
+++ ivtools-1.1.3/debian/rules
@@ -33,8 +33,8 @@
cp -p /usr/share/misc/config.* src/scripts/
./configure \
- --x-includes=/usr/X11R6/include \
- --x-libraries=/usr/X11R6/lib \
+ --x-includes=/usr/include \
+ --x-libraries=/usr/lib \
--prefix=`pwd`/debian/tmp/usr \
--mandir=`pwd`/debian/tmp/usr/share/man \
$(ACE)
@@ -53,14 +53,14 @@
# build environment
# -----------------------------------------------------------
- ./configure --x-includes=/usr/X11R6/include \
- --x-libraries=/usr/X11R6/lib \
+ ./configure --x-includes=/usr/include \
+ --x-libraries=/usr/lib \
--prefix=/usr \
--mandir=`pwd`/debian/tmp/usr/share/man
cd src/scripts && \
make ARCH=LINUX clean && \
- make ARCH=LINUX CONFIGDIRSPEC='-T template
-I/usr/X11R6/lib/ivtools/config -DCURDIR=\`pwd\`'\
+ make ARCH=LINUX CONFIGDIRSPEC='-T template -I/usr/lib/ivtools/config
-DCURDIR=\`pwd\`'\
MAKEMAKESPEC='ARCH=LINUX'
touch build-stamp
@@ -121,9 +121,9 @@
dh_movefiles -p$(PKGDEVEL)
dh_movefiles -N$(PKGDEVEL)
#
-# remove the directories that are installed into /usr/X11R6/include
+# remove the directories that are installed into /usr/include
#
- -rm -r `pwd`/debian/tmp/usr/X11R6/include
+ -rm -r `pwd`/debian/tmp/usr/include
#
# ivtools installs the libACE link, we remove it ... hack
#
diff -u ivtools-1.1.3/debian/template ivtools-1.1.3/debian/template
--- ivtools-1.1.3/debian/template
+++ ivtools-1.1.3/debian/template
@@ -4,7 +4,7 @@
CPU=LINUX
ABSTOP=./
-XCONFIGDIR = /usr/X11R6/lib/X11/config
+XCONFIGDIR = /usr/lib/X11/config
/*
* Define the OS platform and CPU architecture.
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/src/ivxt/Imakefile
+++ ivtools-1.1.3/src/ivxt/Imakefile
@@ -9,7 +9,7 @@
# CCLDFLAGS = CCLdFlags
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/UniIdraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/UniIdraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/OverlayUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/OverlayUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/IV/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/IV/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/Unidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/Unidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/lesstif/lib -L$(PROJECTDIR)/lesstif/lib
-L$(PROJECTDIR)/clippoly
-CCLDFLAGS = -Wl,-rpath,$(PROJECTDIR)/lesstif/lib -L$(PROJECTDIR)/lesstif/lib
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/GraphUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/GraphUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/OverlayUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/OverlayUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComGlyph/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComGlyph/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComTerp/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComTerp/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/AttrGlyph/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/AttrGlyph/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/Attribute/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/Attribute/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComUtil/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComUtil/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/UniIdraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/UniIdraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/IVGlyph/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/IVGlyph/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/TopoFace/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/TopoFace/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/Unidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/Unidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/IV/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/IV/$(CPU) -L/usr/X11R6/lib
-L$(PROJECTDIR)/clippoly -L$(PROJECTDIR)/ACE_wrappers/ace
+CCLDFLAGS = -Wl,-rpath,$(PROJECTDIR)/lesstif/lib -L$(PROJECTDIR)/lesstif/lib
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/GraphUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/GraphUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/OverlayUnidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/OverlayUnidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComGlyph/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComGlyph/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComTerp/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComTerp/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/AttrGlyph/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/AttrGlyph/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/Attribute/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/Attribute/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/ComUtil/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/ComUtil/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/UniIdraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/UniIdraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/IVGlyph/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/IVGlyph/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/TopoFace/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/TopoFace/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/Unidraw/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/Unidraw/$(CPU)
-Wl,-rpath,$(PROJECTDIR)/ivtools-0.6/src/IV/$(CPU)
-L$(PROJECTDIR)/ivtools-0.6/src/IV/$(CPU) -L$(PROJECTDIR)/clippoly
-L$(PROJECTDIR)/ACE_wrappers/ace
CCLDLIBS = -lComUnidraw -lGraphUnidraw -lOverlayUnidraw -lComGlyph -lComTerp
-lAttrGlyph -lAttribute -lComUtil -lUniIdraw -lIVGlyph -lTopoFace -lUnidraw
-lIV -lXm -lXt -lX11 -lclippoly -lstdc++ -lm -lACE
