Merge lp:~dannf/ubuntu/trusty/open-iscsi/lp1274203 into lp:ubuntu/trusty/open-iscsi

Proposed by dann frazier
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/open-iscsi/lp1274203
Merge into: lp:ubuntu/trusty/open-iscsi
Diff against target: 40 lines (+9/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/open-iscsi/lp1274203
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+203827@code.launchpad.net

Description of the change

Tested on arm64

To post a comment you must log in.
48. By dann frazier

<infinity> dannf: Add x32 to that list too, and I'm sold.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-10-11 17:03:37 +0000
+++ debian/changelog 2014-01-29 20:28:08 +0000
@@ -1,3 +1,10 @@
1open-iscsi (2.0.873-3ubuntu8) UNRELEASED; urgency=medium
2
3 * open-iscsi-udeb: Enable builds on armhf, arm64, ppc64el and x32
4 (LP: #1274203)
5
6 -- dann frazier <dann.frazier@canonical.com> Wed, 29 Jan 2014 12:34:45 -0700
7
1open-iscsi (2.0.873-3ubuntu7) saucy; urgency=low8open-iscsi (2.0.873-3ubuntu7) saucy; urgency=low
29
3 * Use dh_autotools-dev to update config.sub|guess.10 * Use dh_autotools-dev to update config.sub|guess.
411
=== modified file 'debian/control'
--- debian/control 2013-05-13 09:42:51 +0000
+++ debian/control 2014-01-29 20:28:08 +0000
@@ -56,7 +56,7 @@
56 This is an empty transitional package, it can be safely removed.56 This is an empty transitional package, it can be safely removed.
5757
58Package: open-iscsi-udeb58Package: open-iscsi-udeb
59Architecture: amd64 i386 ia64 mips mipsel powerpc59Architecture: amd64 arm64 armhf i386 ia64 mips mipsel powerpc ppc64el x32
60Section: debian-installer60Section: debian-installer
61Package-Type: udeb61Package-Type: udeb
62Depends: ${shlibs:Depends}, ${misc:Depends}, scsi-modules, libnss-files-udeb62Depends: ${shlibs:Depends}, ${misc:Depends}, scsi-modules, libnss-files-udeb
6363
=== modified file 'debian/rules'
--- debian/rules 2013-10-11 17:03:37 +0000
+++ debian/rules 2014-01-29 20:28:08 +0000
@@ -10,7 +10,7 @@
10DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')10DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
1111
12DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)12DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
13SUPPORTED_ARCH_UDEB = amd64 i386 ia64 mips mipsel powerpc13SUPPORTED_ARCH_UDEB = amd64 arm64 armhf i386 ia64 mips mipsel powerpc ppc64el x32
1414
15get-orig-source:15get-orig-source:
16 [ ! -f $(ORIG_FILE).gz ] || rm -f $(ORIG_FILE).gz16 [ ! -f $(ORIG_FILE).gz ] || rm -f $(ORIG_FILE).gz

Subscribers

People subscribed via source and target branches

to all changes: