[kernel] r14813 - in dists/trunk/tgt/debian: . patches

[Frederik Schüler]

Author: fs
Date: Thu Dec 24 15:49:19 2009
New Revision: 14813

Log:
* New upstream release.
* Drop GPL digest patch, upstream has other implementation.
* Add dependency on libconfig-general-perl. (Closes: #560710)
* Build iSER driver, too.

Added:
   dists/trunk/tgt/debian/patches/conf-makefile
Deleted:
   dists/trunk/tgt/debian/patches/use-gpl-digest-code
Modified:
   dists/trunk/tgt/debian/changelog
   dists/trunk/tgt/debian/compat
   dists/trunk/tgt/debian/control
   dists/trunk/tgt/debian/patches/series
   dists/trunk/tgt/debian/rules

Modified: dists/trunk/tgt/debian/changelog
==============================================================================
--- dists/trunk/tgt/debian/changelog	Thu Dec 24 08:23:37 2009	(r14812)
+++ dists/trunk/tgt/debian/changelog	Thu Dec 24 15:49:19 2009	(r14813)
@@ -1,5 +1,15 @@
-tgt (1:0.9.10-1) UNRELEASED; urgency=low
+tgt (1:1.0.0-1) unstable; urgency=low
+  
+  * New upstream release.
+    - Drop GPL digest patch, upstream has other implementation.
+  * Add dependency on libconfig-general-perl. (Closes: #560710)
+  * Build iSER driver, too.
 
+ -- Frederik Schüler <fs at debian.org>  Thu, 24 Dec 2009 16:34:17 +0100
+
+tgt (1:0.9.11-1) unstable; urgency=low
+
+  [ Ben Hutchings ]
   * New upstream version (Closes: #501149)
     - Adds -D_GNU_SOURCE to compiler options (Closes: #526562)
   * Add myself to Uploaders
@@ -13,7 +23,10 @@
     - Mention 'SCSI' in the short description
     - Update list of drivers
 
- -- Ben Hutchings <ben at decadent.org.uk>  Sun, 15 Nov 2009 10:45:07 +0000
+  [ Frederik Schüler ]
+  * Switch to debhelper 7.
+
+ -- Frederik Schüler <fs at debian.org>  Wed, 09 Dec 2009 10:29:39 +0100
 
 tgt (20070924-1) unstable; urgency=low
 

Modified: dists/trunk/tgt/debian/compat
==============================================================================
--- dists/trunk/tgt/debian/compat	Thu Dec 24 08:23:37 2009	(r14812)
+++ dists/trunk/tgt/debian/compat	Thu Dec 24 15:49:19 2009	(r14813)
@@ -1 +1 @@
-5
+7

Modified: dists/trunk/tgt/debian/control
==============================================================================
--- dists/trunk/tgt/debian/control	Thu Dec 24 08:23:37 2009	(r14812)
+++ dists/trunk/tgt/debian/control	Thu Dec 24 15:49:19 2009	(r14813)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Frederik Schüler <fs at debian.org>, Ben Hutchings <ben at decadent.org.uk>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7), libibverbs-dev, librdmacm-dev
 Standards-Version: 3.8.3
 Homepage: http://stgt.berlios.de/
 
 Package: tgt
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libconfig-general-perl
 Description: Linux SCSI target user-space tools
  The Linux target framework (tgt) allows a Linux system to provide SCSI
  devices (targets) over networked SCSI transports.
@@ -22,3 +22,5 @@
  .
   - FCoE (Fibre Channel over Ethernet)
   - iSCSI (SCSI over IP)
+  - iSER (iSCSI over RDMA, using Infiniband)
+ .

Added: dists/trunk/tgt/debian/patches/conf-makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/tgt/debian/patches/conf-makefile	Thu Dec 24 15:49:19 2009	(r14813)
@@ -0,0 +1,14 @@
+--- tgt-1.0.0/conf/Makefile.old	2009-12-24 16:18:28.000000000 +0100
++++ tgt-1.0.0/conf/Makefile	2009-12-24 16:19:23.000000000 +0100
+@@ -11,9 +11,9 @@
+ 	if [ ! -f $(DESTDIR)$(sysconfdir)/tgt/targets.conf ] ; then \
+ 		install -m 644 targets.conf $(DESTDIR)$(sysconfdir)/tgt ; \
+ 	fi
+-	install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/examples
++	install -d -m 755 $(DESTDIR)/usr/share/doc/tgt/examples
+ 	for f in $(EXAMPLES) ; do \
+-		install -m 644 examples/$$f $(DESTDIR)$(sysconfdir)/tgt/examples ;\
++		install -m 644 examples/$$f $(DESTDIR)/usr/share/doc/tgt/examples ;\
+ 	done
+ 
+ .PHONY: clean

Modified: dists/trunk/tgt/debian/patches/series
==============================================================================
--- dists/trunk/tgt/debian/patches/series	Thu Dec 24 08:23:37 2009	(r14812)
+++ dists/trunk/tgt/debian/patches/series	Thu Dec 24 15:49:19 2009	(r14813)
@@ -1,3 +1,3 @@
-tgtadm-usage-metasyntax
-use-gpl-digest-code
 make-tgt-setup-lun-executable
+tgtadm-usage-metasyntax
+conf-makefile

Modified: dists/trunk/tgt/debian/rules
==============================================================================
--- dists/trunk/tgt/debian/rules	Thu Dec 24 08:23:37 2009	(r14812)
+++ dists/trunk/tgt/debian/rules	Thu Dec 24 15:49:19 2009	(r14813)
@@ -13,12 +13,13 @@
 
 build-stamp: 
 	dh_testdir
-	$(MAKE) FCOE=1 ISCSI=1
+	$(MAKE) FCOE=1 ISCSI=1 ISCSI_RDMA=1
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
+	dh_prep
 	rm -f build-stamp
 	$(MAKE) clean
 	dh_clean 
@@ -26,8 +27,8 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
-	$(MAKE) FCOE=1 ISCSI=1 DESTDIR=$(CURDIR)/debian/tgt install
+	dh_clean
+	$(MAKE) FCOE=1 ISCSI=1 ISCSI_RDMA=1 DESTDIR=$(CURDIR)/debian/tgt install
 
 binary-indep: build install