On Tue, Feb 28, 2006 at 02:30:28PM +0100, Agustin Martin wrote:
> On Sun, Jan 22, 2006 at 07:49:10PM +0100, Amaya wrote:
> > tags 346695 -pending
> > thanks
> >
> > ivtools is in ugly shape, so not NMUing.
> > Attached is a file with all the lintian + linda problems.
>
> ...
>
> > W: ivtools-unidraw: packages-installs-file-to-usr-x11r6 usr/X11R6/ .....
>
> Attached a dirty patch that takes care of this last kind of warnings and
> includes your last xlibs-dev changes,
Attached a modified version that should also take care of warnings like
W: ivtools-dev: manpage-section-mismatch usr/X11R6/man/man3/Banner.3.gz:1 3 !=
3I
and friends by using dh_installman. This greatly decreases lintian warnings,
but still does not deal with the real RC bugreports.
--
Agustin
diff -u ivtools-1.1.3/debian/control ivtools-1.1.3/debian/control
--- ivtools-1.1.3/debian/control
+++ ivtools-1.1.3/debian/control
@@ -1,7 +1,7 @@
Source: ivtools
Priority: optional
Section: libs
-Build-Depends: debhelper, xutils, libtiff4-dev, libjpeg62-dev, zlib1g-dev,
xlibs-dev, libace-dev, autotools-dev
+Build-Depends: debhelper, xutils, libtiff4-dev, libjpeg62-dev, zlib1g-dev,
libace-dev, autotools-dev, libx11-dev, libxext-dev, libxmu-dev, libxt-dev,
x-dev
Maintainer: Guenter Geiger <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
@@ -20,7 +20,7 @@
Package: ivtools-dev
Section: devel
Architecture: all
-Depends: ivtools-interviews (>= ${Source-Version}), ivtools-unidraw (>=
${Source-Version}), libc6-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev,
xlibs-dev, libace-dev
+Depends: ivtools-interviews (>= ${Source-Version}), ivtools-unidraw (>=
${Source-Version}), libc6-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev,
libace-dev, ${shlibs:Depends}
Conflicts: ivtools-bin (<< 0.7.2)
Description: Development files for the InterViews library
The ivmkmf program (similar to xmkmf) and all the include-files needed
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,16 @@
+ivtools (1.1.3-5.1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [Amaya Rodrigo Sastre]
+ * Remove Build-Dependency on xlibs-dev (Closes: #346644).
+
+ [Agustin Martin]
+ * Make sure things are installed under /usr/, not /usr/X11R6.
+ * Use dh_installman to properly install manpages.
+
+ -- Amaya Rodrigo Sastre <[EMAIL PROTECTED]> Sun, 22 Jan 2006 18:01:57 +0100
+
ivtools (1.1.3-5) unstable; urgency=low
* Applied gcc4 patch (thanks to Andreas Jochens)
reverted:
--- ivtools-1.1.3/debian/dirs
+++ ivtools-1.1.3.orig/debian/dirs
@@ -1,5 +0,0 @@
-usr/X11R6/lib
-usr/X11R6/include
-usr/X11R6/man/man1
-usr/share/doc
-
diff -u ivtools-1.1.3/debian/ivtools-bin.menu
ivtools-1.1.3/debian/ivtools-bin.menu
--- ivtools-1.1.3/debian/ivtools-bin.menu
+++ ivtools-1.1.3/debian/ivtools-bin.menu
@@ -3 +3 @@
- command="x-terminal-emulator -e /usr/X11R6/bin/drawserv"
+ command="x-terminal-emulator -e /usr/bin/drawserv"
diff -u ivtools-1.1.3/debian/ivtools-bin.mime
ivtools-1.1.3/debian/ivtools-bin.mime
--- ivtools-1.1.3/debian/ivtools-bin.mime
+++ ivtools-1.1.3/debian/ivtools-bin.mime
@@ -1,5 +1,5 @@
-application/ov-idraw; /usr/X11R6/bin/drawtool '%s'; priority=0
-application/frame-idraw; /usr/X11R6/bin/flipbook '%s'; priority=0
-application/graph-idraw; /usr/X11R6/bin/graphdraw '%s'; priority=0
+application/ov-idraw; /usr/bin/drawtool '%s'; priority=0
+application/frame-idraw; /usr/bin/flipbook '%s'; priority=0
+application/graph-idraw; /usr/bin/graphdraw '%s'; priority=0
diff -u ivtools-1.1.3/debian/ivtools-dev.files
ivtools-1.1.3/debian/ivtools-dev.files
--- ivtools-1.1.3/debian/ivtools-dev.files
+++ ivtools-1.1.3/debian/ivtools-dev.files
@@ -1,6 +1,4 @@
-usr/X11R6/man/man1/ivmkmf.1
-usr/X11R6/bin/ivmkmf
-usr/X11R6/include/*
-usr/X11R6/lib/lib*.so
-usr/X11R6/lib/ivtools
-usr/X11R6/man/man3
+usr/bin/ivmkmf
+usr/include/*
+usr/lib/lib*.so
+usr/lib/ivtools
diff -u ivtools-1.1.3/debian/ivtools-interviews.files
ivtools-1.1.3/debian/ivtools-interviews.files
--- ivtools-1.1.3/debian/ivtools-interviews.files
+++ ivtools-1.1.3/debian/ivtools-interviews.files
@@ -1,2 +1,2 @@
-usr/X11R6/lib/libIV.so.1.*
-usr/X11R6/lib/libIV.so.1
+usr/lib/libIV.so.1.*
+usr/lib/libIV.so.1
diff -u ivtools-1.1.3/debian/ivtools-unidraw.files
ivtools-1.1.3/debian/ivtools-unidraw.files
--- ivtools-1.1.3/debian/ivtools-unidraw.files
+++ ivtools-1.1.3/debian/ivtools-unidraw.files
@@ -1,3 +1,3 @@
-usr/X11R6/lib/lib*.so.1.*
-usr/X11R6/lib/lib*.so.1
+usr/lib/lib*.so.1.*
+usr/lib/lib*.so.1
usr/share/doc/ivtools-unidraw
reverted:
--- ivtools-1.1.3/debian/mime
+++ ivtools-1.1.3.orig/debian/mime
@@ -1,5 +0,0 @@
-application/ov-idraw; /usr/X11R6/bin/drawtool '%s'; priority=0
-application/frame-idraw; /usr/X11R6/bin/flipbook '%s'; priority=0
-application/graph-idraw; /usr/X11R6/bin/graphdraw '%s'; priority=0
-
-
reverted:
--- ivtools-1.1.3/debian/oldivtools-bin.files
+++ ivtools-1.1.3.orig/debian/oldivtools-bin.files
@@ -1,25 +0,0 @@
-usr/X11R6/man/man1
-usr/X11R6/bin/comtest
-usr/X11R6/bin/comterp
-usr/X11R6/bin/dclock
-usr/X11R6/bin/iclass
-usr/X11R6/bin/gclock
-usr/X11R6/bin/glyphterp
-usr/X11R6/bin/idraw
-usr/X11R6/bin/drawtool
-usr/X11R6/bin/comdraw
-usr/X11R6/bin/flipbook
-usr/X11R6/bin/graphdraw
-usr/X11R6/bin/drawserv
-usr/X11R6/bin/mkgif89a
-usr/X11R6/bin/mkgif89ac
-usr/X11R6/bin/ivgetjpg
-usr/X11R6/bin/cntsrclines
-usr/X11R6/bin/tiftopnm
-usr/X11R6/bin/anytopnm
-usr/X11R6/bin/pnmtopgm
-usr/X11R6/bin/tmpnam
-usr/X11R6/bin/stdcmapppm
-usr/lib/mime/ivtools-bin
-usr/doc/ivtools-bin
-usr/lib/menu/ivtools-bin
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
@@ -7,6 +7,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+PKGDEVEL=ivtools-dev
+PKG_BIN=ivtools-bin
# libace still doesn work on Alpha ...
# I have invested too much time already figuring out
@@ -32,8 +34,9 @@
./configure \
--x-includes=/usr/X11R6/include \
- --x-libraries=/usr/X11R6/lib \
- --prefix=`pwd`/debian/tmp/usr/X11R6 \
+ --x-libraries=/usr/X11R6/lib \
+ --prefix=`pwd`/debian/tmp/usr \
+ --mandir=`pwd`/debian/tmp/usr/share/man \
$(ACE)
# Compile the packages
@@ -50,10 +53,14 @@
# build environment
# -----------------------------------------------------------
-
./configure --x-includes=/usr/X11R6/include \
- --x-libraries=/usr/X11R6/lib --prefix=/usr/X11R6
- cd src/scripts && make ARCH=LINUX clean && make ARCH=LINUX
CONFIGDIRSPEC='-T template -I/usr/X11R6/lib/ivtools/config -DCURDIR=\`pwd\`'\
+ --x-libraries=/usr/X11R6/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\`'\
MAKEMAKESPEC='ARCH=LINUX'
touch build-stamp
@@ -98,10 +105,12 @@
# Add here commands to install the package into debian/tmp.
make install ARCH=LINUX DESTDIR=`pwd`/debian/tmp
-# ln -s ivtools-interviews `pwd`/debian/tmp/usr/doc/ivtools-dev
+# Make sure dir is present
+ mkdir -p `pwd`/debian/tmp/usr/share/doc
+# ln -s ivtools-interviews `pwd`/debian/tmp/usr/share/doc/ivtools-dev
ln -s ivtools-interviews `pwd`/debian/tmp/usr/share/doc/ivtools-bin
ln -s ivtools-interviews `pwd`/debian/tmp/usr/share/doc/ivtools-unidraw
- cp debian/template `pwd`/debian/tmp/usr/X11R6/lib/ivtools/config/
+ cp debian/template `pwd`/debian/tmp/usr/lib/ivtools/config/
-(cd src/glyphs && make clean)
# don't include the scripts
@@ -109,7 +118,8 @@
# install -d `pwd`/debian/tmp/usr/doc/ivtools-doc
# cp src/man/refman3.1/refman.PS `pwd`/debian/tmp/usr/doc/ivtools-dev/
- dh_movefiles
+ dh_movefiles -p$(PKGDEVEL)
+ dh_movefiles -N$(PKGDEVEL)
#
# remove the directories that are installed into /usr/X11R6/include
#
@@ -117,10 +127,10 @@
#
# ivtools installs the libACE link, we remove it ... hack
#
- -rm `pwd`/debian/ivtools-dev/usr/X11R6/lib/libACE.so
+ -rm `pwd`/debian/ivtools-dev/usr/lib/libACE.so
- chmod a-x debian/ivtools-dev/usr/X11R6/lib/ivtools/Idemo
- chmod a-x debian/ivtools-dev/usr/X11R6/lib/ivtools/comterp.err
+ chmod a-x debian/ivtools-dev/usr/lib/ivtools/Idemo
+ chmod a-x debian/ivtools-dev/usr/lib/ivtools/comterp.err
touch install-stamp
@@ -158,6 +168,8 @@
# dh_installinit -a
# dh_installcron -a
# dh_installmanpages -p ivtools-bin
+ dh_installman -p$(PKG_BIN) -Xsrc/man/man1/ivmkmf.1
+ dh_installman -N$(PKG_BIN)
# dh_undocumented
dh_installchangelogs -p ivtools-interviews
dh_installmime -a
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/debian/ivtools-dev.manpages
+++ ivtools-1.1.3/debian/ivtools-dev.manpages
@@ -0,0 +1,2 @@
+src/man/man1/ivmkmf.1
+src/man/man3/*.3
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/debian/ivtools-bin.files
+++ ivtools-1.1.3/debian/ivtools-bin.files
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/doc/ivtools-bin
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/debian/compat
+++ ivtools-1.1.3/debian/compat
@@ -0,0 +1 @@
+4
only in patch2:
unchanged:
--- ivtools-1.1.3.orig/debian/ivtools-bin.manpages
+++ ivtools-1.1.3/debian/ivtools-bin.manpages
@@ -0,0 +1 @@
+src/man/man1/*.1
