Skip to content

Sync packaging/debian with the Debian 1.4.1+ds1-7 packaging - #1476

Merged
frankslin merged 3 commits into
BYVoid:masterfrom
frankslin:upstream-master
Aug 14, 2026
Merged

frankslin merged 3 commits into
BYVoid:masterfrom
frankslin:upstream-master

Conversation

@frankslin

Copy link
Copy Markdown
Collaborator

Debian adopted both upstream packaging proposals carried in this tree, so refresh the baseline to a verbatim copy of the salsa debian/opencc packaging and drop the now redundant proposal document.

Detailed Changes:

  • Baseline sync:
    • Replace packaging/debian/debian/ with the Debian 1.4.1+ds1-7 packaging, leaving no outstanding upstream deltas.
    • Jieba packaging landed as opencc-jieba (arch:any plugin) plus opencc-jieba-data (arch:all dictionary and *_jieba.json configs) instead of the single arch:any package proposed upstream; the bundled cppjieba rationale now lives in debian/README.source.
    • The *.ocd2 move into libopencc-data landed with the non-Jieba configurations listed explicitly, so *_jieba.json is not captured.
    • Pick up patch 0012 for big-endian legacy dictionary detection, the dropped chrpath/runtime_library_dirs handling in patch 0009 and rules, the libmarisa-dev (>= 0.3.1) bump, and the regenerated libopencc1.4.symbols.
    • Re-enabled autopkgtest: tests/control replaces control.disabled and adds cli-smoke and jieba-plugin alongside the integration test, which now builds out-of-tree and no longer masks failures.
  • Documentation:
    • Update README.md to the new baseline, patch set, eight binary packages, and autopkgtest layout.
    • Delete SPLIT_PROPOSAL.md, moving its still-relevant ABI naming and libopencc-dev multi-arch notes into README.md.

Debian adopted both upstream packaging proposals carried in this tree, so
refresh the baseline to a verbatim copy of the salsa debian/opencc
packaging and drop the now redundant proposal document.

Detailed Changes:
- **Baseline sync**:
  - Replace packaging/debian/debian/ with the Debian 1.4.1+ds1-7
    packaging, leaving no outstanding upstream deltas.
  - Jieba packaging landed as opencc-jieba (arch:any plugin) plus
    opencc-jieba-data (arch:all dictionary and *_jieba.json configs)
    instead of the single arch:any package proposed upstream; the
    bundled cppjieba rationale now lives in debian/README.source.
  - The *.ocd2 move into libopencc-data landed with the non-Jieba
    configurations listed explicitly, so *_jieba.json is not captured.
  - Pick up patch 0012 for big-endian legacy dictionary detection, the
    dropped chrpath/runtime_library_dirs handling in patch 0009 and
    rules, the libmarisa-dev (>= 0.3.1) bump, and the regenerated
    libopencc1.4.symbols.
  - Re-enabled autopkgtest: tests/control replaces control.disabled and
    adds cli-smoke and jieba-plugin alongside the integration test,
    which now builds out-of-tree and no longer masks failures.
- **Documentation**:
  - Update README.md to the new baseline, patch set, eight binary
    packages, and autopkgtest layout.
  - Delete SPLIT_PROPOSAL.md, moving its still-relevant ABI naming and
    libopencc-dev multi-arch notes into README.md.
Add the 1.4.0/1.4.1-era legacy 64-bit layout detection fix to the
Unreleased section so Debian can drop its 0012 patch when the packaging
moves to the next upstream tarball.
Expand the Unreleased section of NEWS.md to cover all 37 commits since
ver.1.4.1, following the section layout used by the 1.4.1 and 1.4.0
entries.

Detailed Changes:
- **發佈重點**: Summarise the hot-path speedup, the big-endian legacy
  .ocd fix, and the two experimental APIs, and note that the C++ ABI is
  unchanged from 1.4.1.
- **詞庫更新**: Cover the tw2t/tw2s 么 compatibility fix, the s2twp
  greedy-match fixes, the 梁/樑 Taiwan mappings and reverse phrases, the
  Oscar-winner regional names, and the individual s2t/t2s corrections.
- **效能 / 實驗性 API / CLI**: Document the unmatchable-run skipping with
  its measured timings, GetConversionCandidates behind
  OPENCC_ENABLE_UNSTABLE_API, and the --ambiguities reporting mode.
- **打包 / 構建系統**: Record the Debian 1.4.1+ds1-7 resync and the
  adopted proposals, the debian:sid and native arm64 build changes, the
  FreeBSD port reference copy, the trimmed C++ source package workflow,
  the SignPath release-signing switch, and the GitVersion fallback fix.
@frankslin
frankslin merged commit 484729c into BYVoid:master Aug 14, 2026
39 of 40 checks passed
@frankslin
frankslin deleted the upstream-master branch August 14, 2026 03:17
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.

1 participant