Skip to content

feat: add nonfree wallpaper#42

Merged
mhduiy merged 1 commit into
linuxdeepin:masterfrom
mhduiy:nonfree
Feb 25, 2025
Merged

feat: add nonfree wallpaper#42
mhduiy merged 1 commit into
linuxdeepin:masterfrom
mhduiy:nonfree

Conversation

@mhduiy
Copy link
Copy Markdown
Contributor

@mhduiy mhduiy commented Feb 25, 2025

Distinguish between copyrighted and non copyrighted wallpapers.

pms: TASK-368711

@github-actions
Copy link
Copy Markdown

TAG Bot

TAG: 1.7.21
EXISTED: no
DISTRIBUTION: unstable

Copy link
Copy Markdown
Member

@BLumia BLumia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

README(以及 README.zh_CN)最下面的 License 段落应该也需要更新一下。

BLumia
BLumia previously approved these changes Feb 25, 2025
Distinguish between copyrighted and non copyrighted wallpapers.

pms: TASK-368711
@deepin-ci-robot
Copy link
Copy Markdown

deepin pr auto review

代码审查意见:

  1. Makefile 修改

    • Makefile 中新增了 USE_NONFREEPIC 变量,用于控制是否使用非自由图片。这个改动是合理的,但建议在文档中明确说明如何启用或禁用非自由图片,以便其他开发者理解和使用。
  2. 版权声明

    • debian/copyright 文件中,对非自由图片的版权声明和许可证进行了详细的说明。这有助于遵守版权法,并确保用户了解他们使用图片的权限和限制。
  3. 依赖关系

    • debian/control 文件中,将 deepin-wallpapers-nonfree 包的依赖关系从 deepin-wallpapers-nonfree (>= 1.8.0) 改为 Conflicts: deepin-wallpapers-nonfreeReplaces: deepin-wallpapers-nonfree。这表明新的 deepin-wallpapers 包将取代旧的 deepin-wallpapers-nonfree 包,并且与旧的包不兼容。这是一个合理的改动,但需要确保所有使用旧包的用户都了解这一变化。
  4. 安装文件

    • debian/install 文件中,新增了非自由图片的安装路径。这确保了非自由图片能够正确地安装到系统中。
  5. 规则文件

    • debian/rules 文件中,新增了 export USE_NONFREEPIC = 1。这将在构建过程中启用非自由图片的支持。这是一个合理的改动,但需要确保所有相关的构建脚本和配置文件都已经更新以支持这一变化。
  6. README 文件

    • README.mdREADME.zh_CN.md 文件中,新增了对非自由图片许可证的说明。这有助于用户了解他们使用非自由图片的权限和限制。
  7. changelog 文件

    • debian/changelog 文件中,新增了对非自由图片的描述。这是一个合理的改动,但需要确保所有相关的文档都已经更新以反映这一变化。

总体来说,这些改动都是合理的,但需要确保所有相关的文档和配置文件都已经更新以反映这些变化。此外,还需要确保所有使用这些图片的用户都了解他们使用图片的权限和限制。

@deepin-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: BLumia, mhduiy, Zeno-sole

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mhduiy mhduiy merged commit bf48442 into linuxdeepin:master Feb 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants