From f70181ffe0b37952384ff5e0ce0185541828014f Mon Sep 17 00:00:00 2001
From: fourdan
Date: Fri, 12 Jan 2007 13:36:35 +0000
Subject: Update package for Debian Etch

---
 debian/changelog      | 6 ++++++
 debian/control        | 4 ++--
 debian/ivy-c-dev.dirs | 1 -
 debian/ivy-c.dirs     | 1 -
 debian/rules          | 2 +-
 src/Makefile          | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 256811c..9430f61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ivy-c (3.9.1-2) unstable; urgency=low
+
+  * Update package for Debian Etch
+
+ -- Olivier Fourdan <fourdan@false>  Fri, 12 Jan 2007 14:35:44 +0100
+
 ivy-c (3.9.1-1) unstable; urgency=low
 
   * Build Debian Package with Alex's latest changes, implementing numerical
diff --git a/debian/control b/debian/control
index 82d1325..1325974 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: ivy-c
 Priority: extra
 Section: devel
 Maintainer: Alexandre Bustico <alexandre.bustico@cena.fr>
-Build-Depends: debhelper (>> 4.0.0), libc6-dev, libx11-dev | xlibs-dev, tcl8.4-dev, libgtk1.2-dev, libpcre3-dev
+Build-Depends: debhelper (>> 4.0.0), libc6-dev, xlibs-dev | libx11-dev | xorg-dev, tcl8.4-dev, libgtk1.2-dev, libglib2.0-dev, libpcre3-dev
 Standards-Version: 3.6.1
 
 Package: ivy-c-dev
 Section: libdevel
 Architecture: any
-Depends: ivy-c (= ${Source-Version}), libc6-dev, libx11-dev | xlibs-dev, libgtk1.2-dev
+Depends: ivy-c (= ${Source-Version}), libc6-dev, xlibs-dev | libx11-dev | xorg-dev, libgtk1.2-dev, libglib2.0-dev
 Suggests: tclsh, wish
 Description: Ivy software bus. development Package
  This package is needed for compiling applications using ivy-c.
diff --git a/debian/ivy-c-dev.dirs b/debian/ivy-c-dev.dirs
index ad9ae40..db43e9f 100644
--- a/debian/ivy-c-dev.dirs
+++ b/debian/ivy-c-dev.dirs
@@ -1,3 +1,2 @@
 usr/include/Ivy
-usr/X11R6/lib
 usr/lib
diff --git a/debian/ivy-c.dirs b/debian/ivy-c.dirs
index 6593239..d0ebc38 100644
--- a/debian/ivy-c.dirs
+++ b/debian/ivy-c.dirs
@@ -1,4 +1,3 @@
-usr/X11R6/lib
 usr/lib
 usr/bin
 usr/man/man1
diff --git a/debian/rules b/debian/rules
index 44ee736..ccdbd89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ configure-stamp:
 build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
-	cd src && $(MAKE) all MAJOR=$(MAJOR) MINOR=$(MINOR) TCLINC=$(-I/usr/include/tcl8.3/) TCLLIB=$(-ltcl8.3) CFLAGS="-g -fPIC -D_REENTRANT"
+	cd src && $(MAKE) all MAJOR=$(MAJOR) MINOR=$(MINOR) TCLINC=$(-I/usr/include/tcl8.4/) TCLLIB=$(-ltcl8.4) CFLAGS="-g -fPIC -D_REENTRANT"
 	touch build-stamp
 
 clean:
diff --git a/src/Makefile b/src/Makefile
index f581609..26789d0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -31,7 +31,7 @@ ifndef PREFIX
     PREFIX=/usr/local
 endif
 
-X11_PREFIX = /usr/X11R6
+X11_PREFIX = /usr
 
 XTINC = -I$(X11_PREFIX)/include
 XTLIB = -L$(X11_PREFIX)$(LIB) -lXt -lX11 -lSM -lICE
-- 
cgit v1.1