Debian scripts use makedev (>=2.3.1-49) in postinst by default now.

Postinst script using mknod added as alternative.
Revision bumped up to 0.8.1.


git-svn-id: svn://svn.linux1394.org/libraw1394/trunk@47 53a565d1-3bb7-0310-b661-cf11e63c67ab

7 files changed, 104 insertions, 30 deletions

diff --git a/configure.in b/configure.in
index eac20ef..ce10dd1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # process this file with autoconf to get a configure script
 
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(libraw1394, 0.8)
+AM_INIT_AUTOMAKE(libraw1394, 0.8.1)
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
diff --git a/debian/Makefile.am b/debian/Makefile.am
index 93e5600..69d0562 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,3 +1,4 @@
 # process this file with automake to create a Makefile.in
 
-EXTRA_DIST = control rules changelog copyright libraw1394.postinst.in
+EXTRA_DIST = control rules changelog copyright \
+	libraw1394.postinst.in libraw1394-potato.postinst.in
diff --git a/debian/changelog b/debian/changelog
index d4f41f5..ee6834c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libraw1394 (0.8.1) unstable; urgency=low
+
+  * Use and require makedev (>= 2.3.1-49) which includes /dev/raw1394
+    (still supports potato by setting a variable during debian build).
+
+ -- Andreas Bombe <bombe@informatik.tu-muenchen.de>  Mon, 11 Dec 2000 02:26:34 +0100
+
 libraw1394 (0.8) unstable; urgency=low
 
   * New libraw1394 release.
diff --git a/debian/control b/debian/control
index 7e4f6a2..b1de40e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: libraw1394
 Section: libs
 Priority: optional
-Maintainer: Andreas E. Bombe <andreas.bombe@munich.netsurf.de>
+Maintainer: Andreas Bombe <bombe@informatik.tu-muenchen.de>
 Standards-Version: 3.1.1.1
 Build-Depends: debhelper
 
 Package: libraw1394-dev
 Architecture: any
 Section: devel
-Depends: libraw1394-4, libc6-dev
+Depends: libraw1394-${soversion} (= ${Source-Version}), libc6-dev
 Description: library for direct access to IEEE 1394 bus - development files
  libraw1394 is the only supported interface to the kernel side raw1394
  of the Linux IEEE-1394 subsystem, which provides direct access to the
@@ -22,7 +22,7 @@ Description: library for direct access to IEEE 1394 bus - development files
 Package: libraw1394-4
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${makedev-depend}${shlibs:Depends}
 Description: library for direct access to IEEE 1394 bus (aka FireWire)
  libraw1394 is the only supported interface to the kernel side raw1394
  of the Linux IEEE-1394 subsystem, which provides direct access to the
diff --git a/debian/libraw1394-potato.postinst.in b/debian/libraw1394-potato.postinst.in
new file mode 100644
index 0000000..d7c58e3
--- /dev/null
+++ b/debian/libraw1394-potato.postinst.in
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+
+	if [ ! -c /dev/raw1394 ]; then
+		cat <<EOF
+
+Required /dev/raw1394 device file not found.  Without it, libraw1394
+is quite useless as it can not talk to the kernel driver.
+
+EOF
+		echo -n "Should I create it for you? [Y/n] "
+		read REPLY
+
+		case "$REPLY" in
+		y|yes|"")
+			mknod -m600 /dev/raw1394 c 171 0
+			chown root.root /dev/raw1394
+			cat <<EOF
+
+/dev/raw1394 created.
+
+It is owned by root with read/write permissions for root.  You may
+want to fix the group/permission to something appropriate for you.
+Note however that anyone who can open raw1394 can access all devices
+on all connected 1394 buses unrestricted, including harddisks and
+other probably sensitive devices.
+
+EOF
+			;;
+		*)
+			cat <<EOF
+
+/dev/raw1394 not created.  You can create it at a later time using
+/dev/MAKEDEV if you have a version that already knows raw1394 or you
+can create it manually with the command:
+
+    mknod -m600 /dev/raw1394 c 171 0
+
+EOF
+			;;
+		esac
+	fi
+fi
+
+#DEBHELPER#
diff --git a/debian/libraw1394.postinst.in b/debian/libraw1394.postinst.in
index 0f60fbe..7881ca5 100644
--- a/debian/libraw1394.postinst.in
+++ b/debian/libraw1394.postinst.in
@@ -4,37 +4,41 @@ if [ "$1" = "configure" ]; then
 	ldconfig
 
 	if [ ! -c /dev/raw1394 ]; then
-		echo
-		echo "Required /dev/raw1394 device file not found."
-		echo "Without it, libraw1394 is quite useless as it can't talk"
-		echo "to the kernel driver."
-		echo
+		cat <<EOF
+
+Required /dev/raw1394 device file not found.  Without it, libraw1394
+is quite useless as it can not talk to the kernel driver.
+
+EOF
 		echo -n "Should I create it for you? [Y/n] "
 		read REPLY
 
 		case "$REPLY" in
 		y|yes|"")
-			mknod -m600 /dev/raw1394 c 171 0
-			chown root.root /dev/raw1394
-			echo
-			echo "/dev/raw1394 created."
-			echo "It is owned by root with read/write permissions for root."
-			echo "You may want to fix the group/permission to something"
-			echo "appropriate for you.  Note however that anyone who can open"
-			echo "raw1394 can access all devices on all connected 1394 buses"
-			echo "unrestricted, including harddisks and other probably"
-			echo "sensitive devices."
+			MAKEDEV raw1394
+			cat <<EOF
+
+Device file created.  You may want to fix the group/permission to
+something appropriate for you.  Note however that anyone who can open
+raw1394 can access all devices on all connected 1394 buses
+unrestricted, including harddisks and other probably sensitive
+devices.
+
+EOF
 			;;
 		*)
-			echo
-			echo "/dev/raw1394 not created."
-			echo "You can create it at a later time using /dev/MAKEDEV if you"
-			echo "have a version that already knows raw1394 or you can create"
-			echo "it manually with the command:"
-			echo "mknod -m600 /dev/raw1394 c 171 0"
+			cat <<EOF
+
+/dev/raw1394 not created.  You can create it at a later time manually
+with the command:
+
+    /dev/MAKEDEV raw1394
+
+EOF
 			;;
 		esac
 	fi
 fi
 
+
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 7f73d44..7e76af2 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
 export DH_COMPAT=1
 
+potato-build	= no
 
 majorname	= $(shell grep library_names src/libraw1394.la | cut -d"'" -f 2 | cut -d" " -f 2)
 fullversionname	= $(shell grep library_names src/libraw1394.la | cut -d"'" -f 2 | cut -d" " -f 1)
 major 		= $(shell echo $(majorname) | cut -d"." -f 3)
 
+libraw		= libraw1394-$(major)
 
 autoclean-files:
 	echo $@ >$@
@@ -46,12 +47,26 @@ binary-arch: build install autoclean-files
 	dh_testdir
 	dh_testroot
 
-	dh_movefiles -plibraw1394-$(major)	\
+	dh_movefiles -p$(libraw)		\
 		usr/lib/$(majorname)		\
 		usr/lib/$(fullversionname)
 
-	echo debian/libraw1394-$(major).postinst >>autoclean-files
-	cp debian/libraw1394.postinst.in debian/libraw1394-$(major).postinst
+	echo >>autoclean-files			\
+		debian/substvars		\
+		debian/$(libraw).postinst	\
+		debian/$(libraw).substvars
+
+	echo "soversion=$(major)" >>debian/substvars
+	if [ "$(potato-build)" = "yes" ]; then				\
+		cp debian/libraw1394-potato.postinst.in			\
+			debian/$(libraw).postinst;			\
+		echo "makedev-depend=" >>debian/$(libraw).substvars;	\
+	else								\
+		cp debian/libraw1394.postinst.in			\
+			debian/$(libraw).postinst;			\
+		echo "makedev-depend=makedev (>= 2.3.1-49), "		\
+			>>debian/$(libraw).substvars;			\
+	fi
 
 	dh_installdocs README NEWS
 	dh_installchangelogs