tag 532546 patch user ubuntu-de...@lists.ubuntu.com usertag 123456 + origin-ubuntu karmic ubuntu-patch thanks
Michael Biebl [2009-06-10 2:19 +0200]: > according to http://sg.danny.cz/sg/sg3_utils.html, the latest upstream > version of sg3-utils is 1.27. > Please package this version, as I need at least a version >= 1.26 for > one of my packages (DeviceKit-disks) I maintain. We need that in Ubuntu for the same reason. I updated the package in Ubuntu. For your convenience, I attach the diff.gz interdiff. I repackaged the upstream orig.tar.gz to not have debian/ inside, just as you apparently did with earlier releases as well. The inline patches applied in 1.24-2 are fixed/unnecessary in 1.27, so I dropped them. Thanks for considering! Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
reverted:
--- sg3-utils-1.24/Makefile
+++ sg3-utils-1.24.orig/Makefile
@@ -1,10 +1,10 @@
SHELL = /bin/sh
PREFIX=/usr/local
+LIBDIR=$(DESTDIR)/$(PREFIX)/lib
+INSTDIR=$(DESTDIR)/$(PREFIX)/bin
+MANDIR=$(DESTDIR)/$(PREFIX)/share/man
+INCLUDEDIR=$(DESTDIR)/$(PREFIX)/include
-LIBDIR=$(DESTDIR)$(PREFIX)/lib
-INSTDIR=$(DESTDIR)$(PREFIX)/bin
-MANDIR=$(DESTDIR)$(PREFIX)/share/man
-INCLUDEDIR=$(DESTDIR)$(PREFIX)/include
CC = gcc
LD = gcc
reverted:
--- sg3-utils-1.24/Makefile.freebsd
+++ sg3-utils-1.24.orig/Makefile.freebsd
@@ -1,10 +1,10 @@
SHELL = /bin/sh
PREFIX=/usr/local
+LIBDIR=$(DESTDIR)/$(PREFIX)/lib
+INSTDIR=$(DESTDIR)/$(PREFIX)/bin
+MANDIR=$(DESTDIR)/$(PREFIX)/man
+INCLUDEDIR=$(DESTDIR)/$(PREFIX)/include
-LIBDIR=$(DESTDIR)$(PREFIX)/lib
-INSTDIR=$(DESTDIR)$(PREFIX)/bin
-MANDIR=$(DESTDIR)$(PREFIX)/man
-INCLUDEDIR=$(DESTDIR)$(PREFIX)/include
CC = gcc
LD = gcc
@@ -74,7 +74,7 @@
$(LIBTOOL) $(LT_EXTRA) --mode=compile $(CC) -c sg_pt_freebsd.c
libsgutils.la: sg_lib.lo sg_cmds_basic.lo sg_cmds_extra.lo sg_pt_freebsd.lo
+ $(LIBTOOL) $(LT_EXTRA) --mode=link $(LD) -o libsgutils.la sg_lib.lo \
- $(LIBTOOL) $(LT_EXTRA) --mode=link $(LD) $(LDFLAGS) -o libsgutils.la
sg_lib.lo \
sg_cmds_basic.lo sg_cmds_extra.lo sg_pt_freebsd.lo -rpath $(LIBDIR) \
-version-info $(LIB_VINFO)
diff -u sg3-utils-1.24/debian/changelog sg3-utils-1.27~repack/debian/changelog
--- sg3-utils-1.24/debian/changelog
+++ sg3-utils-1.27~repack/debian/changelog
@@ -1,3 +1,15 @@
+sg3-utils (1.27~repack-0ubuntu1) karmic; urgency=low
+
+ * New upstream release (required for current devicekit-disks), see
+ Debian #532546. Upstream original tarball repacked to not contain debian/
+ directory. Use weird upstream version to avoid orig.tar.gz mismatch once
+ this goes into Debian.
+ * Rename libsgutils1{,-dev} to libsgutils2{,-dev}, upstream bumped soname.
+ * debian/rules: Update build rules for upstream Makefile → autotools switch.
+ * debian/rules: Fix cleaning a clean source package.
+
+ -- Martin Pitt <martin.p...@ubuntu.com> Mon, 22 Jun 2009 12:04:20 +0200
+
sg3-utils (1.24-2) unstable; urgency=low
* Cleaned up package description (Closes: #445920).
diff -u sg3-utils-1.24/debian/control sg3-utils-1.27~repack/debian/control
--- sg3-utils-1.24/debian/control
+++ sg3-utils-1.27~repack/debian/control
@@ -26,20 +27,20 @@
It also includes source code for some example programs that demonstrate
how to use the scsi generic driver.
-Package: libsgutils1
+Package: libsgutils2
Section: libs
Depends: ${shlibs:Depends}
-Conflicts: libsgutils-1-0
Architecture: any
Recommends: 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}
+Depends: libsgutils2, ${shlibs:Depends}
+Conflicts: libsgutils1-dev
Recommends: 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
reverted:
--- sg3-utils-1.24/debian/libsgutils1-0-dev.dirs
+++ sg3-utils-1.24.orig/debian/libsgutils1-0-dev.dirs
@@ -1,2 +0,0 @@
-usr/lib
-usr/include/scsi
reverted:
--- sg3-utils-1.24/debian/libsgutils1-0-dev.install
+++ sg3-utils-1.24.orig/debian/libsgutils1-0-dev.install
@@ -1,5 +0,0 @@
-usr/include/scsi
-usr/lib/*.so
-usr/lib/*.lo
-usr/lib/*.la
-usr/lib/*.a
reverted:
--- sg3-utils-1.24/debian/libsgutils1-0.dirs
+++ sg3-utils-1.24.orig/debian/libsgutils1-0.dirs
@@ -1 +0,0 @@
-usr/lib
reverted:
--- sg3-utils-1.24/debian/libsgutils1-0.install
+++ sg3-utils-1.24.orig/debian/libsgutils1-0.install
@@ -1 +0,0 @@
-usr/lib/*.so.*
reverted:
--- sg3-utils-1.24/debian/libsgutils1-dev.install
+++ sg3-utils-1.24.orig/debian/libsgutils1-dev.install
@@ -1,5 +0,0 @@
-usr/include/scsi
-usr/lib/*.so
-usr/lib/*.lo
-usr/lib/*.la
-usr/lib/*.a
reverted:
--- sg3-utils-1.24/debian/libsgutils1.install
+++ sg3-utils-1.24.orig/debian/libsgutils1.install
@@ -1 +0,0 @@
-usr/lib/*.so.*
reverted:
--- sg3-utils-1.24/debian/libsgutils1.postinst
+++ sg3-utils-1.24.orig/debian/libsgutils1.postinst
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
reverted:
--- sg3-utils-1.24/debian/libsgutils1.postrm
+++ sg3-utils-1.24.orig/debian/libsgutils1.postrm
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff -u sg3-utils-1.24/debian/rules sg3-utils-1.27~repack/debian/rules
--- sg3-utils-1.24/debian/rules
+++ sg3-utils-1.27~repack/debian/rules
@@ -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
@@ -51,7 +46,7 @@
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,14 @@
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
+ dh_shlibdeps -ldebian/tmp/usr/lib -L libsgutils2
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
reverted:
--- sg3-utils-1.24/sginfo.8
+++ sg3-utils-1.24.orig/sginfo.8
@@ -143,7 +143,7 @@
returns all pages supported by the device in ascending order except for
page 0 which, if present, is last. Page 0 is vendor specific and not
necessarily in mode page format. Alternatively hex values can be given for
+both \fIPN\f and \fISPN\fR (both prefixed by '0x').
-both \fIPN\fR and \fISPN\fR (both prefixed by '0x').
.TP
\fB\-t\fR
Trace commands (for debugging). When used once SCSI commands are shown
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2.install
+++ sg3-utils-1.27~repack/debian/libsgutils2.install
@@ -0,0 +1 @@
+usr/lib/*.so.*
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2-0-dev.install
+++ sg3-utils-1.27~repack/debian/libsgutils2-0-dev.install
@@ -0,0 +1,5 @@
+usr/include/scsi
+usr/lib/*.so
+usr/lib/*.lo
+usr/lib/*.la
+usr/lib/*.a
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2.postrm
+++ sg3-utils-1.27~repack/debian/libsgutils2.postrm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2-0-dev.dirs
+++ sg3-utils-1.27~repack/debian/libsgutils2-0-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib
+usr/include/scsi
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2.postinst
+++ sg3-utils-1.27~repack/debian/libsgutils2.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2-dev.install
+++ sg3-utils-1.27~repack/debian/libsgutils2-dev.install
@@ -0,0 +1,5 @@
+usr/include/scsi
+usr/lib/*.so
+usr/lib/*.lo
+usr/lib/*.la
+usr/lib/*.a
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2-0.dirs
+++ sg3-utils-1.27~repack/debian/libsgutils2-0.dirs
@@ -0,0 +1 @@
+usr/lib
only in patch2:
unchanged:
--- sg3-utils-1.27~repack.orig/debian/libsgutils2-0.install
+++ sg3-utils-1.27~repack/debian/libsgutils2-0.install
@@ -0,0 +1 @@
+usr/lib/*.so.*
signature.asc
Description: Digital signature
