-
Notifications
You must be signed in to change notification settings - Fork 91
chore: remove dtk5/6 version differentiation in build rules #534
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 18202781743, zccrs The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR simplifies the Debian build system by removing the version differentiation logic between DTK5 and DTK6 packages, aligning with the unified versioning approach where both DTK5 and DTK6 now share the same version numbers (as evidenced by the recent transition to 6.7.31).
Changes:
- Removed automatic version transformation logic (DTK5_VERSION and DTK6_VERSION variable definitions)
- Removed DTK5_MAJOR_MINOR variable calculation
- Removed override_dh_makeshlibs target that set different minimum version dependencies for DTK5 and DTK6 libraries
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
1. Removed DTK5_VERSION and DTK6_VERSION variable definitions that were derived from DEB_VERSION_UPSTREAM 2. Removed DTK5_MAJOR_MINOR variable calculation 3. Removed override_dh_makeshlibs target that set different version dependencies for DTK5 and DTK6 4. Simplified build system to use consistent versioning between DTK5 and DTK6 The changes were made as part of DTK unified build transformation where DTK5 and DTK6 now share the same version numbers. Previously, the build system automatically generated different version numbers for DTK5 and DTK6 based on the upstream version (e.g., 5.6.8 would become DTK5_VERSION=5.6.8 and DTK6_VERSION=6.6.8). Now that both DTK5 and DTK6 use the same version scheme, this differentiation is no longer needed. The dh_makeshlibs override that set different minimum version dependencies for DTK5 and DTK6 libraries has also been removed since they now share versioning. Influence: 1. Verify that DTK5 and DTK6 packages are built with identical version numbers 2. Test that library dependencies are correctly resolved without version conflicts 3. Ensure backward compatibility with existing installations 4. Validate that both DTK5 and DTK6 components can be installed simultaneously 5. Test package upgrades from previous versions with different versioning schemes chore: 移除构建规则中dtk5/6版本差异化处理 1. 删除了从DEB_VERSION_UPSTREAM派生的DTK5_VERSION和DTK6_VERSION变量定义 2. 删除了DTK5_MAJOR_MINOR变量计算 3. 删除了为DTK5和DTK6设置不同版本依赖的override_dh_makeshlibs目标 4. 简化了构建系统,使DTK5和DTK6使用一致的版本控制 这些更改是DTK统一构建改造的一部分,现在DTK5和DTK6使用相同的版本号。之 前,构建系统会根据上游版本自动为DTK5和DTK6生成不同的版本号(例如,5.6.8 会变成DTK5_VERSION=5.6.8和DTK6_VERSION=6.6.8)。现在DTK5和DTK6使用相同的 版本方案,不再需要这种差异化处理。同时移除了为DTK5和DTK6库设置不同最低版 本依赖的dh_makeshlibs覆盖,因为它们现在共享版本控制。 Influence: 1. 验证DTK5和DTK6包是否使用相同的版本号构建 2. 测试库依赖关系是否能正确解析,没有版本冲突 3. 确保与现有安装的向后兼容性 4. 验证DTK5和DTK6组件是否可以同时安装 5. 测试从先前使用不同版本方案的版本进行包升级
deepin pr auto review这段代码是 Debian 软件包构建规则文件 以下是对这些变更的详细审查意见,涵盖语法逻辑、代码质量、代码性能和代码安全四个方面: 1. 语法逻辑
2. 代码质量
3. 代码性能
4. 代码安全
改进建议
总结这段 diff 的主要意图是简化构建逻辑,移除了对 DTK 特定版本号的硬编码处理。这在代码质量和性能上是正向的改进。 核心风险在于删除
如果以上两点确认无误,那么这是一个好的重构;否则,可能会导致运行时依赖错误。 |
derived from DEB_VERSION_UPSTREAM
dependencies for DTK5 and DTK6
and DTK6
The changes were made as part of DTK unified build transformation
where DTK5 and DTK6 now share the same version numbers. Previously,
the build system automatically generated different version numbers for
DTK5 and DTK6 based on the upstream version (e.g., 5.6.8 would become
DTK5_VERSION=5.6.8 and DTK6_VERSION=6.6.8). Now that both DTK5 and
DTK6 use the same version scheme, this differentiation is no longer
needed. The dh_makeshlibs override that set different minimum version
dependencies for DTK5 and DTK6 libraries has also been removed since
they now share versioning.
Influence:
numbers
conflicts
simultaneously
versioning schemes
chore: 移除构建规则中dtk5/6版本差异化处理
这些更改是DTK统一构建改造的一部分,现在DTK5和DTK6使用相同的版本号。之
前,构建系统会根据上游版本自动为DTK5和DTK6生成不同的版本号(例如,5.6.8
会变成DTK5_VERSION=5.6.8和DTK6_VERSION=6.6.8)。现在DTK5和DTK6使用相同的
版本方案,不再需要这种差异化处理。同时移除了为DTK5和DTK6库设置不同最低版
本依赖的dh_makeshlibs覆盖,因为它们现在共享版本控制。
Influence: