Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-01-19 23:10:50 +0300
committerJon Turney <jon.turney@dronecode.org.uk>2018-01-22 19:57:45 +0300
commitcf12bef544ac06051abe9a4a259cc95ea337504e (patch)
tree1daba4c2430d4b96af90906da880a20ace84db51
parentd9c7afb936325431c13557f5845518dae7519a4c (diff)
Rename depends: to depends2:
depends: lines are recognized, but not handled correctly by setup versions 2.880 to 2.884 (they are ignored by setup version 2.879 and prior).
-rwxr-xr-xcalm/package.py2
-rw-r--r--test/testdata/inifile/setup.ini.expected28
-rw-r--r--test/testdata/process_arch/setup.ini.expected32
3 files changed, 31 insertions, 31 deletions
diff --git a/calm/package.py b/calm/package.py
index f8bd4be..a727d3e 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -935,7 +935,7 @@ def write_setup_ini(args, packages, arch):
logging.warning("package '%s' version '%s' has no source in external-source '%s'" % (p, version, s))
if packages[p].version_hints[version].get('depends', ''):
- print("depends: %s" % packages[p].version_hints[version]['depends'], file=f)
+ print("depends2: %s" % packages[p].version_hints[version]['depends'], file=f)
if packages[p].version_hints[version].get('obsoletes', ''):
print("obsoletes: %s" % packages[p].version_hints[version]['obsoletes'], file=f)
diff --git a/test/testdata/inifile/setup.ini.expected b/test/testdata/inifile/setup.ini.expected
index bfb17cf..f77bfd9 100644
--- a/test/testdata/inifile/setup.ini.expected
+++ b/test/testdata/inifile/setup.ini.expected
@@ -54,21 +54,21 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'[prev]\n'
'version: 2.2.0-1\n'
'install: x86/release/cygwin/cygwin-2.2.0-1.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'[test]\n'
'version: 2.3.0-0.3\n'
'install: x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'\n'
'@ cygwin-debuginfo\n'
'sdesc: "Debug info for cygwin"\n'
@@ -81,21 +81,21 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin-debuginfo\n'
+ 'depends2: cygwin-debuginfo\n'
'[prev]\n'
'version: 2.2.0-1\n'
'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin-debuginfo\n'
+ 'depends2: cygwin-debuginfo\n'
'[test]\n'
'version: 2.3.0-0.3\n'
'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin-debuginfo\n'
+ 'depends2: cygwin-debuginfo\n'
'\n'
'@ cygwin-devel\n'
'sdesc: "Core development files"\n'
@@ -137,14 +137,14 @@
'0c7b7ad2636b6e23e40e8cb593196b3fabe9c44f7618ea9b2021b89ecdc08720a7f824be0beaa75c9e62dda9a7b5ed7e9c1ed147a1875c582e80866ad09533a2\n'
'source: x86/release/keychain/keychain-2.7.1-1-src.tar.bz2 134875 '
'cef733c5f1ba7380088ce4b12be0a70c3d657fd0e26beae11cf96bbbc2a02c492dafef700adac1059ee643208d76b5f19042e01d9628b2463b916b3dea13aa54\n'
- 'depends: openssh\n'
+ 'depends2: openssh\n'
'[prev]\n'
'version: 2.6.8-1\n'
'install: x86/release/keychain/keychain-2.6.8-1.tar.bz2 30476 '
'05af40c0fabbd2ea8f8b74719434371a47c7751986fe6411c17e18cda7d03947c5785ed164dfe59b7238831cc10d8e29f4f88bf3414420bd3231423f424c00bd\n'
'source: x86/release/keychain/keychain-2.6.8-1-src.tar.bz2 36347 '
'2151b73a9ec2ece63a842ddad6de19bcfdf097b86d4cae932eeadfc64640997051254001f31081e80272e020887b9599188990368c833ba10886f0ba32a3415e\n'
- 'depends: openssh\n'
+ 'depends2: openssh\n'
'\n'
'@ libdns_sd-devel\n'
'sdesc: "Bonjour Zeroconf implementation"\n'
@@ -158,7 +158,7 @@
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'depends: libdns_sd1\n'
+ 'depends2: libdns_sd1\n'
'\n'
'@ libdns_sd1\n'
'sdesc: "Bonjour Zeroconf implementation"\n'
@@ -188,7 +188,7 @@
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'depends: libdns_sd1\n'
+ 'depends2: libdns_sd1\n'
'\n'
'@ obs-a\n'
'sdesc: "obsolete package A"\n'
@@ -230,14 +230,14 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/per-version/per-version-4.8-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'[prev]\n'
'version: 4.0-1\n'
'install: x86/release/per-version/per-version-4.0-1.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/per-version/per-version-4.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin\n'
+ 'depends2: cygwin\n'
'\n'
'@ per-version-replacement-hint-only\n'
'sdesc: "Per-version hint test package"\n'
@@ -249,7 +249,7 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin\n'
+ 'depends2: cygwin\n'
'\n'
'@ perl-Net-SMTP-SSL\n'
'sdesc: "Perl distribution Net-SMTP-SSL"\n'
@@ -324,7 +324,7 @@
'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
'source: noarch/release/test-c/test-c-1.0-1-src.tar.xz 256 '
'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
- 'depends: test-d (>= 1.0), test-e\n'
+ 'depends2: test-d (>= 1.0), test-e\n'
'obsoletes: obs-a, obs-b\n'
'\n'
'@ test-d\n'
diff --git a/test/testdata/process_arch/setup.ini.expected b/test/testdata/process_arch/setup.ini.expected
index accfbf5..7158b7d 100644
--- a/test/testdata/process_arch/setup.ini.expected
+++ b/test/testdata/process_arch/setup.ini.expected
@@ -54,21 +54,21 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'[prev]\n'
'version: 2.2.0-1\n'
'install: x86/release/cygwin/cygwin-2.2.0-1.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'[test]\n'
'version: 2.3.0-0.3\n'
'install: x86/release/cygwin/cygwin-2.3.0-0.3.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'\n'
'@ cygwin-debuginfo\n'
'sdesc: "Debug info for cygwin"\n'
@@ -81,21 +81,21 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.1-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin-debuginfo\n'
+ 'depends2: cygwin-debuginfo\n'
'[prev]\n'
'version: 2.2.0-1\n'
'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.2.0-1.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.2.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin-debuginfo\n'
+ 'depends2: cygwin-debuginfo\n'
'[test]\n'
'version: 2.3.0-0.3\n'
'install: x86/release/cygwin/cygwin-debuginfo/cygwin-debuginfo-2.3.0-0.3.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/cygwin/cygwin-2.3.0-0.3-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin-debuginfo\n'
+ 'depends2: cygwin-debuginfo\n'
'\n'
'@ cygwin-devel\n'
'sdesc: "Core development files"\n'
@@ -137,14 +137,14 @@
'0c7b7ad2636b6e23e40e8cb593196b3fabe9c44f7618ea9b2021b89ecdc08720a7f824be0beaa75c9e62dda9a7b5ed7e9c1ed147a1875c582e80866ad09533a2\n'
'source: x86/release/keychain/keychain-2.7.1-1-src.tar.bz2 134875 '
'cef733c5f1ba7380088ce4b12be0a70c3d657fd0e26beae11cf96bbbc2a02c492dafef700adac1059ee643208d76b5f19042e01d9628b2463b916b3dea13aa54\n'
- 'depends: openssh\n'
+ 'depends2: openssh\n'
'[prev]\n'
'version: 2.6.8-1\n'
'install: x86/release/keychain/keychain-2.6.8-1.tar.bz2 30476 '
'05af40c0fabbd2ea8f8b74719434371a47c7751986fe6411c17e18cda7d03947c5785ed164dfe59b7238831cc10d8e29f4f88bf3414420bd3231423f424c00bd\n'
'source: x86/release/keychain/keychain-2.6.8-1-src.tar.bz2 36347 '
'2151b73a9ec2ece63a842ddad6de19bcfdf097b86d4cae932eeadfc64640997051254001f31081e80272e020887b9599188990368c833ba10886f0ba32a3415e\n'
- 'depends: openssh\n'
+ 'depends2: openssh\n'
'\n'
'@ libdns_sd-devel\n'
'sdesc: "Bonjour Zeroconf implementation"\n'
@@ -158,7 +158,7 @@
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'depends: libdns_sd1\n'
+ 'depends2: libdns_sd1\n'
'\n'
'@ libdns_sd1\n'
'sdesc: "Bonjour Zeroconf implementation"\n'
@@ -188,7 +188,7 @@
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
'source: x86/release/mDNSResponder/mDNSResponder-379.32.1-1-src.tar.bz2 195 '
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'depends: libdns_sd1\n'
+ 'depends2: libdns_sd1\n'
'\n'
'@ obs-a\n'
'sdesc: "obsolete package A"\n'
@@ -230,21 +230,21 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/per-version/per-version-4.8-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'[prev]\n'
'version: 4.0-1\n'
'install: x86/release/per-version/per-version-4.0-1.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/per-version/per-version-4.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: cygwin\n'
+ 'depends2: cygwin\n'
'[test]\n'
'version: 5.0-1\n'
'install: x86/release/per-version/per-version-5.0-1.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/per-version/per-version-5.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin\n'
+ 'depends2: base-cygwin\n'
'\n'
'@ per-version-replacement-hint-only\n'
'sdesc: "Replacement per-version hint test package - updated"\n'
@@ -256,7 +256,7 @@
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
'source: x86/release/per-version-replacement-hint-only/per-version-replacement-hint-only-1.0-1-src.tar.xz 228 '
'e675b0ac4bc2c3e1c4971bc56d77b0cd53a9bdf5632873a235d7582e29dfd3e8a7bb04b28f6cdee3e6b3d14c25ed39392538e3f628a9bfda6c905646ebc3c225\n'
- 'depends: base-cygwin, per-version\n'
+ 'depends2: base-cygwin, per-version\n'
'\n'
'@ perl-Net-SMTP-SSL\n'
'sdesc: "Perl distribution Net-SMTP-SSL"\n'
@@ -319,7 +319,7 @@
'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
'source: noarch/release/test-c/test-c-1.0-1-src.tar.xz 256 '
'ef15790d8dc8163ed15dfca37565558203ed8b7569d586e0bc949f25282f44a1c059a60a7502863312b41cda649e3a9e2516d354eec9d54829e3ac1a3547097c\n'
- 'depends: test-d (>= 1.0), test-e\n'
+ 'depends2: test-d (>= 1.0), test-e\n'
'obsoletes: obs-a, obs-b\n'
'\n'
'@ test-d\n'
@@ -353,7 +353,7 @@
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
'source: x86/release/testpackage/testpackage-1.0-1-src.tar.bz2 195 '
'aff488008bee3486e25b539fe6ccd1397bd3c5c0ba2ee2cf34af279554baa195af7493ee51d6f8510735c9a2ea54436d776a71e768165716762aec286abbbf83\n'
- 'depends: cygwin\n'
+ 'depends2: cygwin\n'
'\n'
'@ testpackage-subpackage\n'
'sdesc: "A test subpackage"\n'