Hello all, Martin Pitt [2009-07-01 13:15 +0200]: > Would you mind if I NMU this? I'd upload to delayed/7 with the patch I > sent before.
I applied that patch now, and some more packaging cleanups to conform to current policy, standards-version, etc. debdiff attached. I didn't upload to delayed, since the package will be caught in binary NEW anyway, which provides a grace delay by itself. Thanks, and let me know if you have any questions or doubts, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
--- sg3-utils-1.24/debian/changelog 2009-07-11 16:46:02.000000000 +0200
+++ sg3-utils-1.27/debian/changelog 2009-07-11 16:46:02.000000000 +0200
@@ -1,3 +1,39 @@
+sg3-utils (1.27-0.1) unstable; urgency=low
+
+ [ Martin Pitt ]
+ * Non-maintainer upload; this package blocks DeviceKit, and maintainer is
+ apparently not active any more. Also clean up and modernize the package
+ somewhat while we are at it.
+ * New upstream release (required for current devicekit-disks).
+ (Closes: #532546). Upstream original tarball repacked to not contain
+ debian/ directory.
+ * Rename libsgutils1{,-dev} to libsgutils2-2{,-dev}, upstream bumped SONAME.
+ Also call the library libgsutils2-2 to match SONAME. Add
+ Conflicts/Replaces for "libsgutils2" to provide a clean upgrade from the
+ packages as provided by Upstream and Ubuntu.
+ * debian/rules: Update build rules for upstream Makefile → autotools switch.
+ * debian/rules: Fix cleaning a clean source package.
+ * Demote Recommends to Suggests; the library doesn't actually call the
+ binaries in sg3-utils. (Closes: #532547)
+ * Drop debian/*.dirs, unnecessary with dh_install.
+ * Drop sg3-utils.preinst, not necessary to deal with kernel 2.4 any more.
+ * Drop libsgutils2-0.install, libsgutils2-0-dev.install, these packages
+ don't exist.
+ * Drop libsgutils2.post{inst,rm}: Basically empty, debhelper will create its
+ own.
+ * libsgutils2-dev.install: Drop *.lo.
+ * debian/compat: 4 -> 7. Bump debhelper build-depends accordingly.
+ * debian/control: Bump Standards-Version to 3.8.2.
+ * debian/control: Modernize package description for Linux 2.6.
+ (Closes: #506578)
+ * debian/rules: Drop -k argument from dh_clean (thanks lintian).
+
+ [ Frank Lichtenheld ]
+ * debian/control, debian/rules: Add dependency of libsgutils-dev on
+ libcam-dev on kfreebsd-*. (Closes: #519460)
+
+ -- Martin Pitt <[email protected]> Mon, 22 Jun 2009 12:04:20 +0200
+
sg3-utils (1.24-2) unstable; urgency=low
* Cleaned up package description (Closes: #445920).
--- sg3-utils-1.24/debian/compat 2009-07-11 16:46:02.000000000 +0200
+++ sg3-utils-1.27/debian/compat 2009-07-11 16:46:02.000000000 +0200
@@ -1 +1 @@
-4
+7
--- sg3-utils-1.24/debian/control 2009-07-11 16:46:02.000000000 +0200
+++ sg3-utils-1.27/debian/control 2009-07-11 16:46:02.000000000 +0200
@@ -2,46 +2,43 @@
Section: admin
Priority: optional
Maintainer: Eric Schwartz (Skif) <[email protected]>
-Build-Depends: debhelper (>> 4.0.0), libtool, libcam-dev [kfreebsd-i386
kfreebsd-amd64]
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 7), libtool, libcam-dev [kfreebsd-i386
kfreebsd-amd64]
+Standards-Version: 3.8.2
Package: sg3-utils
Architecture: any
Depends: ${shlibs:Depends}
Conflicts: sg-utils, cdwrite
Replaces: sg-utils
-Description: Utilities for working with generic SCSI devices
+Description: utilities for working with generic SCSI devices
This package includes a number of utilities to manipulate the Linux "sg"
(version 3) device driver.
.
- This driver is only found in 2.4.x Linux kernels; if you are using
- 2.2 (or earlier), please install the sg-utils package instead. In
- the 2.4 series SCSI generic device names (e.g. /dev/sg0) must be
- used. In the 2.6 series other device names may be used as well
- (e.g. /dev/sda).
- .
- The package includes a number of utilities to allow a user to use the sg
- interface to find out low-level information about any SCSI device.
+ The package includes a number of utilities to allow a user to use the Linux
+ SCSI generic ("sg") interface to find out low-level information about any SCSI
+ device.
.
It also includes source code for some example programs that demonstrate
- how to use the scsi generic driver.
+ how to use the sg generic driver.
-Package: libsgutils1
+Package: libsgutils2-2
Section: libs
Depends: ${shlibs:Depends}
-Conflicts: libsgutils-1-0
Architecture: any
-Recommends: sg3-utils
-Description: Utilities for working with generic SCSI devices (shared libraries)
+Conflicts: libsgutils2
+Replaces: libsgutils2
+Suggests: sg3-utils
+Description: utilities for working with generic SCSI devices (shared libraries)
This package contains shared libraries that allow programs to use the sg
interface to query SCSI devices.
-Package: libsgutils1-dev
+Package: libsgutils2-dev
Section: libdevel
Architecture: any
-Depends: libsgutils1, ${shlibs:Depends}
-Recommends: sg3-utils
-Description: Utilities for working with generic SCSI devices (developer files)
+Depends: libsgutils2-2 (= ${binary:Version}), ${shlibs:Depends},
${kfreebsd:Depends}
+Conflicts: libsgutils1-dev
+Suggests: sg3-utils
+Description: utilities for working with generic SCSI devices (developer files)
This package contains the <scsi/sg_cmds.h> and <scsi/sg_lib.h> header
files, the /usr/lib/libsgutils.a static library and other assorted
development tidbits.
--- sg3-utils-1.24/debian/libsgutils1-0-dev.dirs 2009-07-11
16:46:02.000000000 +0200
+++ sg3-utils-1.27/debian/libsgutils1-0-dev.dirs 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib
-usr/include/scsi
--- sg3-utils-1.24/debian/libsgutils1-0-dev.install 2009-07-11
16:46:02.000000000 +0200
+++ sg3-utils-1.27/debian/libsgutils1-0-dev.install 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/include/scsi
-usr/lib/*.so
-usr/lib/*.lo
-usr/lib/*.la
-usr/lib/*.a
--- sg3-utils-1.24/debian/libsgutils1-0.dirs 2009-07-11 16:46:02.000000000
+0200
+++ sg3-utils-1.27/debian/libsgutils1-0.dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-usr/lib
--- sg3-utils-1.24/debian/libsgutils1-0.install 2009-07-11 16:46:02.000000000
+0200
+++ sg3-utils-1.27/debian/libsgutils1-0.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-usr/lib/*.so.*
--- sg3-utils-1.24/debian/libsgutils1-dev.install 2009-07-11
16:46:02.000000000 +0200
+++ sg3-utils-1.27/debian/libsgutils1-dev.install 1970-01-01
01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/include/scsi
-usr/lib/*.so
-usr/lib/*.lo
-usr/lib/*.la
-usr/lib/*.a
--- sg3-utils-1.24/debian/libsgutils1.install 2009-07-11 16:46:02.000000000
+0200
+++ sg3-utils-1.27/debian/libsgutils1.install 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-usr/lib/*.so.*
--- sg3-utils-1.24/debian/libsgutils1.postinst 2009-07-11 16:46:02.000000000
+0200
+++ sg3-utils-1.27/debian/libsgutils1.postinst 1970-01-01 01:00:00.000000000
+0100
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
--- sg3-utils-1.24/debian/libsgutils1.postrm 2009-07-11 16:46:02.000000000
+0200
+++ sg3-utils-1.27/debian/libsgutils1.postrm 1970-01-01 01:00:00.000000000
+0100
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
--- sg3-utils-1.24/debian/libsgutils2-2.install 1970-01-01 01:00:00.000000000
+0100
+++ sg3-utils-1.27/debian/libsgutils2-2.install 2009-07-11 16:46:02.000000000
+0200
@@ -0,0 +1 @@
+usr/lib/*.so.*
--- sg3-utils-1.24/debian/libsgutils2-dev.install 1970-01-01
01:00:00.000000000 +0100
+++ sg3-utils-1.27/debian/libsgutils2-dev.install 2009-07-11
16:46:02.000000000 +0200
@@ -0,0 +1,4 @@
+usr/include/scsi
+usr/lib/*.so
+usr/lib/*.la
+usr/lib/*.a
--- sg3-utils-1.24/debian/rules 2009-07-11 16:46:02.000000000 +0200
+++ sg3-utils-1.27/debian/rules 2009-07-11 16:46:02.000000000 +0200
@@ -11,16 +11,11 @@
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-MAKEFILE = Makefile
-ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
- MAKEFILE = Makefile.freebsd
-endif
-
-
configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
+ CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --bindir=/usr/bin --prefix=/usr
--mandir=\$${prefix}/share/man
touch configure-stamp
build: configure-stamp build-stamp
@@ -28,7 +23,7 @@
dh_testdir
# Add here commands to compile the package.
- PREFIX=/usr MANDIR=/usr/share/man $(MAKE) -f $(MAKEFILE) -e
+ PREFIX=/usr MANDIR=/usr/share/man $(MAKE) -e
touch build-stamp
@@ -37,7 +32,7 @@
dh_testroot
# Add here commands to clean up after the build process.
- $(MAKE) -f $(MAKEFILE) clean
+ -$(MAKE) distclean
rm -f build-stamp configure-stamp debian/substvars
@@ -47,11 +42,11 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_clean
dh_installdirs
# Add here commands to install the package into debian/tmp
- $(MAKE) -f $(MAKEFILE) -e install DESTDIR=$(CURDIR)/debian/tmp
PREFIX=/usr
+ $(MAKE) -e install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
dh_install --autodest --sourcedir=debian/tmp
cp scripts/scsi* scripts/sas* debian/sg3-utils/usr/bin
@@ -70,14 +65,17 @@
dh_installdocs -a
dh_installexamples -a
dh_installmenu -a
- dh_installchangelogs CHANGELOG -a
+ dh_installchangelogs ChangeLog -a
dh_strip -a
dh_link -a
dh_compress -a -X archive -X .c -X .h
dh_fixperms -a
dh_makeshlibs -V -v
dh_installdeb -a
- dh_shlibdeps -ldebian/tmp/usr/lib -L libsgutils1
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ echo kfreebsd:Depends=libcam-dev >>debian/libsgutils2-dev.substvars
+endif
+ dh_shlibdeps -ldebian/tmp/usr/lib -L libsgutils2
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
--- sg3-utils-1.24/debian/sg3-utils.dirs 2009-07-11 16:46:02.000000000
+0200
+++ sg3-utils-1.27/debian/sg3-utils.dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-usr/bin
--- sg3-utils-1.24/debian/sg3-utils.preinst 2009-07-11 16:46:02.000000000
+0200
+++ sg3-utils-1.27/debian/sg3-utils.preinst 1970-01-01 01:00:00.000000000
+0100
@@ -1,48 +0,0 @@
-#! /bin/sh
-# preinst script for sg-utils
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
-
-case "$1" in
- install|upgrade)
- kernel_version=`/bin/uname -r`;
- major_version=`echo $kernel_version | sed 's/\.[0-9]\+$//'`;
- minor_version=`echo $kernel_version | sed 's/.*\.\([0-9]\+\)/\1/'`;
-
- case $major_version in
- 2.[0-3])
- echo "You are running linux kernel version $kernel_version."
- echo "sg3_utils will not work on kernels older than 2.4."
- echo "If you want to run code with older kernels, please"
- echo "install sg_utils instead."
- exit 0;
- ;;
- *)
- esac
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 0
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
signature.asc
Description: Digital signature
