On Fri, Jun 16, 2006 at 08:43:18AM +0200, Stephan Helma wrote:
> On 15 Jun 2006 at 22:57, Bill Allombert wrote:
>
> Hello Bill,
>
> Thanks for your patch! I'm glad that somebody is looking into it
> since recently I have no time (and no useable internet connection)
> to do the maintainance work (I moved from Vienna to Berlin in the
> last month because I found a job there). Please go ahead and upload
> it.
Done, I have a made a few more changes to fix problems I found during
testing. Here the final patch applied and the changelog:
* NMU with maintainer approval (Thanks Stephan!)
* Compile with gcc-3.3 since we need -fwritable-strings (closes: #328039).
+ debian/rules: set CC=gcc-3.3
* debian/control Build-Depends:
+ add gcc-3.3.
+ change mesag-dev to libgl1-mesa-dev, libglu1-mesa-dev
+ add libx11-dev
* Complete the /usr/doc transition: (closes: #359587, 359591, 359594).
+ Rebuild with current debhelper.
+ debian/README.debian: update to point to /usr/share/doc/varkon
* debian/varkon.sh:
+ debian/varkon.sh: look up files in /usr/share/doc/varkon/examples.
+ syntax fix: 'if -d xxx; then' is not correct shell.
* debian/menu:
+ quote fields.
+ move to Section Apps/Technical.
* debian/varkon.doc-base:
+ fix Index to refer to /usr/share/doc/varkon/help/man.htm
(closes: #359768)
+ move to Section Apps/Technical.
* debian/copyright: Author(s) -> Authors
Cheers,
--
Bill. <[EMAIL PROTECTED]>
Imagine a large red swirl here.
diff -u varkon-1.18A/debian/README.Debian varkon-1.18A/debian/README.Debian
--- varkon-1.18A/debian/README.Debian
+++ varkon-1.18A/debian/README.Debian
@@ -28,7 +28,7 @@
* Documentation/Manual
Install the debian packages `varkon-user-manual' and
- `varkon-programmer-manual' and open `/usr/doc/varkon/man/man.htm'
+ `varkon-programmer-manual' and open `/usr/share/doc/varkon/man/man.htm'
with your favourite browser.
diff -u varkon-1.18A/debian/changelog varkon-1.18A/debian/changelog
--- varkon-1.18A/debian/changelog
+++ varkon-1.18A/debian/changelog
@@ -1,3 +1,29 @@
+varkon (1.18A-2.1) unstable; urgency=low
+
+ * NMU with maintainer approval (Thanks Stephan!)
+ * Compile with gcc-3.3 since we need -fwritable-strings (closes: #328039).
+ + debian/rules: set CC=gcc-3.3
+ * debian/control Build-Depends:
+ + add gcc-3.3.
+ + change mesag-dev to libgl1-mesa-dev, libglu1-mesa-dev
+ + add libx11-dev
+ * Complete the /usr/doc transition: (closes: #359587, 359591, 359594).
+ + Rebuild with current debhelper.
+ + debian/README.debian: update to point to /usr/share/doc/varkon
+ * debian/varkon.sh:
+ + debian/varkon.sh: look up files in /usr/share/doc/varkon/examples.
+ + syntax fix: 'if -d xxx; then' is not correct shell.
+ * debian/menu:
+ + quote fields.
+ + move to Section Apps/Technical.
+ * debian/varkon.doc-base:
+ + fix Index to refer to /usr/share/doc/varkon/help/man.htm
+ (closes: #359768)
+ + move to Section Apps/Technical.
+ * debian/copyright: Author(s) -> Authors
+
+ -- Bill Allombert <[EMAIL PROTECTED]> Thu, 15 Jun 2006 19:11:42 +0200
+
varkon (1.18A-2) unstable; urgency=medium
* Dependency on virtual package x-www-browser removed (closes: #284812).
diff -u varkon-1.18A/debian/copyright varkon-1.18A/debian/copyright
--- varkon-1.18A/debian/copyright
+++ varkon-1.18A/debian/copyright
@@ -3,7 +3,7 @@
It was downloaded from http://www.tech.oru.se/cad/varkon/download.htm
-Upstream Author(s):
+Upstream Authors:
The CAD research group
Department of Technology
Örebro University
diff -u varkon-1.18A/debian/control varkon-1.18A/debian/control
--- varkon-1.18A/debian/control
+++ varkon-1.18A/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Stephan Helma <[EMAIL PROTECTED]>
Uploaders: Balbir Thomas <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), dpatch, mesag-dev, unixodbc-dev
+Build-Depends: debhelper (>> 3.0.0), dpatch, libx11-dev, libgl1-mesa-dev,
libglu1-mesa-dev, unixodbc-dev, gcc-3.3
Standards-Version: 3.5.2
Package: varkon
diff -u varkon-1.18A/debian/rules varkon-1.18A/debian/rules
--- varkon-1.18A/debian/rules
+++ varkon-1.18A/debian/rules
@@ -38,7 +38,7 @@
# Add here command to compile/build the package.
mkdir bin
- (VARKON_ROOT=`pwd`; export VARKON_ROOT; cd sources; make)
+ (VARKON_ROOT=`pwd`; export VARKON_ROOT; cd sources; make CC=gcc-3.3)
touch build-arch-stamp
diff -u varkon-1.18A/debian/varkon.doc-base varkon-1.18A/debian/varkon.doc-base
--- varkon-1.18A/debian/varkon.doc-base
+++ varkon-1.18A/debian/varkon.doc-base
@@ -12,6 +12,6 @@
environment.
-Section: Apps/Graphics
+Section: Apps/Technical
Format: HTML
-Index: /usr/share/doc/varkon/help/index.htm
+Index: /usr/share/doc/varkon/help/man.htm
Files: /usr/share/doc/varkon/help/*/*.*
diff -u varkon-1.18A/debian/varkon.menu varkon-1.18A/debian/varkon.menu
--- varkon-1.18A/debian/varkon.menu
+++ varkon-1.18A/debian/varkon.menu
@@ -1,3 +1,3 @@
-?package(varkon):needs=X11 section=Apps/Graphics\
+?package(varkon):needs="X11" section="Apps/Technical"\
title="varkon" command="/usr/bin/varkon"\
- icon=/usr/share/pixmaps/varkon.xpm
+ icon="/usr/share/pixmaps/varkon.xpm"
diff -u varkon-1.18A/debian/varkon.sh varkon-1.18A/debian/varkon.sh
--- varkon-1.18A/debian/varkon.sh
+++ varkon-1.18A/debian/varkon.sh
@@ -34,22 +34,24 @@
fi
}
+EXAMPLEDIR=/usr/share/doc/varkon/examples/
+
cp_example()
{
- for project in `ls /usr/doc/varkon/examples/app/`; do
+ for project in `ls $EXAMPLEDIR/app`; do
# Does the project dir already exist?
- if -d /$VARKON_PRD/$project; then
- echo Omittin '$project' which seems to exist in $VARKON_PRD
+ if [ -d /$VARKON_PRD/$project ]; then
+ echo Omitting '$project' which seems to exist in $VARKON_PRD
else
# Does the PID file exist?
- if -f /usr/doc/varkon/examples/pid/$project.PID; then
+ if [ -f EXAMPLEDIR/pid/$project.PID ]; then
# Copy and unzip all project related files
mkdir /$VARKON_PRD/$project
- cp -r /usr/doc/varkon/examples/app/$project/*
/$VARKON_PRD/$project
+ cp -r $EXAMPLEDIR/app/$project/* /$VARKON_PRD/$project
gunzip /$VARKON_PRD/$project/*/
# Copy and tweak PID file
- cat /usr/doc/varkon/examples/pid/$project.PID | sed -e
"s/VARKON_ROOT\/app/VARKON_PRD/" > /$VARKON_PID/$project.PID
+ cat $EXAMPLEDIR/pid/$project.PID | sed -e
"s/VARKON_ROOT\/app/VARKON_PRD/" > /$VARKON_PID/$project.PID
else
echo Omitting '$project' due to missing PID file
