[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#384893: How is this ITP going?



Hi Martin,

I've fixed all the lintian errors and warnings (except for the missing
LSB section in init script).  Nothing too drastic, but I moved some
files around, so `patch' won't make all the changes I made...

You wrote:
> I'm struggeling with some issues:
> - is /etc/default/ the right place to put the tipc configuration?

That seems reasonable to me.

> - how to create a per-interface configuration (since one might not want to 
> have tipc on all interfaces)?

I can think of a couple solutions:
 * A TIPC_INTERFACES variable in /etc/default/tipc
 * Or, something like the current if-up.d script as a separate script
   that you could run with the "up" and "down" options in
   /etc/network/interfaces (see
   /usr/share/doc/ifupdown/examples/network-interfaces.gz)

> - is the netlink-patch nice?

I'm not familiar enough to comment here, but it seems reasonable.

> - is it ok to include /usr/include to get the linux headers?

linux-kernel-headers installs the kernel headers to /usr/include, yes.
But your patch winds up adding "-I/usr/include/include" to CFLAGS.  No
harm done, but not useful either--instead, I've removed the
"-I{KERNELDIR}/include" bit from CFLAGS.

> - what package dependencies do I have to set if the package depends on the 
> existence of a kernel module?

As far as I can tell, there is no existing policy for this.  Perhaps
it's best just to make sure the automatically-run scripts complain but
exit gracefully, for now.

> - lintian fails so far with complaining about the init.d script is not 
> registered in the postint script

Fixed by using dh_installinit.  Since this involved moving the init
script out of debian/etc, I took the opportunity to move everything else
out of that hierarchy as well.  Also, the if-up.d and if-down.d scripts
weren't installed with executable permission, so I moved their
installation in to the "install" target, and used the "install" program
to install them with 0755 permissions.

I've attached a "diff" (which, as I said earlier, won't be much use with
patch since files were moved around), and an updated .dsc and .diff.gz
against the .orig.tar.gz you posted earlier.

Please let me know if there's anything else I can do to help!

-- 
+---------------------------------------+
| John Wright <john.wright@hp.com>      |
| HP Open Source and Linux Organization |
+---------------------------------------+
=== removed directory 'debian/etc'
=== removed directory 'debian/etc/default'
=== removed directory 'debian/etc/init.d'
=== removed directory 'debian/etc/network'
=== removed directory 'debian/etc/network/if-down.d'
=== removed directory 'debian/etc/network/if-up.d'
=== renamed file 'debian/etc/default/tipc' => 'debian/tipcutils.tipc.default'
=== renamed file 'debian/etc/init.d/tipc' => 'debian/tipcutils.tipc.init'
=== renamed file 'debian/etc/network/if-down.d/tipc' => 'debian/tipc.ifdown'
=== renamed file 'debian/etc/network/if-up.d/tipc' => 'debian/tipc.ifup'
=== modified file 'Makefile'
--- Makefile	2007-06-05 21:03:05 +0000
+++ Makefile	2007-06-05 21:57:21 +0000
@@ -2,15 +2,15 @@
 # Makefile for tipcutils
 #
 
-#ifndef KERNELDIR
-#	KERNELDIR = /usr/src/linux
-#endif
 ifndef KERNELDIR
-	KERNELDIR = /usr/include
+	KERNELDIR = /usr/src/linux
 endif
 
 VERSION = 1.0.4
-CFLAGS = -Wall -O2 -I${KERNELDIR}/include -D VERSION=\"${VERSION}\"
+# In Debian, linux-kernel-headers installs the contents of linux/include to
+# /usr/include.
+#CFLAGS = -Wall -O2 -I${KERNELDIR}/include -D VERSION=\"${VERSION}\"
+CFLAGS = -Wall -O2 -D VERSION=\"${VERSION}\"
 
 all: tipc-config
 

=== modified file 'debian/rules'
--- debian/rules	2007-06-05 21:03:05 +0000
+++ debian/rules	2007-06-05 21:23:39 +0000
@@ -56,6 +56,10 @@
 
 	# Add here commands to install the package into debian/tipcutils.
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tipcutils install
+	install -D -m 0755 debian/tipc.ifup \
+	  $(CURDIR)/debian/tipcutils/etc/network/if-up.d/tipc
+	install -D -m 0755 debian/tipc.ifdown \
+	  $(CURDIR)/debian/tipcutils/etc/network/if-down.d/tipc
 
 
 # Build architecture-independent files here.
@@ -70,10 +74,6 @@
 	dh_installdocs
 	dh_installexamples
 #	dh_install
-	dh_install --sourcedir=$(CURDIR)/debian/etc/network/if-up.d   tipc /etc/network/if-up.d/
-	dh_install --sourcedir=$(CURDIR)/debian/etc/network/if-down.d tipc /etc/network/if-down.d/
-	dh_install --sourcedir=$(CURDIR)/debian/etc/init.d            tipc /etc/init.d/
-	dh_install --sourcedir=$(CURDIR)/debian/etc/default/          tipc /etc/default/
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
@@ -81,7 +81,7 @@
 #	dh_installpam
 #	dh_installmime
 #	dh_python
-#	dh_installinit
+	dh_installinit --name=tipc
 #	dh_installcron
 #	dh_installinfo
 	dh_installman debian/tipc-config.8

Format: 1.0
Source: tipcutils
Version: 1.0.4-1
Binary: tipcutils
Maintainer: Martin Peylo <debian@izac.de>
Architecture: any
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5), linux-kernel-headers (>= 2.6.16)
Files: 
 8d1d23f6e6d6958bb00ad6a9a008ccc0 12918 tipcutils_1.0.4.orig.tar.gz
 80938c3c1634bb332c608f6495c8858d 6913 tipcutils_1.0.4-1.diff.gz

Attachment: tipcutils_1.0.4-1.diff.gz
Description: application/gunzip

Attachment: pgpPJTsdqe8LS.pgp
Description: PGP signature


Reply to: