Add Changelog patching when building DSC format 3.0. #831
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
'debtransform' is patching 'changelog' when make *.diff for DSC 1.0. It adds a 'changelog' entry with the actual build package version. Missing the actual build package version in 'changelog' is the reason for misbehavior because after 'debtransform' finishes its work, the version from the last 'changelog' entry is used for determining the package version. This commit contains changes to maintain 'changelog' patching during the build DSC 3.0 in the same way as for DSC 1.0. To do it, the patching procedure was separated into a separate function dopatch_changelog then used for both building scenarios. In case of building DSC 3.0 added 'changelog' catching in two different cases: - When adding a file with the name "debian.changelog". - When adding tar contents containing "debian/changelog".
|
+1 confirmed with darktable testbuild |
adrianschroeter
pushed a commit
that referenced
this pull request
Jun 13, 2022
'debtransform' is patching 'changelog' when make *.diff for DSC 1.0. It adds a 'changelog' entry with the actual build package version. Missing the actual build package version in 'changelog' is the reason for misbehavior because after 'debtransform' finishes its work, the version from the last 'changelog' entry is used for determining the package version. This commit contains changes to maintain 'changelog' patching during the build DSC 3.0 in the same way as for DSC 1.0. To do it, the patching procedure was separated into a separate function dopatch_changelog then used for both building scenarios. In case of building DSC 3.0 added 'changelog' catching in two different cases: - When adding a file with the name "debian.changelog". - When adding tar contents containing "debian/changelog".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
'debtransform' is patching 'changelog' when make *.diff for DSC 1.0. It adds a 'changelog' entry with the actual build package version.
Missing the actual build package version in 'changelog' is the reason for misbehavior because after 'debtransform' finishes its work, the version from the last 'changelog' entry is used for determining the package version.
This merge request contains changes to maintain 'changelog' patching during the build DSC 3.0 in the same way as for DSC 1.0.
To do it, the patching procedure was separated into a separate function
dopatch_changelog()then used for both building scenarios.In case of building DSC 3.0 added 'changelog' catching in two different cases:
dofile_quilt().dotar_quilt().Also added test number 5. It contains the 'changelog' with the outdated version in the last entry in 'debian.tar.gz'. Test checks that after 'debtransform' finishes its work, the 'changelog' is patched and comes with a new entry with the actual build package version. It is the case of a broken building of packages, as mentioned in #830.