Dear Adam, On Tue, 2020-02-25 at 21:10 +0000, Adam D. Barratt wrote: > On Mon, 2020-02-24 at 15:37 +0530, Ritesh Raj Sarraf wrote: > > So my changelog was incorrect as it set to 20070815.3-1+deb10u4, > > which actually should be 20070815.3-1+deb10u1, as this is uml- > > utilities package's first stable update proposed. > > No. stable currently has 20070815.2-1, so this should either be .2- > 1+deb10u1 (adding the patch on top of the stable package) or > -3.1~deb10u1 (backporting the newer upload). > Do you mean the latter (i.e. a new upstream release) can go into Debian Stable as a update package ? > Your diff appears to do the latter, while repeating (in different > words) the fix. That isn't actually what would have changed in the > stable upload (relative to the unstable one), which is simply the > backporting. > > + * Use standard path for libray installation. (Closes: #928924) I would really appreciate if I could get some of your help here. To keep things simple, I chose to redo the update and just carry a patch on top of 20070815.2-1. To do so, I fetched and unpacked the current Buster uml-utilities package. rrs@priyasi:/var/tmp/Debian-Build/temp/uml-utilities-20070815.2$ ls -a ./ Changelog CVS/ gdb/ honeypot/ jail/ lib/ mconsole/ patches/ port-helper/ umlfs/ uml_net/ uml_util.spec.in ../ COPYING debian/ gdbbot/ humfsify/ jailtest/ Makefile moo/ .pc/ tunctl/ umlgdb/ uml_switch/ watchdog/ 20:44 ♒ ॐ ☺ 😄 It looks to be that I may have messed up the packaging for the package in the upload to Buster. This source package already contains a .pc/ folder, which in my understanding, it should not. But this is now already part of Debian Buster. If I try to add a quilt patch for the actual issue, I run into other packaging related problems. dh_clean dpkg-source -i.git -I.git -b . dpkg-source: info: using source format '3.0 (quilt)' dpkg-source: info: building uml-utilities using existing ./uml-utilities_20070815.2.orig.tar.gz dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: local changes detected, the modified files are: uml-utilities-20070815.2/Makefile dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/uml-utilities_20070815.2-1+deb10u1.diff.WPat51 dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -i.git -I.git -b . subprocess returned exit status 2 I: copying local configuration E: Failed autobuilding of package I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env I: removing directory /var/tmp/Debian-Build/Build//278087 and its subdirectories gbp:error: '/home/rrs/bin/gbp-pbuilder' failed: it exited with 1 I think the problem is that the orig tarball already had a patch applied on top of it and with a new patch introduced, the conflicts arise. I spent a couple of hours this Friday but couldn't fix this. Is this something you can help me with? Ultimately, I want the attached patch in this email, to be carried for Debian Buster. If the mess is too much and fixing it is not possible, would it be okay from a Stable checkpoint perspective, if: * I did a new upstream release (fixing the orig tarball mess) * Pushed it to Debian Unstable first * And then, pushed the same to Debian Buster Thanks, Ritesh -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System
From 17c533b18845cb262656b404138474115d592d7e Mon Sep 17 00:00:00 2001 From: Ritesh Raj Sarraf <rrs@debian.org> Date: Mon, 6 Jan 2020 22:32:02 +0530 Subject: [PATCH] Use standard path for libray installation. /usr/lib64 isn't really a thing and is empty on my amd64 Debian system. Closes: #928924 --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index 74d3632..c0acd3f 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,7 @@ SUBDIRS = lib jail jailtest humfsify mconsole moo port-helper $(TUNCTL) \ UMLVER = $(shell date +%Y%m%d) TARBALL = uml_utilities_$(UMLVER).tar.bz2 BIN_DIR = /usr/bin - -ifeq ($(shell uname -m),x86_64) -LIB_DIR = /usr/lib64/uml -else LIB_DIR = /usr/lib/uml -endif CFLAGS = -g -Wall #CFLAGS = -g -O2 -Wall -- 2.25.0
Attachment:
signature.asc
Description: This is a digitally signed message part