some Makefile and debian build fixes

8 files changed, 63 insertions, 93 deletions

diff --git a/debian/changelog b/debian/changelog
index f544838..1179010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ivy-c (3.13.0) unstable; urgency=low
+
+  * update debian packaging
+  * bump version to allow for proper syncing
+
+ -- Felix Ruess <felix.ruess@gmail.com>  Fri, 26 Apr 2013 11:11:25 +0200
+
 ivy-c (3.11.10) unstable; urgency=low
 
   * mkdirhier replaced by mkdir -p in all Makefile(s)
@@ -18,7 +25,7 @@ ivy-c (3.11.8) unstable; urgency=low
   * make ivy-c compilable by a c++ compiler
   * add fixes to remove all gcc warning message
 
- -- Alexandre Bustico <bustico@cena.fr>  Mon, 27 Janury 2010 13:43:00 +0100
+ -- Alexandre Bustico <bustico@cena.fr>  Mon, 27 Jan 2010 13:43:00 +0100
 
 ivy-c (3.11.7) unstable; urgency=low
 
@@ -27,10 +34,16 @@ ivy-c (3.11.7) unstable; urgency=low
 
  -- Alexandre Bustico <bustico@cena.fr>  Mon, 6 Jul 2009 16:43:00 +0200
 
+ivy-c (3.11.6-1) unstable; urgency=low
+
+  * remove dependency over libgtk1.2-dev
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Tue, 30 Nov 2010 16:43:00 +0200
+
 ivy-c (3.11.6) unstable; urgency=low
 
-  * desactivation of the nagle buffering for TCP sockets, 
-  since ivy is most of the time used to send events, we will priviligiate 
+  * desactivation of the nagle buffering for TCP sockets,
+  since ivy is most of the time used to send events, we will priviligiate
   lag over throughtput
 
  -- Alexandre Bustico <bustico@cena.fr>  Mon, 6 Jul 2009 16:43:00 +0200
@@ -43,7 +56,7 @@ ivy-c (3.11.5) unstable; urgency=low
 
 ivy-c (3.11.4) unstable; urgency=low
 
-  * fix again timer.c (thanks again to brno ivy dev team) so that timer	could be removed within the callback 
+  * fix again timer.c (thanks again to brno ivy dev team) so that timer	could be removed within the callback
   * make the lib and api more robust by adding const where they should be
   * compile with -Wall and eliminate remaining warnings
 
@@ -51,7 +64,7 @@ ivy-c (3.11.4) unstable; urgency=low
 
 ivy-c (3.11.3) unstable; urgency=low
 
-  * fix timer.c (thanks to brno ivy dev team), and ivydebug.h 
+  * fix timer.c (thanks to brno ivy dev team), and ivydebug.h
   * add __attribute__ gcc hooks which permit to emit warning when format
     and arguments of bindmessage and sendmessage aren't concordant.
 
@@ -73,7 +86,7 @@ ivy-c (3.11.1) unstable; urgency=low
 ivy-c (3.11.0) unstable; urgency=low
 
   * change socket behavior to non blocking, with local management of a
-	fifo, this fix some deadlock problems when lot of agents with numerous regexp binding are on the same bus.
+    fifo, this fix some deadlock problems when lot of agents with numerous regexp binding are on the same bus.
   * little (ascendant compatible) api change
   * fix for numerous bugs
 
@@ -93,7 +106,7 @@ ivy-c (3.10.0-2) unstable; urgency=low
 
 ivy-c (3.10.0-1) unstable; urgency=low
 
-  * change Makefile to get around a debian Bug : debian pcrecpp 
+  * change Makefile to get around a debian Bug : debian pcrecpp
   	package is broken, (as debian itself)
   * a repertory testivy with test file for the ivythroughput test tool
 
@@ -104,8 +117,9 @@ ivy-c (3.10.0) unstable; urgency=low
   * fix realloc buffer size when big message
   * complete change of internal structures for performance optimisation
   * experimental parralelized version for performance optimisation (use
-	and need openmp) which scale well for regexp matching on 
-	multicore/multi processor gear.
+    and need openmp) which scale well for regexp matching on
+    multicore/multi processor gear.
+
 
  -- Alexandre Bustico <bustico@cena.fr>  Wed, 06 Feb 2008 17:17:54 +0100
 
@@ -124,10 +138,10 @@ ivy-c (3.9.3-1) unstable; urgency=low
 ivy-c (3.9.2-1) unstable; urgency=low
 
   * Apply patch from Michel Estienne <estienne@cena.fr> for Solaris,
-  * Change Makefile and debian rules build to be able to build on Sarge and 
+  * Change Makefile and debian rules build to be able to build on Sarge and
     on Etch
   * Use LDFLAGS in Makefile, use pkg-config if available to get X11 installation
-    path so that the Xt lib gets installed in the correct location even on newer 
+    path so that the Xt lib gets installed in the correct location even on newer
     Xorg 7.x.
 
  -- Olivier Fourdan <fourdan@cena.fr>  Mon, 12 Feb 2007 17:36:06 +0100
@@ -186,13 +200,13 @@ ivy-c (3.8-1) unstable; urgency=low
 
   * suppression warning format
   * portage WIN32 random => rand
-  * modification du protocol Ivy UDP : ajout de appid et appname dans 
+  * modification du protocol Ivy UDP : ajout de appid et appname dans
     le mesage Hello
   * rework the Makefile for cleaner installation
-  * redo the debian packaging administration files for better lib/dev 
+  * redo the debian packaging administration files for better lib/dev
     files splitting
-  * move the Ivy header files to a new Ivy/ subdir to avoid conflicts 
-    with other existing system headers (beware, that *will* break 
+  * move the Ivy header files to a new Ivy/ subdir to avoid conflicts
+    with other existing system headers (beware, that *will* break
     existing code that needs to look in the the new path for headers
     inclusion)
   * correction Bug regexp encore
@@ -347,8 +361,8 @@ ivy-c (3.1-1) unstable; urgency=low
   * Making ivyprobe ivy-3.0 compliant
   * Bug correction which appears at ivy closing
   * add doc files
-  
- -- Hervé Damiano <damiano@cenatoulouse.dgac.fr>  Tue, 13 Apr 1999 15:19:17 +0200
+
+ -- Hervé Damiano <damiano@cenatoulouse.dgac.fr>  Tue, 13 Apr 1999 15:19:17 +0200
 
 ivy-c (3.0-1) unstable; urgency=low
 
@@ -361,7 +375,7 @@ ivy-c (3.0-1) unstable; urgency=low
   * Clean headers
   * testivy -> ivyprobe
 
- -- Hervé Damiano <damiano@cenatoulouse.dgac.fr>  Thu, 18 Feb 1999 11:50:50 +0100
+ -- Hervé Damiano <damiano@cenatoulouse.dgac.fr>  Thu, 18 Feb 1999 11:50:50 +0100
 
 ivy-c (1.2-1) unstable; urgency=low
 
@@ -372,9 +386,9 @@ ivy-c (1.2-1) unstable; urgency=low
 
 ivy-c (1.1-2) unstable; urgency=low
 
-  * Suppression du header list.h qui est aussi défini dans utils-c.
-  * Ajout du soname à la bibliothèque dynamique.
-  
+  * Suppression du header list.h qui est aussi défini dans utils-c.
+  * Ajout du soname à la bibliothèque dynamique.
+
  -- Patrick Lecoanet <lecoanet@cena.dgac.fr>  Wed,  9 Dec 1998 11:24:34 +0100
 
 ivy-c (1.1-1) unstable; urgency=low
@@ -382,5 +396,3 @@ ivy-c (1.1-1) unstable; urgency=low
   * Initial Release.
 
  -- Patrick Lecoanet <lecoanet@cena.dgac.fr>  Tue, 13 Oct 1998 09:52:30 +0200
-
-
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 92e7706..cb8dd5a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: ivy-c
 Priority: extra
 Section: devel
 Maintainer: Alexandre Bustico <alexandre.bustico@cena.fr>
-Build-Depends: debhelper (>> 4.0.0), libc6-dev, xlibs-dev | libx11-dev | xorg-dev, tcl8.4-dev, libgtk1.2-dev | libgtk2.0-dev, libglib2.0-dev, libpcre3-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 7.0.50~), libxt-dev, libx11-dev, tcl-dev, libglib2.0-dev, libpcre3-dev
+Standards-Version: 3.9.2
+Homepage: http://www2.tls.cena.fr/products/ivy/
 
 Package: ivy-c-dev
 Section: libdevel
 Architecture: any
-Depends: ivy-c (= ${Source-Version}), libc6-dev, xlibs-dev | libx11-dev | xorg-dev, libgtk1.2-dev | libgtk2.0-dev, libglib2.0-dev
+Depends: ivy-c (= ${binary:Version}), ${misc:Depends}, libc6-dev, libx11-dev, libglib2.0-dev
 Suggests: tclsh, wish
 Description: Ivy software bus. development Package
  This package is needed for compiling applications using ivy-c.
@@ -19,7 +20,7 @@ Description: Ivy software bus. development Package
 Package: ivy-c
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: tclsh, wish
 Conflicts: ivy-tcl
 Description: Ivy software bus. runtime Package
diff --git a/debian/ivy-c-dev.install b/debian/ivy-c-dev.install
index d73b978..4d46549 100644
--- a/debian/ivy-c-dev.install
+++ b/debian/ivy-c-dev.install
@@ -1,8 +1,4 @@
 usr/lib/*.so
 usr/lib/*.a
-usr/lib/*.la
-usr/X11R6/lib/*.so
-usr/X11R6/lib/*.a
-usr/X11R6/lib/*.la
 usr/include/Ivy/*.h
 usr/lib/pkgconfig/*
diff --git a/debian/ivy-c.install b/debian/ivy-c.install
index 38010b3..b5840d1 100644
--- a/debian/ivy-c.install
+++ b/debian/ivy-c.install
@@ -1,4 +1,3 @@
-usr/X11R6/lib/*.so.*
 usr/lib/*.so.*
 usr/bin/*
 usr/man/man1/*
diff --git a/debian/rules b/debian/rules
index e175365..6937537 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,70 +1,32 @@
 #!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
 
 SED_COMMAND='s/.*(\([^)]*\)).*/\1/p'
 MAJOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/\([0-9]*\)\..*/\1/p')
 MINOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/[0-9]*\.\([0-9\.]*\).*/\1/p')
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	cd src && $(MAKE) all MAJOR=$(MAJOR) MINOR=$(MINOR) TCLINC=$(-I/usr/include/tcl8.4/) TCLLIB=$(-ltcl8.4) CFLAGS="-g -fPIC -D_REENTRANT" LDFLAGS="-L/usr/X11R6/lib"
-	touch build-stamp
+override_dh_auto_build :
+	cd src && $(MAKE) all MAJOR=$(MAJOR) MINOR=$(MINOR) CFLAGS="-g -fPIC -D_REENTRANT"
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
+override_dh_auto_clean :
 	cd src && $(MAKE) clean
-	dh_clean 
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+override_dh_auto_install :
 	cd src && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr LIB=/lib
 
-binary-indep: build install
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
+override_dh_auto_binary-arch:
 	dh_install --source=$(CURDIR)/debian/tmp
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-#	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: override_dh_auto_build override_dh_auto_clean override_dh_auto_install override_dh_auto_binary-arch
diff --git a/src/Makefile b/src/Makefile
index aa5f4e6..4501aa6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,14 +17,14 @@
 
 # change this in version.h too !!!!
 MAJOR=3
-MINOR=12
+MINOR=13
 
 PERHAPS64 := $(shell getconf LONG_BIT | perl -ne "print /64/ ? '64' : '';")
 LIB = /lib$(PERHAPS64)
-ifeq ($(PERHAPS64), "64")
-	FPIC=
-else
+ifeq ($(PERHAPS64),64)
 	FPIC=-fPIC
+else
+	FPIC=
 endif
 
 ifndef PREFIX
diff --git a/src/version.h b/src/version.h
index d522840..8288a6b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,4 +26,4 @@
  *
  */
 #define IVYMAJOR_VERSION 3
-#define IVYMINOR_VERSION 12
+#define IVYMINOR_VERSION 13