devscripts: remove patch upstream just applied
This commit is contained in:
parent
b250e56373
commit
8292d992e0
2 changed files with 4 additions and 23 deletions
|
|
@ -1,17 +0,0 @@
|
|||
--- a/scripts/reproducible-check 2023-04-02 17:44:26+00:00
|
||||
+++ b/scripts/reproducible-check 2024-06-21 06:33:30.224688+00:00
|
||||
@@ -198,13 +198,13 @@
|
||||
|
||||
# We may have installed a binNMU version locally so we need to
|
||||
# strip these off when looking up against the JSON of results.
|
||||
version = re.sub(r"\+b\d+$", "", pkg_ver.version)
|
||||
|
||||
- result[
|
||||
- (pkg.shortname, pkg_ver.architecture, version)
|
||||
- ] = pkg_ver.source_name
|
||||
+ result[(pkg.shortname, pkg_ver.architecture, version)] = (
|
||||
+ pkg_ver.source_name
|
||||
+ )
|
||||
|
||||
self.log.debug("Parsed %d installed binary packages", len(result))
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2022 Trisquel GNU/Linux developers
|
||||
# <trisquel-devel@listas.trisquel.info>
|
||||
# Copyright (C) 2026 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# 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
|
||||
|
|
@ -18,15 +17,14 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=2
|
||||
VERSION=3
|
||||
|
||||
. ./config
|
||||
|
||||
#Make sure uses TrisquelDistroinfo
|
||||
# Make sure uses TrisquelDistroinfo
|
||||
sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|' scripts/debchange.pl
|
||||
|
||||
#Prevent debian test failing.
|
||||
patch_p1 $DATA/fix_script_reproducible-check.patch
|
||||
# Remove patch now applied upstream
|
||||
|
||||
changelog "Make use of TrisquelDistroInfo from distro-info package."
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue