Package: obs-build
Followup-For: Bug #796522
Dear Maintainer,
I've prepared a NMU for new upstream release.
I updated it to the latest release and fixed all lintian
reports.
Would you mind to accept co-maintainship or this NMU?
Best regards,
-Andrew
diff -urN /tmp/obs-build-20141024/debian/changelog obs-build-20160921/debian/changelog
--- /tmp/obs-build-20141024/debian/changelog 2015-12-29 21:24:16.000000000 +0800
+++ obs-build-20160921/debian/changelog 2016-09-23 13:17:21.507675412 +0800
@@ -1,3 +1,17 @@
+obs-build (20160921-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream release. (Closes: #786404, #796522)
+ * Drop 0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch:
+ included upstream.
+ * Refreshed 0001-Use-obs-build-in-locations-and-executable-names-inst.patch.
+ * Bump standard-version to 3.9.8.
+ * debian/control: Added misc depends.
+ * debian/control: depends on debootstrap.
+ * debian/copyright: added missing gpl-2 and gpl-3 licenses paragraph.
+
+ -- Andrew Lee (李健秋) <andrew....@collabora.co.uk> Fri, 23 Sep 2016 11:45:48 +0800
+
obs-build (20141024-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -urN /tmp/obs-build-20141024/debian/control obs-build-20160921/debian/control
--- /tmp/obs-build-20141024/debian/control 2014-10-25 09:38:08.000000000 +0800
+++ obs-build-20160921/debian/control 2016-09-23 12:24:07.297171886 +0800
@@ -3,14 +3,14 @@
Priority: extra
Maintainer: Dimitri John Ledkov <dimitri.j.led...@linux.intel.com>
Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6.0
+Standards-Version: 3.9.8
Package: obs-build
Architecture: all
-Depends: ${perl:Depends}, rpm
+Depends: ${misc:Depends}, ${perl:Depends}, rpm, debootstrap
Recommends: rpm2cpio, osc, libcrypt-ssleay-perl
Description: scripts for building RPM/debian packages for multiple distributions
This package provides scripts for building RPM and debian packages in
contained environments for various build distributions. These tools
are use by Open Build Service workers and openSUSE distribution by
- default.
\ 檔案末沒有 newline 字元
+ default.
diff -urN /tmp/obs-build-20141024/debian/copyright obs-build-20160921/debian/copyright
--- /tmp/obs-build-20141024/debian/copyright 2014-10-25 09:55:33.000000000 +0800
+++ obs-build-20160921/debian/copyright 2016-09-23 12:56:27.591697867 +0800
@@ -31,3 +31,37 @@
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; under version 3 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
+
diff -urN /tmp/obs-build-20141024/debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch obs-build-20160921/debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch
--- /tmp/obs-build-20141024/debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch 2014-10-25 09:38:26.000000000 +0800
+++ obs-build-20160921/debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch 2016-09-23 11:43:45.311231254 +0800
@@ -10,8 +10,6 @@
build | 6 +++---
2 files changed, 10 insertions(+), 9 deletions(-)
-diff --git a/Makefile b/Makefile
-index 8c84ced..94e4abb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
@@ -23,7 +21,7 @@
INITVM_ARCH=$(shell bash -c '. common_functions ; build_host_arch; echo $$BUILD_INITVM_ARCH')
-@@ -68,11 +68,12 @@ install:
+@@ -73,11 +73,12 @@
install -m644 build-pkg build-pkg-* $(DESTDIR)$(pkglibdir)
install -m644 *.pm baselibs_global*.conf lxc.conf $(DESTDIR)$(pkglibdir)
install -m644 configs/* $(DESTDIR)$(pkglibdir)/configs
@@ -41,12 +39,10 @@
ln -sf $(pkglibdir)/unrpm $(DESTDIR)$(bindir)/unrpm
# Allow initvm to be packaged seperately from the rest of build. This
-diff --git a/build b/build
-index cdba8f8..3a5f696 100755
--- a/build
+++ b/build
-@@ -31,8 +31,8 @@ if test "$0" = /sbin/init ; then
- fi
+@@ -36,8 +36,8 @@
+ test -e "$BUILD_CONF" && BUILD_DIR=/usr/lib/build
test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build
-test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build
@@ -55,13 +51,13 @@
+test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/obs-build-root
test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs"
- export CHROOT="chroot $BUILD_ROOT"
-@@ -94,7 +94,7 @@ DO_STATISTICS=
+ export BUILD_ARCH BUILD_HOST_ARCH BUILD_ROOT BUILD_RPMS BUILD_DIR BUILD_DEBUG
+@@ -103,7 +103,7 @@
RUN_SHELL=
CCACHE=
DLNOSIGNATURE=
-CACHE_DIR=/var/cache/build
+CACHE_DIR=/var/cache/obs-build
+ MYHOSTNAME=
- # This is for insserv
diff -urN /tmp/obs-build-20141024/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch obs-build-20160921/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch
--- /tmp/obs-build-20141024/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch 2014-10-25 09:38:26.000000000 +0800
+++ obs-build-20160921/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch 1970-01-01 08:00:00.000000000 +0800
@@ -1,25 +0,0 @@
-From 23590deedb2bf7d7482e1ec49eb735c64dce9883 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <dimitri.j.led...@intel.com>
-Date: Fri, 3 Oct 2014 14:28:45 +0100
-Subject: Fix Build::Zypp:parsecfg expected full config file name.
-
-Fixes #135
-
-Signed-off-by: Dimitri John Ledkov <dimitri.j.led...@intel.com>
----
- Build/Zypp.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Build/Zypp.pm b/Build/Zypp.pm
-index 20d020c..7518d17 100644
---- a/Build/Zypp.pm
-+++ b/Build/Zypp.pm
-@@ -28,7 +28,7 @@ sub parsecfg {
- my ($repocfg, $reponame) = @_;
-
- local *REPO;
-- open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg.repo") or return undef;
-+ open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg") or return undef;
- my $name;
- my $repo = {};
- while (<REPO>) {
diff -urN /tmp/obs-build-20141024/debian/patches/series obs-build-20160921/debian/patches/series
--- /tmp/obs-build-20141024/debian/patches/series 2015-12-29 21:22:25.000000000 +0800
+++ obs-build-20160921/debian/patches/series 2016-09-23 13:04:44.423688969 +0800
@@ -1,3 +1,2 @@
0001-Use-obs-build-in-locations-and-executable-names-inst.patch
-0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch
0010_find-perm_slash.diff
diff -urN /tmp/obs-build-20141024/debian/rules obs-build-20160921/debian/rules
--- /tmp/obs-build-20141024/debian/rules 2014-10-25 09:38:08.000000000 +0800
+++ obs-build-20160921/debian/rules 2016-09-23 13:12:39.331680465 +0800
@@ -1,3 +1,10 @@
#!/usr/bin/make -f
%:
dh $@
+
+override_dh_install:
+ dh_install
+ # Mark script executable until upstream fix in their tarball.
+ chmod a+x debian/obs-build/usr/lib/obs-build/build-recipe-collax
+ # file marked executable, fix it.
+ chmod a-x debian/obs-build/usr/lib/obs-build/build-validate-params
