1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
8140
8141
8142
8143
8144
8145
8146
8147
8148
8149
8150
8151
8152
8153
8154
8155
8156
8157
8158
8159
8160
8161
8162
8163
8164
8165
8166
8167
8168
8169
8170
8171
8172
8173
8174
8175
8176
8177
8178
8179
8180
8181
8182
8183
8184
8185
8186
8187
8188
8189
8190
8191
8192
8193
8194
8195
8196
8197
8198
8199
8200
8201
8202
8203
8204
8205
8206
8207
8208
8209
8210
8211
8212
8213
8214
8215
8216
8217
8218
8219
8220
8221
8222
8223
8224
8225
8226
8227
8228
8229
8230
8231
8232
8233
8234
8235
8236
8237
8238
8239
8240
8241
8242
8243
8244
8245
8246
8247
8248
8249
8250
8251
8252
8253
8254
8255
8256
8257
8258
8259
8260
8261
8262
8263
8264
8265
8266
8267
8268
8269
8270
8271
8272
8273
8274
8275
8276
8277
8278
8279
8280
8281
8282
8283
8284
8285
8286
8287
8288
8289
8290
8291
8292
8293
8294
8295
8296
8297
8298
8299
8300
8301
8302
8303
8304
8305
8306
8307
8308
8309
8310
8311
8312
8313
8314
8315
8316
8317
8318
8319
8320
8321
8322
8323
8324
8325
8326
8327
8328
8329
8330
8331
8332
8333
8334
8335
8336
8337
8338
8339
8340
8341
8342
8343
8344
8345
8346
8347
8348
8349
8350
8351
8352
8353
8354
8355
8356
8357
8358
8359
8360
8361
8362
8363
8364
8365
8366
8367
8368
8369
8370
8371
8372
8373
8374
8375
8376
8377
8378
8379
8380
8381
8382
8383
8384
8385
8386
8387
8388
8389
8390
8391
8392
8393
8394
8395
8396
8397
8398
8399
8400
8401
8402
8403
8404
8405
8406
8407
8408
8409
8410
8411
8412
8413
8414
8415
8416
8417
8418
8419
8420
8421
8422
8423
8424
8425
8426
8427
8428
8429
8430
8431
8432
8433
8434
8435
8436
8437
8438
8439
8440
8441
8442
8443
8444
8445
8446
8447
8448
8449
8450
8451
8452
8453
8454
8455
8456
8457
8458
8459
8460
8461
8462
8463
8464
8465
8466
8467
8468
8469
8470
8471
8472
8473
8474
8475
8476
8477
8478
8479
8480
8481
8482
8483
8484
8485
8486
8487
8488
8489
8490
8491
8492
8493
8494
8495
8496
8497
8498
8499
8500
8501
8502
8503
8504
8505
8506
8507
8508
8509
8510
8511
8512
8513
8514
8515
8516
8517
8518
8519
8520
8521
8522
8523
8524
8525
8526
8527
8528
8529
8530
8531
8532
8533
8534
8535
8536
8537
8538
8539
8540
8541
8542
8543
8544
8545
8546
8547
8548
8549
8550
8551
8552
8553
8554
8555
8556
8557
8558
8559
8560
8561
8562
8563
8564
8565
8566
8567
8568
8569
8570
8571
8572
8573
8574
8575
8576
8577
8578
8579
8580
8581
8582
8583
8584
8585
8586
8587
8588
8589
8590
8591
8592
8593
8594
8595
8596
8597
8598
8599
8600
8601
8602
8603
8604
8605
8606
8607
8608
8609
8610
8611
8612
8613
8614
8615
8616
8617
8618
8619
8620
8621
8622
8623
8624
8625
8626
8627
8628
8629
8630
8631
8632
8633
8634
8635
8636
8637
8638
8639
8640
8641
8642
8643
8644
8645
8646
8647
8648
8649
8650
8651
8652
8653
8654
8655
8656
8657
8658
8659
8660
8661
8662
8663
8664
8665
8666
8667
8668
8669
8670
8671
8672
8673
8674
8675
8676
8677
8678
8679
8680
8681
8682
8683
8684
8685
8686
8687
8688
8689
8690
8691
8692
8693
8694
8695
8696
8697
8698
8699
8700
8701
8702
8703
8704
8705
8706
8707
8708
8709
8710
8711
8712
8713
8714
8715
8716
8717
8718
8719
8720
8721
8722
8723
8724
8725
8726
8727
8728
8729
8730
8731
8732
8733
8734
8735
8736
8737
8738
8739
8740
8741
8742
8743
8744
8745
8746
8747
8748
8749
8750
8751
8752
8753
8754
8755
8756
8757
8758
8759
8760
8761
8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776
8777
8778
8779
8780
8781
8782
8783
8784
8785
8786
8787
8788
8789
8790
8791
8792
8793
8794
8795
8796
8797
8798
8799
8800
8801
8802
8803
8804
8805
8806
8807
8808
8809
8810
8811
8812
8813
8814
8815
8816
8817
8818
8819
8820
8821
8822
8823
8824
8825
8826
8827
8828
8829
8830
8831
8832
8833
8834
8835
8836
8837
8838
8839
8840
8841
8842
8843
8844
8845
8846
8847
8848
8849
8850
8851
8852
8853
8854
8855
8856
8857
8858
8859
8860
8861
8862
8863
8864
8865
8866
8867
8868
8869
8870
8871
8872
8873
8874
8875
8876
8877
8878
8879
8880
8881
8882
8883
8884
8885
8886
8887
8888
8889
8890
8891
8892
8893
8894
8895
8896
8897
8898
8899
8900
8901
8902
8903
8904
8905
8906
8907
8908
8909
8910
8911
8912
8913
8914
8915
8916
8917
8918
8919
8920
8921
8922
8923
8924
8925
8926
8927
8928
8929
8930
8931
8932
8933
8934
8935
8936
8937
8938
8939
8940
8941
8942
8943
8944
8945
8946
8947
8948
8949
8950
8951
8952
8953
8954
8955
8956
8957
8958
8959
8960
8961
8962
8963
8964
8965
8966
8967
8968
8969
8970
8971
8972
8973
8974
8975
8976
8977
8978
8979
8980
8981
8982
8983
8984
8985
8986
8987
8988
8989
8990
8991
8992
8993
8994
8995
8996
8997
8998
8999
9000
9001
9002
9003
9004
9005
9006
9007
9008
9009
9010
9011
9012
9013
9014
9015
9016
9017
9018
9019
9020
9021
9022
9023
9024
9025
9026
9027
9028
9029
9030
9031
9032
9033
9034
9035
9036
9037
9038
9039
9040
9041
9042
9043
9044
9045
9046
9047
9048
9049
9050
9051
9052
9053
9054
9055
9056
9057
9058
9059
9060
9061
9062
9063
9064
9065
9066
9067
9068
9069
9070
9071
9072
9073
9074
9075
9076
9077
9078
9079
9080
9081
9082
9083
9084
9085
9086
9087
9088
9089
9090
9091
9092
9093
9094
9095
9096
9097
9098
9099
9100
9101
9102
9103
9104
9105
9106
9107
9108
9109
9110
9111
9112
9113
9114
9115
9116
9117
9118
9119
9120
9121
9122
9123
9124
9125
9126
9127
9128
9129
9130
9131
9132
9133
9134
9135
9136
9137
9138
9139
9140
9141
9142
9143
9144
9145
9146
9147
9148
9149
9150
9151
9152
9153
9154
9155
9156
9157
9158
9159
9160
9161
9162
9163
9164
9165
9166
9167
9168
9169
9170
9171
9172
9173
9174
9175
9176
9177
9178
9179
9180
9181
9182
9183
9184
9185
9186
9187
9188
9189
9190
9191
9192
9193
9194
9195
9196
9197
9198
9199
9200
9201
9202
9203
9204
9205
9206
9207
9208
9209
9210
9211
9212
9213
9214
9215
9216
9217
9218
9219
9220
9221
9222
9223
9224
9225
9226
9227
9228
9229
9230
9231
9232
9233
9234
9235
9236
9237
9238
9239
9240
9241
9242
9243
9244
9245
9246
9247
9248
9249
9250
9251
9252
9253
9254
9255
9256
9257
9258
9259
9260
9261
9262
9263
9264
9265
9266
9267
9268
9269
9270
9271
9272
9273
9274
9275
9276
9277
9278
9279
9280
9281
9282
9283
9284
9285
9286
9287
9288
9289
9290
9291
9292
9293
9294
9295
9296
9297
9298
9299
9300
9301
9302
9303
9304
9305
9306
9307
9308
9309
9310
9311
9312
9313
9314
9315
9316
9317
9318
9319
9320
9321
9322
9323
9324
9325
9326
9327
9328
9329
9330
9331
9332
9333
9334
9335
9336
9337
9338
9339
9340
9341
9342
9343
9344
9345
9346
9347
9348
9349
9350
9351
9352
9353
9354
9355
9356
9357
9358
9359
9360
9361
9362
9363
9364
9365
9366
9367
9368
9369
9370
9371
9372
9373
9374
9375
9376
9377
9378
9379
9380
9381
9382
9383
9384
9385
9386
9387
9388
9389
9390
9391
9392
9393
9394
9395
9396
9397
9398
9399
9400
9401
9402
9403
9404
9405
9406
9407
9408
9409
9410
9411
9412
9413
9414
9415
9416
9417
9418
9419
9420
9421
9422
9423
9424
9425
9426
9427
9428
9429
9430
9431
9432
9433
9434
9435
9436
9437
9438
9439
9440
9441
9442
9443
9444
9445
9446
9447
9448
9449
9450
9451
9452
9453
9454
9455
9456
9457
9458
9459
9460
9461
9462
9463
9464
9465
9466
9467
9468
9469
9470
9471
9472
9473
9474
9475
9476
9477
9478
9479
9480
9481
9482
9483
9484
9485
9486
9487
9488
9489
9490
9491
9492
9493
9494
9495
9496
9497
9498
9499
9500
9501
9502
9503
9504
9505
9506
9507
9508
9509
9510
9511
9512
9513
9514
9515
9516
9517
9518
9519
9520
9521
9522
9523
9524
9525
9526
9527
9528
9529
9530
9531
9532
9533
9534
9535
9536
9537
9538
9539
9540
9541
9542
9543
9544
9545
9546
9547
9548
9549
9550
9551
9552
9553
9554
9555
9556
9557
9558
9559
9560
9561
9562
9563
9564
9565
9566
9567
9568
9569
9570
9571
9572
9573
9574
9575
9576
9577
9578
9579
9580
9581
9582
9583
9584
9585
9586
9587
9588
9589
9590
9591
9592
9593
9594
9595
9596
9597
9598
9599
9600
9601
9602
9603
9604
9605
9606
9607
9608
9609
9610
9611
9612
9613
9614
9615
9616
9617
9618
9619
9620
9621
9622
9623
9624
9625
9626
9627
9628
9629
9630
9631
9632
9633
9634
9635
9636
9637
9638
9639
9640
9641
9642
9643
9644
9645
9646
9647
9648
9649
9650
9651
9652
9653
9654
9655
9656
9657
9658
9659
9660
9661
9662
9663
9664
9665
9666
9667
9668
9669
9670
9671
9672
9673
9674
9675
9676
9677
9678
9679
9680
9681
9682
9683
9684
9685
9686
9687
9688
9689
9690
9691
9692
9693
9694
9695
9696
9697
9698
9699
9700
9701
9702
9703
9704
9705
9706
9707
9708
9709
9710
9711
9712
9713
9714
9715
9716
9717
9718
9719
9720
9721
9722
9723
9724
9725
9726
9727
9728
9729
9730
9731
9732
9733
9734
9735
9736
9737
9738
9739
9740
9741
9742
9743
9744
9745
9746
9747
9748
9749
9750
9751
9752
9753
9754
9755
9756
9757
9758
9759
9760
9761
9762
9763
9764
9765
9766
9767
9768
9769
9770
9771
9772
9773
9774
9775
9776
9777
9778
9779
9780
9781
9782
9783
9784
9785
9786
9787
9788
9789
9790
9791
9792
9793
9794
9795
9796
9797
9798
9799
9800
9801
9802
9803
9804
9805
9806
9807
9808
9809
9810
9811
9812
9813
9814
9815
9816
9817
9818
9819
9820
9821
9822
9823
9824
9825
9826
9827
9828
9829
9830
9831
9832
9833
9834
9835
9836
9837
9838
9839
9840
9841
9842
9843
9844
9845
9846
9847
9848
9849
9850
9851
9852
9853
9854
9855
9856
9857
9858
9859
9860
9861
9862
9863
9864
9865
9866
9867
9868
9869
9870
9871
9872
9873
9874
9875
9876
9877
9878
9879
9880
9881
9882
9883
9884
9885
9886
9887
9888
9889
9890
9891
9892
9893
9894
9895
9896
9897
9898
9899
9900
9901
9902
9903
9904
9905
9906
9907
9908
9909
9910
9911
9912
9913
9914
9915
9916
9917
9918
9919
9920
9921
9922
9923
9924
9925
9926
9927
9928
9929
9930
9931
9932
9933
9934
9935
9936
9937
9938
9939
9940
9941
9942
9943
9944
9945
9946
9947
9948
9949
9950
9951
9952
9953
9954
9955
9956
9957
9958
9959
9960
9961
9962
9963
9964
9965
9966
9967
9968
9969
9970
9971
9972
9973
9974
9975
9976
9977
9978
9979
9980
9981
9982
9983
9984
9985
9986
9987
9988
9989
9990
9991
9992
9993
9994
9995
9996
9997
9998
9999
10000
10001
10002
10003
10004
10005
10006
10007
10008
10009
10010
10011
10012
10013
10014
10015
10016
10017
10018
10019
10020
10021
10022
10023
10024
10025
10026
10027
10028
10029
10030
10031
10032
10033
10034
10035
10036
10037
10038
10039
10040
10041
10042
10043
10044
10045
10046
10047
10048
10049
10050
10051
10052
10053
10054
10055
10056
10057
10058
10059
10060
10061
10062
10063
10064
10065
10066
10067
10068
10069
10070
10071
10072
10073
10074
10075
10076
10077
10078
10079
10080
10081
10082
10083
10084
10085
10086
10087
10088
10089
10090
10091
10092
10093
10094
10095
10096
10097
10098
10099
10100
10101
10102
10103
10104
10105
10106
10107
10108
10109
10110
10111
10112
10113
10114
10115
10116
10117
10118
10119
10120
10121
10122
10123
10124
10125
10126
10127
10128
10129
10130
10131
10132
10133
10134
10135
10136
10137
10138
10139
10140
10141
10142
10143
10144
10145
10146
10147
10148
10149
10150
10151
10152
10153
10154
10155
10156
10157
10158
10159
10160
10161
10162
10163
10164
10165
10166
10167
10168
10169
10170
10171
10172
10173
10174
10175
10176
10177
10178
10179
10180
10181
10182
10183
10184
10185
10186
10187
10188
10189
10190
10191
10192
10193
10194
10195
10196
10197
10198
10199
10200
10201
10202
10203
10204
10205
10206
10207
10208
10209
10210
10211
10212
10213
10214
10215
10216
10217
10218
10219
10220
10221
10222
10223
10224
10225
10226
10227
10228
10229
10230
10231
10232
10233
10234
10235
10236
10237
10238
10239
10240
10241
10242
10243
10244
10245
10246
10247
10248
10249
10250
10251
10252
10253
10254
10255
10256
10257
10258
10259
10260
10261
10262
10263
10264
10265
10266
10267
10268
10269
10270
10271
10272
10273
10274
10275
10276
10277
10278
10279
10280
10281
10282
10283
10284
10285
10286
10287
10288
10289
10290
10291
10292
10293
10294
10295
10296
10297
10298
10299
10300
10301
10302
10303
10304
10305
10306
10307
10308
10309
10310
10311
10312
10313
10314
10315
10316
10317
10318
10319
10320
10321
10322
10323
10324
10325
10326
10327
10328
10329
10330
10331
10332
10333
10334
10335
10336
10337
10338
10339
10340
10341
10342
10343
10344
10345
10346
10347
10348
10349
10350
10351
10352
10353
10354
10355
10356
10357
10358
10359
10360
10361
10362
10363
10364
10365
10366
10367
10368
10369
10370
10371
10372
10373
10374
10375
10376
10377
10378
10379
10380
10381
10382
10383
10384
10385
10386
10387
10388
10389
10390
10391
10392
10393
10394
10395
10396
10397
10398
10399
10400
10401
10402
10403
10404
10405
10406
10407
10408
10409
10410
10411
10412
10413
10414
10415
10416
10417
10418
10419
10420
10421
10422
10423
10424
10425
10426
10427
10428
10429
10430
10431
10432
10433
10434
10435
10436
10437
10438
10439
10440
10441
10442
10443
10444
10445
10446
10447
10448
10449
10450
10451
10452
10453
10454
10455
10456
10457
10458
10459
10460
10461
10462
10463
10464
10465
10466
10467
10468
10469
10470
10471
10472
10473
10474
10475
10476
10477
10478
10479
10480
10481
10482
10483
10484
10485
10486
10487
10488
10489
10490
10491
10492
10493
10494
10495
10496
10497
10498
10499
10500
10501
10502
10503
10504
10505
10506
10507
10508
10509
10510
10511
10512
10513
10514
10515
10516
10517
10518
10519
10520
10521
10522
10523
10524
10525
10526
10527
10528
10529
10530
10531
10532
10533
10534
10535
10536
10537
10538
10539
10540
10541
10542
10543
10544
10545
10546
10547
10548
10549
10550
10551
10552
10553
10554
10555
10556
10557
10558
10559
10560
10561
10562
10563
10564
10565
10566
10567
10568
10569
10570
10571
10572
10573
10574
10575
10576
10577
10578
10579
10580
10581
10582
10583
10584
10585
10586
10587
10588
10589
10590
10591
10592
10593
10594
10595
10596
10597
10598
10599
10600
10601
10602
10603
10604
10605
10606
10607
10608
10609
10610
10611
10612
10613
10614
10615
10616
10617
10618
10619
10620
10621
10622
10623
10624
10625
10626
10627
10628
10629
10630
10631
10632
10633
10634
10635
10636
10637
10638
10639
10640
10641
10642
10643
10644
10645
10646
10647
10648
10649
10650
10651
10652
10653
10654
10655
10656
10657
10658
10659
10660
10661
10662
10663
10664
10665
10666
10667
10668
10669
10670
10671
10672
10673
10674
10675
10676
10677
10678
10679
10680
10681
10682
10683
10684
10685
10686
10687
10688
10689
10690
10691
10692
10693
10694
10695
10696
10697
10698
10699
10700
10701
10702
10703
10704
10705
10706
10707
10708
10709
10710
10711
10712
10713
10714
10715
10716
10717
10718
10719
10720
10721
10722
10723
10724
10725
10726
10727
10728
10729
10730
10731
10732
10733
10734
10735
10736
10737
10738
10739
10740
10741
10742
10743
10744
10745
10746
10747
10748
10749
10750
10751
10752
10753
10754
10755
10756
10757
10758
10759
10760
10761
10762
10763
10764
10765
10766
10767
10768
10769
10770
10771
10772
10773
10774
10775
10776
10777
10778
10779
10780
10781
10782
10783
10784
10785
10786
10787
10788
10789
10790
10791
10792
10793
10794
10795
10796
10797
10798
10799
10800
10801
10802
10803
10804
10805
10806
10807
10808
10809
10810
10811
10812
10813
10814
10815
10816
10817
10818
10819
10820
10821
10822
10823
10824
10825
10826
10827
10828
10829
10830
10831
10832
10833
10834
10835
10836
10837
10838
10839
10840
10841
10842
10843
10844
10845
10846
10847
10848
10849
10850
10851
10852
10853
10854
10855
10856
10857
10858
10859
10860
10861
10862
10863
10864
10865
10866
10867
10868
10869
10870
10871
10872
10873
10874
10875
10876
10877
10878
10879
10880
10881
10882
10883
10884
10885
10886
10887
10888
10889
10890
10891
10892
10893
10894
10895
10896
10897
10898
10899
10900
10901
10902
10903
10904
10905
10906
10907
10908
10909
10910
10911
10912
10913
10914
10915
10916
10917
10918
10919
10920
10921
10922
10923
10924
10925
10926
10927
10928
10929
10930
10931
10932
10933
10934
10935
10936
10937
10938
10939
10940
10941
10942
10943
10944
10945
10946
10947
10948
10949
10950
10951
10952
10953
10954
10955
10956
10957
10958
10959
10960
10961
10962
10963
10964
10965
10966
10967
10968
10969
10970
10971
10972
10973
10974
10975
10976
10977
10978
10979
10980
10981
10982
10983
10984
10985
10986
10987
10988
10989
10990
10991
10992
10993
10994
10995
10996
10997
10998
10999
11000
11001
11002
11003
11004
11005
11006
11007
11008
11009
11010
11011
11012
11013
11014
11015
11016
11017
11018
11019
11020
11021
11022
11023
11024
11025
11026
11027
11028
11029
11030
11031
11032
11033
11034
11035
11036
11037
11038
11039
11040
11041
11042
11043
11044
11045
11046
11047
11048
11049
11050
11051
11052
11053
11054
11055
11056
11057
11058
11059
11060
11061
11062
11063
11064
11065
11066
11067
11068
11069
11070
11071
11072
11073
11074
11075
11076
11077
11078
11079
11080
11081
11082
11083
11084
11085
11086
11087
11088
11089
11090
11091
11092
11093
11094
11095
11096
11097
11098
11099
11100
11101
11102
11103
11104
11105
11106
11107
11108
11109
11110
11111
11112
11113
11114
11115
11116
11117
11118
11119
11120
11121
11122
11123
11124
11125
11126
11127
11128
11129
11130
11131
11132
11133
11134
11135
11136
11137
11138
11139
11140
11141
11142
11143
11144
11145
11146
11147
11148
11149
11150
11151
11152
11153
11154
11155
11156
11157
11158
11159
11160
11161
11162
11163
11164
11165
11166
11167
11168
11169
11170
11171
11172
11173
11174
11175
11176
11177
11178
11179
11180
11181
11182
11183
11184
11185
11186
11187
11188
11189
11190
11191
11192
11193
11194
11195
11196
11197
11198
11199
11200
11201
11202
11203
11204
11205
11206
11207
11208
11209
11210
11211
11212
11213
11214
11215
11216
11217
11218
11219
11220
11221
11222
11223
11224
11225
11226
11227
11228
11229
11230
11231
11232
11233
11234
11235
11236
11237
11238
11239
11240
11241
11242
11243
11244
11245
11246
11247
11248
11249
11250
11251
11252
11253
11254
11255
11256
11257
11258
11259
11260
11261
11262
11263
11264
11265
11266
11267
11268
11269
11270
11271
11272
11273
11274
11275
11276
11277
11278
11279
11280
11281
11282
11283
11284
11285
11286
11287
11288
11289
11290
11291
11292
11293
11294
11295
11296
11297
11298
11299
11300
11301
11302
11303
11304
11305
11306
11307
11308
11309
11310
11311
11312
11313
11314
11315
11316
11317
11318
11319
11320
11321
11322
11323
11324
11325
11326
11327
11328
11329
11330
11331
11332
11333
11334
11335
11336
11337
11338
11339
11340
11341
11342
11343
11344
11345
11346
11347
11348
11349
11350
11351
11352
11353
11354
11355
11356
11357
11358
11359
11360
11361
11362
11363
11364
11365
11366
11367
11368
11369
11370
11371
11372
11373
11374
11375
11376
11377
11378
11379
11380
11381
11382
11383
11384
11385
11386
11387
11388
11389
11390
11391
11392
11393
11394
11395
11396
11397
11398
11399
11400
11401
11402
11403
11404
11405
11406
11407
11408
11409
11410
11411
11412
11413
11414
11415
11416
11417
11418
11419
11420
11421
11422
11423
11424
11425
11426
11427
11428
11429
11430
11431
11432
11433
11434
11435
11436
11437
11438
11439
11440
11441
11442
11443
11444
11445
11446
11447
11448
11449
11450
11451
11452
11453
11454
11455
11456
11457
11458
11459
11460
11461
11462
11463
11464
11465
11466
11467
11468
11469
11470
11471
11472
11473
11474
11475
11476
11477
11478
11479
11480
11481
11482
11483
11484
11485
11486
11487
11488
11489
11490
11491
11492
11493
11494
11495
11496
11497
11498
11499
11500
11501
11502
11503
11504
11505
11506
11507
11508
11509
11510
11511
11512
11513
11514
11515
11516
11517
11518
11519
11520
11521
11522
11523
11524
11525
11526
11527
11528
11529
11530
11531
11532
11533
11534
11535
11536
11537
11538
11539
11540
11541
11542
11543
11544
11545
11546
11547
11548
11549
11550
11551
11552
11553
11554
11555
11556
11557
11558
11559
11560
11561
11562
11563
11564
11565
11566
11567
11568
11569
11570
11571
11572
11573
11574
11575
11576
11577
11578
11579
11580
11581
11582
11583
11584
11585
11586
11587
11588
11589
11590
11591
11592
11593
11594
11595
11596
11597
11598
11599
11600
11601
11602
11603
11604
11605
11606
11607
11608
11609
11610
11611
11612
11613
11614
11615
11616
11617
11618
11619
11620
11621
11622
11623
11624
11625
11626
11627
11628
11629
11630
11631
11632
11633
11634
11635
11636
11637
11638
11639
11640
11641
11642
11643
11644
11645
11646
11647
11648
11649
11650
11651
11652
11653
11654
11655
11656
11657
11658
11659
11660
11661
11662
11663
11664
11665
11666
11667
11668
11669
11670
11671
11672
11673
11674
11675
11676
11677
11678
11679
11680
11681
11682
11683
11684
11685
11686
11687
11688
11689
11690
11691
11692
11693
11694
11695
11696
11697
11698
11699
11700
11701
11702
11703
11704
11705
11706
11707
11708
11709
11710
11711
11712
11713
11714
11715
11716
11717
11718
11719
11720
11721
11722
11723
11724
11725
11726
11727
11728
11729
11730
11731
11732
11733
11734
11735
11736
11737
11738
11739
11740
11741
11742
11743
11744
11745
11746
11747
11748
11749
11750
11751
11752
11753
11754
11755
11756
11757
11758
11759
11760
11761
11762
11763
11764
11765
11766
11767
11768
11769
11770
11771
11772
11773
11774
11775
11776
11777
11778
11779
11780
11781
11782
11783
11784
11785
11786
11787
11788
11789
11790
11791
11792
11793
11794
11795
11796
11797
11798
11799
11800
11801
11802
11803
11804
11805
11806
11807
11808
11809
11810
11811
11812
11813
11814
11815
11816
11817
11818
11819
11820
11821
11822
11823
11824
11825
11826
11827
11828
11829
11830
11831
11832
11833
11834
11835
11836
11837
11838
11839
11840
11841
11842
11843
11844
11845
11846
11847
11848
11849
11850
11851
11852
11853
11854
11855
11856
11857
11858
11859
11860
11861
11862
11863
11864
11865
11866
11867
11868
11869
11870
11871
11872
11873
11874
11875
11876
11877
11878
11879
11880
11881
11882
11883
11884
11885
11886
11887
11888
11889
11890
11891
11892
11893
11894
11895
11896
11897
11898
11899
11900
11901
11902
11903
11904
11905
11906
11907
11908
11909
11910
11911
11912
11913
11914
11915
11916
11917
11918
11919
11920
11921
11922
11923
11924
11925
11926
11927
11928
11929
11930
11931
11932
11933
11934
11935
11936
11937
11938
11939
11940
11941
11942
11943
11944
11945
11946
11947
11948
11949
11950
11951
11952
11953
11954
11955
11956
11957
11958
11959
11960
11961
11962
11963
11964
11965
11966
11967
11968
11969
11970
11971
11972
11973
11974
11975
11976
11977
11978
11979
11980
11981
11982
11983
11984
11985
11986
11987
11988
11989
11990
11991
11992
11993
11994
11995
11996
11997
11998
11999
12000
12001
12002
12003
12004
12005
12006
12007
12008
12009
12010
12011
12012
12013
12014
12015
12016
12017
12018
12019
12020
12021
12022
12023
12024
12025
12026
12027
12028
12029
12030
12031
12032
12033
12034
12035
12036
12037
12038
12039
12040
12041
12042
12043
12044
12045
12046
12047
12048
12049
12050
12051
12052
12053
12054
12055
12056
12057
12058
12059
12060
12061
12062
12063
12064
12065
12066
12067
12068
12069
12070
12071
12072
12073
12074
12075
12076
12077
12078
12079
12080
12081
12082
12083
12084
12085
12086
12087
12088
12089
12090
12091
12092
12093
12094
12095
12096
12097
12098
12099
12100
12101
12102
12103
12104
12105
12106
12107
12108
12109
12110
12111
12112
12113
12114
12115
12116
12117
12118
12119
12120
12121
12122
12123
12124
12125
12126
12127
12128
12129
12130
12131
12132
12133
12134
12135
12136
12137
12138
12139
12140
12141
12142
12143
12144
12145
12146
12147
12148
12149
12150
12151
12152
12153
12154
12155
12156
12157
12158
12159
12160
12161
12162
12163
12164
12165
12166
12167
12168
12169
12170
12171
12172
12173
12174
12175
12176
12177
12178
12179
12180
12181
12182
12183
12184
12185
12186
12187
12188
12189
12190
12191
12192
12193
12194
12195
12196
12197
12198
12199
12200
12201
12202
12203
12204
12205
12206
12207
12208
12209
12210
12211
12212
12213
12214
12215
12216
12217
12218
12219
12220
12221
12222
12223
12224
12225
12226
12227
12228
12229
12230
12231
12232
12233
12234
12235
12236
12237
12238
12239
12240
12241
12242
12243
12244
12245
12246
12247
12248
12249
12250
12251
12252
12253
12254
12255
12256
12257
12258
12259
12260
12261
12262
12263
12264
12265
12266
12267
12268
12269
12270
12271
12272
12273
12274
12275
12276
12277
12278
12279
12280
12281
12282
12283
12284
12285
12286
12287
12288
12289
12290
12291
12292
12293
12294
12295
12296
12297
12298
12299
12300
12301
12302
12303
12304
12305
12306
12307
12308
12309
12310
12311
12312
12313
12314
12315
12316
12317
12318
12319
12320
12321
12322
12323
12324
12325
12326
12327
12328
12329
12330
12331
12332
12333
12334
12335
12336
12337
12338
12339
12340
12341
12342
12343
12344
12345
12346
12347
12348
12349
12350
12351
12352
12353
12354
12355
12356
12357
12358
12359
12360
12361
12362
12363
12364
12365
12366
12367
12368
12369
12370
12371
12372
12373
12374
12375
12376
12377
12378
12379
12380
12381
12382
12383
12384
12385
12386
12387
12388
12389
12390
12391
12392
12393
12394
12395
12396
12397
12398
12399
12400
12401
12402
12403
12404
12405
12406
12407
12408
12409
12410
12411
12412
12413
12414
12415
12416
12417
12418
12419
12420
12421
12422
12423
12424
12425
12426
12427
12428
12429
12430
12431
12432
12433
12434
12435
12436
12437
12438
12439
12440
12441
12442
12443
12444
12445
12446
12447
12448
12449
12450
12451
12452
12453
12454
12455
12456
12457
12458
12459
12460
12461
12462
12463
12464
12465
12466
12467
12468
12469
12470
12471
12472
12473
12474
12475
12476
12477
12478
12479
12480
12481
12482
12483
12484
12485
12486
12487
12488
12489
12490
12491
12492
12493
12494
12495
12496
12497
12498
12499
12500
12501
12502
12503
12504
12505
12506
12507
12508
12509
12510
12511
12512
12513
12514
12515
12516
12517
12518
12519
12520
12521
12522
12523
12524
12525
12526
12527
12528
12529
12530
12531
12532
12533
12534
12535
12536
12537
12538
12539
12540
12541
12542
12543
12544
12545
12546
12547
12548
12549
12550
12551
12552
12553
12554
12555
12556
12557
12558
12559
12560
12561
12562
12563
12564
12565
12566
12567
12568
12569
12570
12571
12572
12573
12574
12575
12576
12577
12578
12579
12580
12581
12582
12583
12584
12585
12586
12587
12588
12589
12590
12591
12592
12593
12594
12595
12596
12597
12598
12599
12600
12601
12602
12603
12604
12605
12606
12607
12608
12609
12610
12611
12612
12613
12614
12615
12616
12617
12618
12619
12620
12621
12622
12623
12624
12625
12626
12627
12628
12629
12630
12631
12632
12633
12634
12635
12636
12637
12638
12639
12640
12641
12642
12643
12644
12645
12646
12647
12648
12649
12650
12651
12652
12653
12654
12655
12656
12657
12658
12659
12660
12661
12662
12663
12664
12665
12666
12667
12668
12669
12670
12671
12672
12673
12674
12675
12676
12677
12678
12679
12680
12681
12682
12683
12684
12685
12686
12687
12688
12689
12690
12691
12692
12693
12694
12695
12696
12697
12698
12699
12700
12701
12702
12703
12704
12705
12706
12707
12708
12709
12710
12711
12712
12713
12714
12715
12716
12717
12718
12719
12720
12721
12722
12723
12724
12725
12726
12727
12728
12729
12730
12731
12732
12733
12734
12735
12736
12737
12738
12739
12740
12741
12742
12743
12744
12745
12746
12747
12748
12749
12750
12751
12752
12753
12754
12755
12756
12757
12758
12759
12760
12761
12762
12763
12764
12765
12766
12767
12768
12769
12770
12771
12772
12773
12774
12775
12776
12777
12778
12779
12780
12781
12782
12783
12784
12785
12786
12787
12788
12789
12790
12791
12792
12793
12794
12795
12796
12797
12798
12799
12800
12801
12802
12803
12804
12805
12806
12807
12808
12809
12810
12811
12812
12813
12814
12815
12816
12817
12818
12819
12820
12821
12822
12823
12824
12825
12826
12827
12828
12829
12830
12831
12832
12833
12834
12835
12836
12837
12838
12839
12840
12841
12842
12843
12844
12845
12846
12847
12848
12849
12850
12851
12852
12853
12854
12855
12856
12857
12858
12859
12860
12861
12862
12863
12864
12865
12866
12867
12868
12869
12870
12871
12872
12873
12874
12875
12876
12877
12878
12879
12880
12881
12882
12883
12884
12885
12886
12887
12888
12889
12890
12891
12892
12893
12894
12895
12896
12897
12898
12899
12900
12901
12902
12903
12904
12905
12906
12907
12908
12909
12910
12911
12912
12913
12914
12915
12916
12917
12918
12919
12920
12921
12922
12923
12924
12925
12926
12927
12928
12929
12930
12931
12932
12933
12934
12935
12936
12937
12938
12939
12940
12941
12942
12943
12944
12945
12946
12947
12948
12949
12950
12951
12952
12953
12954
12955
12956
12957
12958
12959
12960
12961
12962
12963
12964
12965
12966
12967
12968
12969
12970
12971
12972
12973
12974
12975
12976
12977
12978
12979
12980
12981
12982
12983
12984
12985
12986
12987
12988
12989
12990
12991
12992
12993
12994
12995
12996
12997
12998
12999
13000
13001
13002
13003
13004
13005
13006
13007
13008
13009
13010
13011
13012
13013
13014
13015
13016
13017
13018
13019
13020
13021
13022
13023
13024
13025
13026
13027
13028
13029
13030
13031
13032
13033
13034
13035
13036
13037
13038
13039
13040
13041
13042
13043
13044
13045
13046
13047
13048
13049
13050
13051
13052
13053
13054
13055
13056
13057
13058
13059
13060
13061
13062
13063
13064
13065
13066
13067
13068
13069
13070
13071
13072
13073
13074
13075
13076
13077
13078
13079
13080
13081
13082
13083
13084
13085
13086
13087
13088
13089
13090
13091
13092
13093
13094
13095
13096
13097
13098
13099
13100
13101
13102
13103
13104
13105
13106
13107
13108
13109
13110
13111
13112
13113
13114
13115
13116
13117
13118
13119
13120
13121
13122
13123
13124
13125
13126
13127
13128
13129
13130
13131
13132
13133
13134
13135
13136
13137
13138
13139
13140
13141
13142
13143
13144
13145
13146
13147
13148
13149
13150
13151
13152
13153
13154
13155
13156
13157
13158
13159
13160
13161
13162
13163
13164
13165
13166
13167
13168
13169
13170
13171
13172
13173
13174
13175
13176
13177
13178
13179
13180
13181
13182
13183
13184
13185
13186
13187
13188
13189
13190
13191
13192
13193
13194
13195
13196
13197
13198
13199
13200
13201
13202
13203
13204
13205
13206
13207
13208
13209
13210
13211
13212
13213
13214
13215
13216
13217
13218
13219
13220
13221
13222
13223
13224
13225
13226
13227
13228
13229
13230
13231
13232
13233
13234
13235
13236
13237
13238
13239
13240
13241
13242
13243
13244
13245
13246
13247
13248
13249
13250
13251
13252
13253
13254
13255
13256
13257
13258
13259
13260
13261
13262
13263
13264
13265
13266
13267
13268
13269
13270
13271
13272
13273
13274
13275
13276
13277
13278
13279
13280
13281
13282
13283
13284
13285
13286
13287
13288
13289
13290
13291
13292
13293
13294
13295
13296
13297
13298
13299
13300
13301
13302
13303
13304
13305
13306
13307
13308
13309
13310
13311
13312
13313
13314
13315
13316
13317
13318
13319
13320
13321
13322
13323
13324
13325
13326
13327
13328
13329
13330
13331
13332
13333
13334
13335
13336
13337
13338
13339
13340
13341
13342
13343
13344
13345
13346
13347
13348
13349
13350
13351
13352
13353
13354
13355
13356
13357
13358
13359
13360
13361
13362
13363
13364
13365
13366
13367
13368
13369
13370
13371
13372
13373
13374
13375
13376
13377
13378
13379
13380
13381
13382
13383
13384
13385
13386
13387
13388
13389
13390
13391
13392
13393
13394
13395
13396
13397
13398
13399
13400
13401
13402
13403
13404
13405
13406
13407
13408
13409
13410
13411
13412
13413
13414
13415
13416
13417
13418
13419
13420
13421
13422
13423
13424
13425
13426
13427
13428
13429
13430
13431
13432
13433
13434
13435
13436
13437
13438
13439
13440
13441
13442
13443
13444
13445
13446
13447
13448
13449
13450
13451
13452
13453
13454
13455
13456
13457
13458
13459
13460
13461
13462
13463
13464
13465
13466
13467
13468
13469
13470
13471
13472
13473
13474
13475
13476
13477
13478
13479
13480
13481
13482
13483
13484
13485
13486
13487
13488
13489
13490
13491
13492
13493
13494
13495
13496
13497
13498
13499
13500
13501
13502
13503
13504
13505
13506
13507
13508
13509
13510
13511
13512
13513
13514
13515
13516
13517
13518
13519
13520
13521
13522
13523
13524
13525
13526
13527
13528
13529
13530
13531
13532
13533
13534
13535
13536
13537
13538
13539
13540
13541
13542
13543
13544
13545
13546
13547
13548
13549
13550
13551
13552
13553
13554
13555
13556
13557
13558
13559
13560
13561
13562
13563
13564
13565
13566
13567
13568
13569
13570
13571
13572
13573
13574
13575
13576
13577
13578
13579
13580
13581
13582
13583
13584
13585
13586
13587
13588
13589
13590
13591
13592
13593
13594
13595
13596
13597
13598
13599
13600
13601
13602
13603
13604
13605
13606
13607
13608
13609
13610
13611
13612
13613
13614
13615
13616
13617
13618
13619
13620
13621
13622
13623
13624
13625
13626
13627
13628
13629
13630
13631
13632
13633
13634
13635
13636
13637
13638
13639
13640
13641
13642
13643
13644
13645
13646
13647
13648
13649
13650
13651
13652
13653
13654
13655
13656
13657
13658
13659
13660
13661
13662
13663
13664
13665
13666
13667
13668
13669
13670
13671
13672
13673
13674
13675
13676
13677
13678
13679
13680
13681
13682
13683
13684
13685
13686
13687
13688
13689
13690
13691
13692
13693
13694
13695
13696
13697
13698
13699
13700
13701
13702
13703
13704
13705
13706
13707
13708
13709
13710
13711
13712
13713
13714
13715
13716
13717
13718
13719
13720
13721
13722
13723
13724
13725
13726
13727
13728
13729
13730
13731
13732
13733
13734
13735
13736
13737
13738
13739
13740
13741
13742
13743
13744
13745
13746
13747
13748
13749
13750
13751
13752
13753
13754
13755
13756
13757
13758
13759
13760
13761
13762
13763
13764
13765
13766
13767
13768
13769
13770
13771
13772
13773
13774
13775
13776
13777
13778
13779
13780
13781
13782
13783
13784
13785
13786
13787
13788
13789
13790
13791
13792
13793
13794
13795
13796
13797
13798
13799
13800
13801
13802
13803
13804
13805
13806
13807
13808
13809
13810
13811
13812
13813
13814
13815
13816
13817
13818
13819
13820
13821
13822
13823
13824
13825
13826
13827
13828
13829
13830
13831
13832
13833
13834
13835
13836
13837
13838
13839
13840
13841
13842
13843
13844
13845
13846
13847
13848
13849
13850
13851
13852
13853
13854
13855
13856
13857
13858
13859
13860
13861
13862
13863
13864
13865
13866
13867
13868
13869
13870
13871
13872
13873
13874
13875
13876
13877
13878
13879
13880
13881
13882
13883
13884
13885
13886
13887
13888
13889
13890
13891
13892
13893
13894
13895
13896
13897
13898
13899
13900
13901
13902
13903
13904
13905
13906
13907
13908
13909
13910
13911
13912
13913
13914
13915
13916
13917
13918
13919
13920
13921
13922
13923
13924
13925
13926
13927
13928
13929
13930
13931
13932
13933
13934
13935
13936
13937
13938
13939
13940
13941
13942
13943
13944
13945
13946
13947
13948
13949
13950
13951
13952
13953
13954
13955
13956
13957
13958
13959
13960
13961
13962
13963
13964
13965
13966
13967
13968
13969
13970
13971
13972
13973
13974
13975
13976
13977
13978
13979
13980
13981
13982
13983
13984
13985
13986
13987
13988
13989
13990
13991
13992
13993
13994
13995
13996
13997
13998
13999
14000
14001
14002
14003
14004
14005
14006
14007
14008
14009
14010
14011
14012
14013
14014
14015
14016
14017
14018
14019
14020
14021
14022
14023
14024
14025
14026
14027
14028
14029
14030
14031
14032
14033
14034
14035
14036
14037
14038
14039
14040
14041
14042
14043
14044
14045
14046
14047
14048
14049
14050
14051
14052
14053
14054
14055
14056
14057
14058
14059
14060
14061
14062
14063
14064
14065
14066
14067
14068
14069
14070
14071
14072
14073
14074
14075
14076
14077
14078
14079
14080
14081
14082
14083
14084
14085
14086
14087
14088
14089
14090
14091
14092
14093
14094
14095
14096
14097
14098
14099
14100
14101
14102
14103
14104
14105
14106
14107
14108
14109
14110
14111
14112
14113
14114
14115
14116
14117
14118
14119
14120
14121
14122
14123
14124
14125
14126
14127
14128
14129
14130
14131
14132
14133
14134
14135
14136
14137
14138
14139
14140
14141
14142
14143
14144
14145
14146
14147
14148
14149
14150
14151
14152
14153
14154
14155
14156
14157
14158
14159
14160
14161
14162
14163
14164
14165
14166
14167
14168
14169
14170
14171
14172
14173
14174
14175
14176
14177
14178
14179
14180
14181
14182
14183
14184
14185
14186
14187
14188
14189
14190
14191
14192
14193
14194
14195
14196
14197
14198
14199
14200
14201
14202
14203
14204
14205
14206
14207
14208
14209
14210
14211
14212
14213
14214
14215
14216
14217
14218
14219
14220
14221
14222
14223
14224
14225
14226
14227
14228
14229
14230
14231
14232
14233
14234
14235
14236
14237
14238
14239
14240
14241
14242
14243
14244
14245
14246
14247
14248
14249
14250
14251
14252
14253
14254
14255
14256
14257
14258
14259
14260
14261
14262
14263
14264
14265
14266
14267
14268
14269
14270
14271
14272
14273
14274
14275
14276
14277
14278
14279
14280
14281
14282
14283
14284
14285
14286
14287
14288
14289
14290
14291
14292
14293
14294
14295
14296
14297
14298
14299
14300
14301
14302
14303
14304
14305
14306
14307
14308
14309
14310
14311
14312
14313
14314
14315
14316
14317
14318
14319
14320
14321
14322
14323
14324
14325
14326
14327
14328
14329
14330
14331
14332
14333
14334
14335
14336
14337
14338
14339
14340
14341
14342
14343
14344
14345
14346
14347
14348
14349
14350
14351
14352
14353
14354
14355
14356
14357
14358
14359
14360
14361
14362
14363
14364
14365
14366
14367
14368
14369
14370
14371
14372
14373
14374
14375
14376
14377
14378
14379
14380
14381
14382
14383
14384
14385
14386
14387
14388
14389
14390
14391
14392
14393
14394
14395
14396
14397
14398
14399
14400
14401
14402
14403
14404
14405
14406
14407
14408
14409
14410
14411
14412
14413
14414
14415
14416
14417
14418
14419
14420
14421
14422
14423
14424
14425
14426
14427
14428
14429
14430
14431
14432
14433
14434
14435
14436
14437
14438
14439
14440
14441
14442
14443
14444
14445
14446
14447
14448
14449
14450
14451
14452
14453
14454
14455
14456
14457
14458
14459
14460
14461
14462
14463
14464
14465
14466
14467
14468
14469
14470
14471
14472
14473
14474
14475
14476
14477
14478
14479
14480
14481
14482
14483
14484
14485
14486
14487
14488
14489
14490
14491
14492
14493
14494
14495
14496
14497
14498
14499
14500
14501
14502
14503
14504
14505
14506
14507
14508
14509
14510
14511
14512
14513
14514
14515
14516
14517
14518
14519
14520
14521
14522
14523
14524
14525
14526
14527
14528
14529
14530
14531
14532
14533
14534
14535
14536
14537
14538
14539
14540
14541
14542
14543
14544
14545
14546
14547
14548
14549
14550
14551
14552
14553
14554
14555
14556
14557
14558
14559
14560
14561
14562
14563
14564
14565
14566
14567
14568
14569
14570
14571
14572
14573
14574
14575
14576
14577
14578
14579
14580
14581
14582
14583
14584
14585
14586
14587
14588
14589
14590
14591
14592
14593
14594
14595
14596
14597
14598
14599
14600
14601
14602
14603
14604
14605
14606
14607
14608
14609
14610
14611
14612
14613
14614
14615
14616
14617
14618
14619
14620
14621
14622
14623
14624
14625
14626
14627
14628
14629
14630
14631
14632
14633
14634
14635
14636
14637
14638
14639
14640
14641
14642
14643
14644
14645
14646
14647
14648
14649
14650
14651
14652
14653
14654
14655
14656
14657
14658
14659
14660
14661
14662
14663
14664
14665
14666
14667
14668
14669
14670
14671
14672
14673
14674
14675
14676
14677
14678
14679
14680
14681
14682
14683
14684
14685
14686
14687
14688
14689
14690
14691
14692
14693
14694
14695
14696
14697
14698
14699
14700
14701
14702
14703
14704
14705
14706
14707
14708
14709
14710
14711
14712
14713
14714
14715
14716
14717
14718
14719
14720
14721
14722
14723
14724
14725
14726
14727
14728
14729
14730
14731
14732
14733
14734
14735
14736
14737
14738
14739
14740
14741
14742
14743
14744
14745
14746
14747
14748
14749
14750
14751
14752
14753
14754
14755
14756
14757
14758
14759
14760
14761
14762
14763
14764
14765
14766
14767
14768
14769
14770
14771
14772
14773
14774
14775
14776
14777
14778
14779
14780
14781
14782
14783
14784
14785
14786
14787
14788
14789
14790
14791
14792
14793
14794
14795
14796
14797
14798
14799
14800
14801
14802
14803
14804
14805
14806
14807
14808
14809
14810
14811
14812
14813
14814
14815
14816
14817
14818
14819
14820
14821
14822
14823
14824
14825
14826
14827
14828
14829
14830
14831
14832
14833
14834
14835
14836
14837
14838
14839
14840
14841
14842
14843
14844
14845
14846
14847
14848
14849
14850
14851
14852
14853
14854
14855
14856
14857
14858
14859
14860
14861
14862
14863
14864
14865
14866
14867
14868
14869
14870
14871
14872
14873
14874
14875
14876
14877
14878
14879
14880
14881
14882
14883
14884
14885
14886
14887
14888
14889
14890
14891
14892
14893
14894
14895
14896
14897
14898
14899
14900
14901
14902
14903
14904
14905
14906
14907
14908
14909
14910
14911
14912
14913
14914
14915
14916
14917
14918
14919
14920
14921
14922
14923
14924
14925
14926
14927
14928
14929
14930
14931
14932
14933
14934
14935
14936
14937
14938
14939
14940
14941
14942
14943
14944
14945
14946
14947
14948
14949
14950
14951
14952
14953
14954
14955
14956
14957
14958
14959
14960
14961
14962
14963
14964
14965
14966
14967
14968
14969
14970
14971
14972
14973
14974
14975
14976
14977
14978
14979
14980
14981
14982
14983
14984
14985
14986
14987
14988
14989
14990
14991
14992
14993
14994
14995
14996
14997
14998
14999
15000
15001
15002
15003
15004
15005
15006
15007
15008
15009
15010
15011
15012
15013
15014
15015
15016
15017
15018
15019
15020
15021
15022
15023
15024
15025
15026
15027
15028
15029
15030
15031
15032
15033
15034
15035
15036
15037
15038
15039
15040
15041
15042
15043
15044
15045
15046
15047
15048
15049
15050
15051
15052
15053
15054
15055
15056
15057
15058
15059
15060
15061
15062
15063
15064
15065
15066
15067
15068
15069
15070
15071
15072
15073
15074
15075
15076
15077
15078
15079
15080
15081
15082
15083
15084
15085
15086
15087
15088
15089
15090
15091
15092
15093
15094
15095
15096
15097
15098
15099
15100
15101
15102
15103
15104
15105
15106
15107
15108
15109
15110
15111
15112
15113
15114
15115
15116
15117
15118
15119
15120
15121
15122
15123
15124
15125
15126
15127
15128
15129
15130
15131
15132
15133
15134
15135
15136
15137
15138
15139
15140
15141
15142
15143
15144
15145
15146
15147
15148
15149
15150
15151
15152
15153
15154
15155
15156
15157
15158
15159
15160
15161
15162
15163
15164
15165
15166
15167
15168
15169
15170
15171
15172
15173
15174
15175
15176
15177
15178
15179
15180
15181
15182
15183
15184
15185
15186
15187
15188
15189
15190
15191
15192
15193
15194
15195
15196
15197
15198
15199
15200
15201
15202
15203
15204
15205
15206
15207
15208
15209
15210
15211
15212
15213
15214
15215
15216
15217
15218
15219
15220
15221
15222
15223
15224
15225
15226
15227
15228
15229
15230
15231
15232
15233
15234
15235
15236
15237
15238
15239
15240
15241
15242
15243
15244
15245
15246
15247
15248
15249
15250
15251
15252
15253
15254
15255
15256
15257
15258
15259
15260
15261
15262
15263
15264
15265
15266
15267
15268
15269
15270
15271
15272
15273
15274
15275
15276
15277
15278
15279
15280
15281
15282
15283
15284
15285
15286
15287
15288
15289
15290
15291
15292
15293
15294
15295
15296
15297
15298
15299
15300
15301
15302
15303
15304
15305
15306
15307
15308
15309
15310
15311
15312
15313
15314
15315
15316
15317
15318
15319
15320
15321
15322
15323
15324
15325
15326
15327
15328
15329
15330
15331
15332
15333
15334
15335
15336
15337
15338
15339
15340
15341
15342
15343
15344
15345
15346
15347
15348
15349
15350
15351
15352
15353
15354
15355
15356
15357
15358
15359
15360
15361
15362
15363
15364
15365
15366
15367
15368
15369
15370
15371
15372
15373
15374
15375
15376
15377
15378
15379
15380
15381
15382
15383
15384
15385
15386
15387
15388
15389
15390
15391
15392
15393
15394
15395
15396
15397
15398
15399
15400
15401
15402
15403
15404
15405
15406
15407
15408
15409
15410
15411
15412
15413
15414
15415
15416
15417
15418
15419
15420
15421
15422
15423
15424
15425
15426
15427
15428
15429
15430
15431
15432
15433
15434
15435
15436
15437
15438
15439
15440
15441
15442
15443
15444
15445
15446
15447
15448
15449
15450
15451
15452
15453
15454
15455
15456
15457
15458
15459
15460
15461
15462
15463
15464
15465
15466
15467
15468
15469
15470
15471
15472
15473
15474
15475
15476
15477
15478
15479
15480
15481
15482
15483
15484
15485
15486
15487
15488
15489
15490
15491
15492
15493
15494
15495
15496
15497
15498
15499
15500
15501
15502
15503
15504
15505
15506
15507
15508
15509
15510
15511
15512
15513
15514
15515
15516
15517
15518
15519
15520
15521
15522
15523
15524
15525
15526
15527
15528
15529
15530
15531
15532
15533
15534
15535
15536
15537
15538
15539
15540
15541
15542
15543
15544
15545
15546
15547
15548
15549
15550
15551
15552
15553
15554
15555
15556
15557
15558
15559
15560
15561
15562
15563
15564
15565
15566
15567
15568
15569
15570
15571
15572
15573
15574
15575
15576
15577
15578
15579
15580
15581
15582
15583
15584
15585
15586
15587
15588
15589
15590
15591
15592
15593
15594
15595
15596
15597
15598
15599
15600
15601
15602
15603
15604
15605
15606
15607
15608
15609
15610
15611
15612
15613
15614
15615
15616
15617
15618
15619
15620
15621
15622
15623
15624
15625
15626
15627
15628
15629
15630
15631
15632
15633
15634
15635
15636
15637
15638
15639
15640
15641
15642
15643
15644
15645
15646
15647
15648
15649
15650
15651
15652
15653
15654
15655
15656
15657
15658
15659
15660
15661
15662
15663
15664
15665
15666
15667
15668
15669
15670
15671
15672
15673
15674
15675
15676
15677
15678
15679
15680
15681
15682
15683
15684
15685
15686
15687
15688
15689
15690
15691
15692
15693
15694
15695
15696
15697
15698
15699
15700
15701
15702
15703
15704
15705
15706
15707
15708
15709
15710
15711
15712
15713
15714
15715
15716
15717
15718
15719
15720
15721
15722
15723
15724
15725
15726
15727
15728
15729
15730
15731
15732
15733
15734
15735
15736
15737
15738
15739
15740
15741
15742
15743
15744
15745
15746
15747
15748
15749
15750
15751
15752
15753
15754
15755
15756
15757
15758
15759
15760
15761
15762
15763
15764
15765
15766
15767
15768
15769
15770
15771
15772
15773
15774
15775
15776
15777
15778
15779
15780
15781
15782
15783
15784
15785
15786
15787
15788
15789
15790
15791
15792
15793
15794
15795
15796
15797
15798
15799
15800
15801
15802
15803
15804
15805
15806
15807
15808
15809
15810
15811
15812
15813
15814
15815
15816
15817
15818
15819
15820
15821
15822
15823
15824
15825
15826
15827
15828
15829
15830
15831
15832
15833
15834
15835
15836
15837
15838
15839
15840
15841
15842
15843
15844
15845
15846
15847
15848
15849
15850
15851
15852
15853
15854
15855
15856
15857
15858
15859
15860
15861
15862
15863
15864
15865
15866
15867
15868
15869
15870
15871
15872
15873
15874
15875
15876
15877
15878
15879
15880
15881
15882
15883
15884
15885
15886
15887
15888
15889
15890
15891
15892
15893
15894
15895
15896
15897
15898
15899
15900
15901
15902
15903
15904
15905
15906
15907
15908
15909
15910
15911
15912
15913
15914
15915
15916
15917
15918
15919
15920
15921
15922
15923
15924
15925
15926
15927
15928
15929
15930
15931
15932
15933
15934
15935
15936
15937
15938
15939
15940
15941
15942
15943
15944
15945
15946
15947
15948
15949
15950
15951
15952
15953
15954
15955
15956
15957
15958
15959
15960
15961
15962
15963
15964
15965
15966
15967
15968
15969
15970
15971
15972
15973
15974
15975
15976
15977
15978
15979
15980
15981
15982
15983
15984
15985
15986
15987
15988
15989
15990
15991
15992
15993
15994
15995
15996
15997
15998
15999
16000
16001
16002
16003
16004
16005
16006
16007
16008
16009
16010
16011
16012
16013
16014
16015
16016
16017
16018
16019
16020
16021
16022
16023
16024
16025
16026
16027
16028
16029
16030
16031
16032
16033
16034
16035
16036
16037
16038
16039
16040
16041
16042
16043
16044
16045
16046
16047
16048
16049
16050
16051
16052
16053
16054
16055
16056
16057
16058
16059
16060
16061
16062
16063
16064
16065
16066
16067
16068
16069
16070
16071
16072
16073
16074
16075
16076
16077
16078
16079
16080
16081
16082
16083
16084
16085
16086
16087
16088
16089
16090
16091
16092
16093
16094
16095
16096
16097
16098
16099
16100
16101
16102
16103
16104
16105
16106
16107
16108
16109
16110
16111
16112
16113
16114
16115
16116
16117
16118
16119
16120
16121
16122
16123
16124
16125
16126
16127
16128
16129
16130
16131
16132
16133
16134
16135
16136
16137
16138
16139
16140
16141
16142
16143
16144
16145
16146
16147
16148
16149
16150
16151
16152
16153
16154
16155
16156
16157
16158
16159
16160
16161
16162
16163
16164
16165
16166
16167
16168
16169
16170
16171
16172
16173
16174
16175
16176
16177
16178
16179
16180
16181
16182
16183
16184
16185
16186
16187
16188
16189
16190
16191
16192
16193
16194
16195
16196
16197
16198
16199
16200
16201
16202
16203
16204
16205
16206
16207
16208
16209
16210
16211
16212
16213
16214
16215
16216
16217
16218
16219
16220
16221
16222
16223
16224
16225
16226
16227
16228
16229
16230
16231
16232
16233
16234
16235
16236
16237
16238
16239
16240
16241
16242
16243
16244
16245
16246
16247
16248
16249
16250
16251
16252
16253
16254
16255
16256
16257
16258
16259
16260
16261
16262
16263
16264
16265
16266
16267
16268
16269
16270
16271
16272
16273
16274
16275
16276
16277
16278
16279
16280
16281
16282
16283
16284
16285
16286
16287
16288
16289
16290
16291
16292
16293
16294
16295
16296
16297
16298
16299
16300
16301
16302
16303
16304
16305
16306
16307
16308
16309
16310
16311
16312
16313
16314
16315
16316
16317
16318
16319
16320
16321
16322
16323
16324
16325
16326
16327
16328
16329
16330
16331
16332
16333
16334
16335
16336
16337
16338
16339
16340
16341
16342
16343
16344
16345
16346
16347
16348
16349
16350
16351
16352
16353
16354
16355
16356
16357
16358
16359
16360
16361
16362
16363
16364
16365
16366
16367
16368
16369
16370
16371
16372
16373
16374
16375
16376
16377
16378
16379
16380
16381
16382
16383
16384
16385
16386
16387
16388
16389
16390
16391
16392
16393
16394
16395
16396
16397
16398
16399
16400
16401
16402
16403
16404
16405
16406
16407
16408
16409
16410
16411
16412
16413
16414
16415
16416
16417
16418
16419
16420
16421
16422
16423
16424
16425
16426
16427
16428
16429
16430
16431
16432
16433
16434
16435
16436
16437
16438
16439
16440
16441
16442
16443
16444
16445
16446
16447
16448
16449
16450
16451
16452
16453
16454
16455
16456
16457
16458
16459
16460
16461
16462
16463
16464
16465
16466
16467
16468
16469
16470
16471
16472
16473
16474
16475
16476
16477
16478
16479
16480
16481
16482
16483
16484
16485
16486
16487
16488
16489
16490
16491
16492
16493
16494
16495
16496
16497
16498
16499
16500
16501
16502
16503
16504
16505
16506
16507
16508
16509
16510
16511
16512
16513
16514
16515
16516
16517
16518
16519
16520
16521
16522
16523
16524
16525
16526
16527
16528
16529
16530
16531
16532
16533
16534
16535
16536
16537
16538
16539
16540
16541
16542
16543
16544
16545
16546
16547
16548
16549
16550
16551
16552
16553
16554
16555
16556
16557
16558
16559
16560
16561
16562
16563
16564
16565
16566
16567
16568
16569
16570
16571
16572
16573
16574
16575
16576
16577
16578
16579
16580
16581
16582
16583
16584
16585
16586
16587
16588
16589
16590
16591
16592
16593
16594
16595
16596
16597
16598
16599
16600
16601
16602
16603
16604
16605
16606
16607
16608
16609
16610
16611
16612
16613
16614
16615
16616
16617
16618
16619
16620
16621
16622
16623
16624
16625
16626
16627
16628
16629
16630
16631
16632
16633
16634
16635
16636
16637
16638
16639
16640
16641
16642
16643
16644
16645
16646
16647
16648
16649
16650
16651
16652
16653
16654
16655
16656
16657
16658
16659
16660
16661
16662
16663
16664
16665
16666
16667
16668
16669
16670
16671
16672
16673
16674
16675
16676
16677
16678
16679
16680
16681
16682
16683
16684
16685
16686
16687
16688
16689
16690
16691
16692
16693
16694
16695
16696
16697
16698
16699
16700
16701
16702
16703
16704
16705
16706
16707
16708
16709
16710
16711
16712
16713
16714
16715
16716
16717
16718
16719
16720
16721
16722
16723
16724
16725
16726
16727
16728
16729
16730
16731
16732
16733
16734
16735
16736
16737
16738
16739
16740
16741
16742
16743
16744
16745
16746
16747
16748
16749
16750
16751
16752
16753
16754
16755
16756
16757
16758
16759
16760
16761
16762
16763
16764
16765
16766
16767
16768
16769
16770
16771
16772
16773
16774
16775
16776
16777
16778
16779
16780
16781
16782
16783
16784
16785
16786
16787
16788
16789
16790
16791
16792
16793
16794
16795
16796
16797
16798
16799
16800
16801
16802
16803
16804
16805
16806
16807
16808
16809
16810
16811
16812
16813
16814
16815
16816
16817
16818
16819
16820
16821
16822
16823
16824
16825
16826
16827
16828
16829
16830
16831
16832
16833
16834
16835
16836
16837
16838
16839
16840
16841
16842
16843
16844
16845
16846
16847
16848
16849
16850
16851
16852
16853
16854
16855
16856
16857
16858
16859
16860
16861
16862
16863
16864
16865
16866
16867
16868
16869
16870
16871
16872
16873
16874
16875
16876
16877
16878
16879
16880
16881
16882
16883
16884
16885
16886
16887
16888
16889
16890
16891
16892
16893
16894
16895
16896
16897
16898
16899
16900
16901
16902
16903
16904
16905
16906
16907
16908
16909
16910
16911
16912
16913
16914
16915
16916
16917
16918
16919
16920
16921
16922
16923
16924
16925
16926
16927
16928
16929
16930
16931
16932
16933
16934
16935
16936
16937
16938
16939
16940
16941
16942
16943
16944
16945
16946
16947
16948
16949
16950
16951
16952
16953
16954
16955
16956
16957
16958
16959
16960
16961
16962
16963
16964
16965
16966
16967
16968
16969
16970
16971
16972
16973
16974
16975
16976
16977
16978
16979
16980
16981
16982
16983
16984
16985
16986
16987
16988
16989
16990
16991
16992
16993
16994
16995
16996
16997
16998
16999
17000
17001
17002
17003
17004
17005
17006
17007
17008
17009
17010
17011
17012
17013
17014
17015
17016
17017
17018
17019
17020
17021
17022
17023
17024
17025
17026
17027
17028
17029
17030
17031
17032
17033
17034
17035
17036
17037
17038
17039
17040
17041
17042
17043
17044
17045
17046
17047
17048
17049
17050
17051
17052
17053
17054
17055
17056
17057
17058
17059
17060
17061
17062
17063
17064
17065
17066
17067
17068
17069
17070
17071
17072
17073
17074
17075
17076
17077
17078
17079
17080
17081
17082
17083
17084
17085
17086
17087
17088
17089
17090
17091
17092
17093
17094
17095
17096
17097
17098
17099
17100
17101
17102
17103
17104
17105
17106
17107
17108
17109
17110
17111
17112
17113
17114
17115
17116
17117
17118
17119
17120
17121
17122
17123
17124
17125
17126
17127
17128
17129
17130
17131
17132
17133
17134
17135
17136
17137
17138
17139
17140
17141
17142
17143
17144
17145
17146
17147
17148
17149
17150
17151
17152
17153
17154
17155
17156
17157
17158
17159
17160
17161
17162
17163
17164
17165
17166
17167
17168
17169
17170
17171
17172
17173
17174
17175
17176
17177
17178
17179
17180
17181
17182
17183
17184
17185
17186
17187
17188
17189
17190
17191
17192
17193
17194
17195
17196
17197
17198
17199
17200
17201
17202
17203
17204
17205
17206
17207
17208
17209
17210
17211
17212
17213
17214
17215
17216
17217
17218
17219
17220
17221
17222
17223
17224
17225
17226
17227
17228
17229
17230
17231
17232
17233
17234
17235
17236
17237
17238
17239
17240
17241
17242
17243
17244
17245
17246
17247
17248
17249
17250
17251
17252
17253
17254
17255
17256
17257
17258
17259
17260
17261
17262
17263
17264
17265
17266
17267
17268
17269
17270
17271
17272
17273
17274
17275
17276
17277
17278
17279
17280
17281
17282
17283
17284
17285
17286
17287
17288
17289
17290
17291
17292
17293
17294
17295
17296
17297
17298
17299
17300
17301
17302
17303
17304
17305
17306
17307
17308
17309
17310
17311
17312
17313
17314
17315
17316
17317
17318
17319
17320
17321
17322
17323
17324
17325
17326
17327
17328
17329
17330
17331
17332
17333
17334
17335
17336
17337
17338
17339
17340
17341
17342
17343
17344
17345
17346
17347
17348
17349
17350
17351
17352
17353
17354
17355
17356
17357
17358
17359
17360
17361
17362
17363
17364
17365
17366
17367
17368
17369
17370
17371
17372
17373
17374
17375
17376
17377
17378
17379
17380
17381
17382
17383
17384
17385
17386
17387
17388
17389
17390
17391
17392
17393
17394
17395
17396
17397
17398
17399
17400
17401
17402
17403
17404
17405
17406
17407
17408
17409
17410
17411
17412
17413
17414
17415
17416
17417
17418
17419
17420
17421
17422
17423
17424
17425
17426
17427
17428
17429
17430
17431
17432
17433
17434
17435
17436
17437
17438
17439
17440
17441
17442
17443
17444
17445
17446
17447
17448
17449
17450
17451
17452
17453
17454
17455
17456
17457
17458
17459
17460
17461
17462
17463
17464
17465
17466
17467
17468
17469
17470
17471
17472
17473
17474
17475
17476
17477
17478
17479
17480
17481
17482
17483
17484
17485
17486
17487
17488
17489
17490
17491
17492
17493
17494
17495
17496
17497
17498
17499
17500
17501
17502
17503
17504
17505
17506
17507
17508
17509
17510
17511
17512
17513
17514
17515
17516
17517
17518
17519
17520
17521
17522
17523
17524
17525
17526
17527
17528
17529
17530
17531
17532
17533
17534
17535
17536
17537
17538
17539
17540
17541
17542
17543
17544
17545
17546
17547
17548
17549
17550
17551
17552
17553
17554
17555
17556
17557
17558
17559
17560
17561
17562
17563
17564
17565
17566
17567
17568
17569
17570
17571
17572
17573
17574
17575
17576
17577
17578
17579
17580
17581
17582
17583
17584
17585
17586
17587
17588
17589
17590
17591
17592
17593
17594
17595
17596
17597
17598
17599
17600
17601
17602
17603
17604
17605
17606
17607
17608
17609
17610
17611
17612
17613
17614
17615
17616
17617
17618
17619
17620
17621
17622
17623
17624
17625
17626
17627
17628
17629
17630
17631
17632
17633
17634
17635
17636
17637
17638
17639
17640
17641
17642
17643
17644
17645
17646
17647
17648
17649
17650
17651
17652
17653
17654
17655
17656
17657
17658
17659
17660
17661
17662
17663
17664
17665
17666
17667
17668
17669
17670
17671
17672
17673
17674
17675
17676
17677
17678
17679
17680
17681
17682
17683
17684
17685
17686
17687
17688
17689
17690
17691
17692
17693
17694
17695
17696
17697
17698
17699
17700
17701
17702
17703
17704
17705
17706
17707
17708
17709
17710
17711
17712
17713
17714
17715
17716
17717
17718
17719
17720
17721
17722
17723
17724
17725
17726
17727
17728
17729
17730
17731
17732
17733
17734
17735
17736
17737
17738
17739
17740
17741
17742
17743
17744
17745
17746
17747
17748
17749
17750
17751
17752
17753
17754
17755
17756
17757
17758
17759
17760
17761
17762
17763
17764
17765
17766
17767
17768
17769
17770
17771
17772
17773
17774
17775
17776
17777
17778
17779
17780
17781
17782
17783
17784
17785
17786
17787
17788
17789
17790
17791
17792
17793
17794
17795
17796
17797
17798
17799
17800
17801
17802
17803
17804
17805
17806
17807
17808
17809
17810
17811
17812
17813
17814
17815
17816
17817
17818
17819
17820
17821
17822
17823
17824
17825
17826
17827
17828
17829
17830
17831
17832
17833
17834
17835
17836
17837
17838
17839
17840
17841
17842
17843
17844
17845
17846
17847
17848
17849
17850
17851
17852
17853
17854
17855
17856
17857
17858
17859
17860
17861
17862
17863
17864
17865
17866
17867
17868
17869
17870
17871
17872
17873
17874
17875
17876
17877
17878
17879
17880
17881
17882
17883
17884
17885
17886
17887
17888
17889
17890
17891
17892
17893
17894
17895
17896
17897
17898
17899
17900
17901
17902
17903
17904
17905
17906
17907
17908
17909
17910
17911
17912
17913
17914
17915
17916
17917
17918
17919
17920
17921
17922
17923
17924
17925
17926
17927
17928
17929
17930
17931
17932
17933
17934
17935
17936
17937
17938
17939
17940
17941
17942
17943
17944
17945
17946
17947
17948
17949
17950
17951
17952
17953
17954
17955
17956
17957
17958
17959
17960
17961
17962
17963
17964
17965
17966
17967
17968
17969
17970
17971
17972
17973
17974
17975
17976
17977
17978
17979
17980
17981
17982
17983
17984
17985
17986
17987
17988
17989
17990
17991
17992
17993
17994
17995
17996
17997
17998
17999
18000
18001
18002
18003
18004
18005
18006
18007
18008
18009
18010
18011
18012
18013
18014
18015
18016
18017
18018
18019
18020
18021
18022
18023
18024
18025
18026
18027
18028
18029
18030
18031
18032
18033
18034
18035
18036
18037
18038
18039
18040
18041
18042
18043
18044
18045
18046
18047
18048
18049
18050
18051
18052
18053
18054
18055
18056
18057
18058
18059
18060
18061
18062
18063
18064
18065
18066
18067
18068
18069
18070
18071
18072
18073
18074
18075
18076
18077
18078
18079
18080
18081
18082
18083
18084
18085
18086
18087
18088
18089
18090
18091
18092
18093
18094
18095
18096
18097
18098
18099
18100
18101
18102
18103
18104
18105
18106
18107
18108
18109
18110
18111
18112
18113
18114
18115
18116
18117
18118
18119
18120
18121
18122
18123
18124
18125
18126
18127
18128
18129
18130
18131
18132
18133
18134
18135
18136
18137
18138
18139
18140
18141
18142
18143
18144
18145
18146
18147
18148
18149
18150
18151
18152
18153
18154
18155
18156
18157
18158
18159
18160
18161
18162
18163
18164
18165
18166
18167
18168
18169
18170
18171
18172
18173
18174
18175
18176
18177
18178
18179
18180
18181
18182
18183
18184
18185
18186
18187
18188
18189
18190
18191
18192
18193
18194
18195
18196
18197
18198
18199
18200
18201
18202
18203
18204
18205
18206
18207
18208
18209
18210
18211
18212
18213
18214
18215
18216
18217
18218
18219
18220
18221
18222
18223
18224
18225
18226
18227
18228
18229
18230
18231
18232
18233
18234
18235
18236
18237
18238
18239
18240
18241
18242
18243
18244
18245
18246
18247
18248
18249
18250
18251
18252
18253
18254
18255
18256
18257
18258
18259
18260
18261
18262
18263
18264
18265
18266
18267
18268
18269
18270
18271
18272
18273
18274
18275
18276
18277
18278
18279
18280
18281
18282
18283
18284
18285
18286
18287
18288
18289
18290
18291
18292
18293
18294
18295
18296
18297
18298
18299
18300
18301
18302
18303
18304
18305
18306
18307
18308
18309
18310
18311
18312
18313
18314
18315
18316
18317
18318
18319
18320
18321
18322
18323
18324
18325
18326
18327
18328
18329
18330
18331
18332
18333
18334
18335
18336
18337
18338
18339
18340
18341
18342
18343
18344
18345
18346
18347
18348
18349
18350
18351
18352
18353
18354
18355
18356
18357
18358
18359
18360
18361
18362
18363
18364
18365
18366
18367
18368
18369
18370
18371
18372
18373
18374
18375
18376
18377
18378
18379
18380
18381
18382
18383
18384
18385
18386
18387
18388
18389
18390
18391
18392
18393
18394
18395
18396
18397
18398
18399
18400
18401
18402
18403
18404
18405
18406
18407
18408
18409
18410
18411
18412
18413
18414
18415
18416
18417
18418
18419
18420
18421
18422
18423
18424
18425
18426
18427
18428
18429
18430
18431
18432
18433
18434
18435
18436
18437
18438
18439
18440
18441
18442
18443
18444
18445
18446
18447
18448
18449
18450
18451
18452
18453
18454
18455
18456
18457
18458
18459
18460
18461
18462
18463
18464
18465
18466
18467
18468
18469
18470
18471
18472
18473
18474
18475
18476
18477
18478
18479
18480
18481
18482
18483
18484
18485
18486
18487
18488
18489
18490
18491
18492
18493
18494
18495
18496
18497
18498
18499
18500
18501
18502
18503
18504
18505
18506
18507
18508
18509
18510
18511
18512
18513
18514
18515
18516
18517
18518
18519
18520
18521
18522
18523
18524
18525
18526
18527
18528
18529
18530
18531
18532
18533
18534
18535
18536
18537
18538
18539
18540
18541
18542
18543
18544
18545
18546
18547
18548
18549
18550
18551
18552
18553
18554
18555
18556
18557
18558
18559
18560
18561
18562
18563
18564
18565
18566
18567
18568
18569
18570
18571
18572
18573
18574
18575
18576
18577
18578
18579
18580
18581
18582
18583
18584
18585
18586
18587
18588
18589
18590
18591
18592
18593
18594
18595
18596
18597
18598
18599
18600
18601
18602
|
2005-10-01 Daniel Burrows <dburrows@debian.org>
* NEWS:
Add some missing entries and bug numbers.
* Makefile.am:
Distribute the other READMEs.
* NEWS:
Mention the build script migration.
* configure.ac, src/aptitude.h:
Deal with the fact that the old gettext/autoools generated a
test for locale.h and setlocale but the new one doesn't. I
could stop using the test, but instead I decided to just test
explicitly for them and define the appropriate variables if
they're found.
* src/aptitude.h:
Instead of using #define to empty setlocale, inline it. This
still fails to compile, but the error is a lot more obvious.
* ***:
Rebuilt all of the autotools and gettext junk from scratch using
automake-1.9. In theory this will make VPATH builds work
(xgettext was failing); however, I'm going to wait and see. It
does mean that I am no longer using old crufty versions of the
tools, though.
* Makefile.am:
On the other hand, the non-generated manual files really *are*
in $(srcdir).
* doc/en/Makefile.am, doc/fi/Makefile.am, doc/fr/Makefile.am:
Also pick up README from '.', not $(srcdir).
* doc/cs/Makefile.am, doc/de/Makefile.am, doc/en/Makefile.am, doc/fi/Makefile.am, doc/fr/Makefile.am:
Whoops, there is no $(builddir) -- it's just '.' in rules.
* doc/cs/Makefile.am, doc/de/Makefile.am, doc/en/Makefile.am, doc/fi/Makefile.am, doc/fr/Makefile.am:
Consistently put the output directories in $(builddir), not
$(srcdir).
* src/mine/Makefile.am:
Use $(wildcard) instead of listing all the help texts
explicitly.
* Makefile.am:
Use $(wildcard) for some wildcarded filenames so that VPATH
builds work.
* doc/fi/Makefile.am, doc/fr/Makefile.am:
Fix up some more documentation Makefiles that I missed
previously.
* doc/cs/Makefile.am, doc/de/Makefile.am, doc/en/Makefile.am, doc/fi/Makefile.am, doc/fr/Makefile.am:
Fix the documentation Makefiles to refer symbolically to the
souce directory using $(srcdir) instead of directly via '..' and
'.'.
* NEWS:
Add a comment about whitespace in patterns, change the quote.
* Makefile.am:
Put intl before the other subdirectories, so builds with an
included libintl work.
2005-09-30 Daniel Burrows <dburrows@debian.org>
* src/download_screen.h:
Fix the #include of config.h. (done previously but I forgot to
save! ah the irony)
* configure.ac:
Bump the version to 0.3.4.
* src/mine/Makefile.am:
Explicitly list all of the minesweeper help files -- apparently
automake's "make dist" target doesn't expand wildcards.
* src/mine/Makefile.am:
Add top_builddir to Minesweeper's include path as well.
* src/generic/util/Makefile.am:
Add slotarg.h to the list of sources for libgeneric-util.
* src/aptitude.h, src/main.cc, src/pkg_ver_item.h, src/ui.cc, src/vscreen/curses++.h, src/vscreen/vscreen_widget.cc:
Change a bunch of includes of config.h to use <>, and protect
the ones that weren't with #ifdef HAVE_CONFIG_H.
* src/generic/util/Makefile.am:
Add bool_accumulate.h to the list of generic sources.
* src/vscreen/Makefile.am:
Add ref_ptr.h to the list of vscreen sources.
* src/generic/problemresolver/Makefile.am:
Forgot to add resolver_undo.h to EXTRA_DIST so that it gets
distributed; do so.
* src/Makefile.am, src/cmdline/Makefile.am, src/generic/apt/Makefile.am, src/generic/problemresolver/Makefile.am, src/generic/util/Makefile.am, src/vscreen/Makefile.am, src/vscreen/config/Makefile.am, tests/Makefile.am:
Include $(top_builddir) so we can get config.h in VPATH builds
(e.g., in 'make distcheck').
* doc/en/aptitude.xml:
Correct a strange turn of phrase.
* src/vscreen/Makefile.am:
Remove references to some .h files that got moved down to
generic/.
* src/vscreen/vscreen_widget.cc:
Allow destroy() to be called multiple times but ignore it after
the first call. This allows download widgets to destroy
themselves immediately upon being cancelled, even though the
download process will also issue a destroy command on its own.
* src/ui.cc, src/ui_download_manager.cc, src/ui_download_manager.h:
Fix more compile problems.
* src/download_list.cc, src/download_list.h:
Fix compilation errors.
* src/download_list.cc:
Actually use abortslot when a download is cancelled.
* src/ui.cc, src/ui.h, src/ui_download_manager.cc, src/ui_download_manager.h:
Expose the widget that's handling the download status, so it can
be explicitly kept alive as long as the download lasts
(regardless of its destruction).
* src/download_list.cc:
Always destroy a download list when destroy() is called, even
though "cancel" is a side-effect.
* src/ui.cc:
Don't let mini-buffer downloads overload the Q key.
* NEWS:
Update the NEWS file for 0.3.4 (may get additional updates).
* po/POTFILES.in:
Update the list of files.
* src/ui.cc:
Editorial change to the no-cache-modification-during-a-download
message.
* src/solution_item.cc:
Reinstate the advance-after-action behavior of solution items.
* doc/en/images/Makefile.am:
Update the list of distributed images.
* doc/en/aptitude.xml:
More fully document the resolver (the prose is a little stilted
in some places but it'll do for a first draft).
* src/generic/problemresolver/model.tex:
Add a disclaimer regarding the stupidity-removal algorithm.
* src/apt_options.cc:
Add an option item for suppress-read-only-warning.
* src/ui.cc:
Make prompt_yesno_popup not always default to 'yes'.
(I confused the scrollbar parameter with the default parameter
-- arguably this is a sign that vs_dialog_yesno's interface is
way too hariy).
* src/vscreen/vs_multiplex.cc:
Bind weak references instead of strong references.
* src/cmdline/cmdline_update.cc:
Fix a silly compile problem.
* doc/en/aptitude.xml:
Fix the documentation as regards the default resolver scores.
* doc/en/aptitude.xml:
Document several undocumented configuration options.
* doc/en/aptitude.xml:
Typo fix.
* src/cmdline/cmdline_update.cc, src/generic/apt/download_update_manager.cc, src/ui.cc:
Add some missing connections to the download managers' hooks.
* src/cmdline/cmdline_changelog.cc:
Kill off some memory leaks.
* src/changelog_parse.cc:
Instead of using the description parser to generate formatted
changelogs, just parse them by hand; the bulletting conventions
are not, unfortunately, as well-defined as for descriptions.
* src/menu_text_layout.cc, src/menu_text_layout.h:
Make the search keystrokes active in the menu_text_layout
widget.
* src/view_changelog.cc:
Use a menu_text_layout instead of a vs_text_layout to display
the changelog, and hook it up to the menu signals.
* src/menu_text_layout.cc, src/menu_text_layout.h:
Write a vs_text_layout variant customized to hook the menu's
search command up to itself.
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Write basic code for searching in a vs_text_layout.
2005-09-29 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml, src/Makefile.am, src/changelog_parse.cc, src/changelog_parse.h, src/defaults.cc, src/generic/util/temp.h, src/view_changelog.cc:
Add support for parsing changelogs and doing something useful
with the information therein. In particular, changelogs are now
wrapped like descriptions (and get bullet parsing for free), and
newer versions of the package are highlighted. (Closes: #290692)
* src/generic/util/temp.h:
Allow clients to extract the parent directory of temporary
objects.
* src/cmdline/cmdline_do_action.cc:
Fix a nasty bug: when constructing the download manager in
do_action, I was actually (and accidentally) constructing a
manager on the heap, implicitly casting it to bool (hence always
getting 'true') and then passing that as download_only to the
true manager. Obviously this is not quite what was desired.
* src/ui.cc, src/ui_download_manager.cc, src/ui_download_manager.h, src/view_changelog.cc:
Require code that creates a ui_download_manager to set all the
usual parameters for its internal download status widget, and
change all the creation points to do so (resurrecting the
various title strings that got lost earlier).
* src/cmdline/cmdline_changelog.cc:
Fix the command-line changelog code: binding a reference doesn't
really work, you have to bind a pointer to the object you want
to set instead.
* src/cmdline/cmdline_changelog.cc, src/view_changelog.cc:
Update the changelog viewers for the new interface.
* src/generic/apt/pkg_changelog.cc, src/generic/apt/pkg_changelog.h:
Base the package changelog downloader on the download_manager
class.
* src/Makefile.am, src/download.cc, src/download.h:
Remove the old download code.
* src/cmdline/cmdline_upgrade.cc:
Use the download_manager code for upgrades too.
* src/pkg_item.cc, src/pkg_tree.cc:
Eliminate more unnecessary #includes.
* src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_update.cc:
Eliminate some unnecessary #includes.
* src/cmdline/cmdline_update.cc:
Use the download_manager code in 'update'.
* src/cmdline_do_action.cc:
Use the download_manager code to handle stuff that gets kicked
to do_action.
* src/cmdline_util.cc, src/cmdline_util.h:
Write generic code to execute a download object from the
command-line.
* src/ui_download_manager.cc:
Actually use both ui_start_download and ui_stop_download.
* src/ui.cc, src/generic/download_install_manager.cc, src/generic/download_update_manager.cc:
Implement the before/after hooks in the UI to shut down curses
and to display a message while automatic autocleaning is
happening.
* src/ui.cc:
Implement ui_stop_download.
* po/POTFILES.in, src/Makefile.am, src/ui.cc, src/ui.h, src/ui_download_manager.cc, src/ui_download_manager.h:
Split the wrapper class into another file. Added some public UI
routines to allow other code to manipulate the "is something
downloading now?" state.
* src/ui.cc:
Instead of subclassing the download managers, use a generic
wrapper class that takes a manager as a constructor parameter.
* src/generic/apt/download_manager.h, src/generic/apt/download_install_manager.h, src/generic/apt/download_install_manager.cc, src/ui.cc:
Make prepare() part of the generic download_manager interface
(additional arguments should be 'passed' in the constructor
now). This will pave the way for fully generic code in the UI
to handle a download.
* src/generic/apt/download_install_manager.cc, src/generic/apt/download_install_manager.h, src/ui.cc:
Make download_only a constructor parameter of the
download_install_manager, not an argument of finish().
* src/generic/apt/download_update_manager.cc:
Instead of creating an Acquire object with no status callback,
pass our status callback into its constructor; also save the
signal generator in signallog rather than just ignoring it.
* src/ui.cc:
First cut at using the download_manager code instead of the old
download code.
* src/download_thread.cc, src/download_thread.h:
Accept download managers instead of acquire objects as the
thread parameter.
* src/generic/apt/download_manager.h:
Make download managers SigC++ trackable objects.
* src/generic/apt/download_install_manager.cc, src/generic/apt/download_install_manager.h, src/generic/apt/log.cc, src/generic/apt/log.h:
Split the log code from the download code.
* po/POTFILES.in, src/generic/apt/download_install_manager.cc, src/generic/apt/download_install_manager.h, src/generic/apt/download_manager.cc, src/generic/apt/download_manager.h, src/generic/apt/download_update_manager.cc, src/generic/apt/download_update_manager.h, src/generic/apt/Makefile.am:
Write a generic interface to manage operations that involve
downloading something and then doing more stuff, and transform
the old download code into subclasses of this interface.
* src/cmdline/cmdline_changelog.cc, src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_download.cc, src/cmdline/cmdline_progress.cc, src/cmdline/cmdline_progress.h, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_update.cc, src/cmdline/cmdline_upgrade.cc, src/download.cc, src/download.h, src/download_list.cc, src/download_list.h, src/download_thread.cc, src/download_thread.h, src/generic/apt/acqprogress.cc, src/generic/apt/acqprogress.h, src/generic/apt/Makefile.am, src/Makefile.am, src/ui.cc, src/ui.h, src/view_changelog.cc:
Update include file locations and class names to refer to
download_signal_log instead of download_manager.
* src/download_manager.cc, src/download_manager.h, src/generic/apt/download_signal_log.cc, src/generic/apt/download_signal_log.h:
Move the download_manager code into the generic layer and rename
it.
2005-09-27 Daniel Burrows <dburrows@debian.org>
* src/view_changelog.cc:
Since the changelog pager reads in the whole changelog when it's
constructed, it no longer needs to ensure that the changelog
file (object) exists as long as the pager does; delete the file
object as soon as we finish reading it.
* src/generic/util/exception.h:
Update the exception documentation to match reality.
* configure.ac:
Fix the enabling of dynamic backtraces.
* configure.ac, src/generic/util/exception.cc:
Make the dynamic generation of backtraces a configure-time
option; in order for them to be useful, a full symbol table
needs to be shipped with the program, and in the case of
aptitude, this DOUBLES the executable size.
* configure.ac:
Put libraries detected by configure into LIBS, not LDFLAGS.
* configure.ac, src/generic/util/Makefile.am, src/generic/util/exception.cc, src/generic/util/exception.h, src/main.cc, tests/Makefile.am:
Add support for backtracing the program when creating an
exception on systems that support it. (currently rather broken)
* src/download.cc:
Remove the assumption that stdin is line-buffered; explicitly
search for a \n character (and handle EOF conditions).
* src/main.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_prompt.h:
Toss an exception from the command-line code when EOF is
encountered, and write a corresponding catch handler; also
replace the special-cased catch blocks in main.cc with generic
catches for the Exception type (so the exception gets printed to
stderr). In particular, this means that aptitude no longer goes
nuts when it encounters an EOF. (Closes: #318749)
* src/ui.cc:
Check for the existence of the old temporary directory on
startup and display a one-time prompt asking whether it should
be removed (currently defaults to "no").
* src/ui.cc:
When su-ing to root, use temp::* instead of making the needed
temporary names manually. (Closes: #146485)
* src/generic/apt/pkg_changelog.cc, src/generic/apt/pkg_changeloh.h:
Use the temp::* classes to manage the changelog instead of
manually constructing a temporary name.
* src/generic/util/Makefile.am, src/generic/util/temp.cc, src/generic/util/temp.h, tests/Makefile.am, tests/test_temp.cc:
Add C++-based support code for securely creating and cleaning up
temporary files and directories.
* src/vscreen/config/colors.cc:
Don't blow up if no colors are available (e.g., if the terminal
doesn't support colors at all).
2005-09-26 Daniel Burrows <dburrows@debian.org>
* src/pkg_item.cc:
Make the interactive 'keep' command cancel any hold set on a
package; the behavior at the command line is unchanged.
(Closes: #326949)
* src/generic/apt/aptcache.cc:
Preserve the last version of pkgstates when saving the selection
list. (Closes: #316460) Also, don't remove the .new version if
we fail to save the cache (so the user can manually recover).
* src/ui.cc:
Write a better description for the flat package list viewer.
* src/ui.cc:
Also gray out autocleaning and mark-upgradable when the apt
cache file isn't available, and don't crash even if someone does
call do_autoclean with apt_cache_file == NULL.
* src/ui.cc:
Gray out the install-run menu item whenever the apt cache file
isn't available.
* src/ui.cc:
Also clear the 'active download' flag after a download that
failed up-front.
* src/ui.cc:
If the download preparation routine fails, tell the download
manager that the download was complete so that the download
widget is destroyed.
* src/download.cc:
If the user tries to start a download while the package cache is
NULL, print a cryptic error message instead of crashing. If the
user tries to start an update while the package cache is NULL,
do the update instead of crashing. (Closes: #309445)
* src/cmdline/cmdline_moo.cc:
Delete the text at the end, which not only lacks a trailing
newline, but is also rather rude. (Closes: #295924)
* src/broken_indicator.cc:
Don't segfault if the apt cache is NULL (e.g., if apt_init
failed). (Closes: #290408) -- at least for the time being; the
general problem is that I need to remember to test the program
in situations where the apt cache fails to initialize due to,
say, invalid configuration files.
* src/generic/apt/aptcache.cc:
Fix the code that sets packages back to manual mode on a keep or
hold: it ran after the package was already kept back, so of
course the test for whether the package was to be deleted was
wrong! (Closes: #278490)
* src/cmdline/cmdline_action.cc:
Only print a message about not being able to forbid an upgrade
because the package is not upgradable for packages that are
*NOT* upgradable, not packages that are. (Closes: #246140)
* src/cmdline/cmdline_show.cc:
Abort with an error message if some of the packages the user
tried to show don't exist, and return non-zero if errors were
generated while showing packages. (Closes: #301291)
* doc/en/aptitude.xml, doc/en/manpage.xml, src/generic/apt/apt.cc, src/main.cc:
Change Aptitude::Cmdline::Simulate to Aptitude::Simulate; if it
is true, always open the cache in read-only mode regardless of
whether the user is root or not. This really Closes: #243192.
* src/download.cc:
Write the date stamps for aptitude logs in RFC2822 format;
in particular, add timezones to them. (Closes: #318501)
* src/generic/util/util.cc, src/generic/util/util.h:
Add a safe wrapper for strerror_r.
* src/generic/util/util.cc:
Correct get_homedir(): it was using the non-array form of delete
on arrays (remember, auto_ptr doesn't work on arrays...).
* src/generic/util/util.cc, src/generic/util/util.h:
Write a safe strftime wrapper.
* src/edit_pkg_hier.cc, src/generic/apt/apt.cc, src/generic/apt/pkg_changelog.cc, src/ui.cc:
Consistently use pkg_homedir() instead of getenv("HOME").
(Closes: #272429, #274216, #285334)
* src/generic/util/util.cc, src/generic/util/util.h:
Write a utility routine to look up the current user's home
directory from the password database.
* src/main.cc:
Automatically activate quiet mode if stdout is not a terminal.
(Closes: #276767)
* src/pkg_item.cc:
Hang onto the lock while running reportbug. This obviates the
need to reload the package cache, and in particular it means
that aptitude no longer discards information about package
states after reporting a bug; hence (Closes: #304748).
2005-09-25 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Add a configuration option to suppress the warning message, and
display a customized dialog box that allows the user to disable
the message in the future. With the other changes, this finally
(Closes: #175408).
* src/ui.cc:
Make show_message() generate reverse video by default again.
* src/download_list.cc, src/download_list.h, src/generic/util/slotarg.h, src/ui.h, src/vscreen/slotarg.h, src/vscreen/vs_menu.h, src/vscreen/vs_menu.cc:
Move slotarg to the generic code layer.
* src/generic/apt/aptcache.cc:
Add a missing permission check in internal_mark_install.
* src/ui.cc:
Make the package cache read-only while a download is going on.
* src/vscreen/config/colors.cc:
Actually set default_colors_avail based on the result of
use_default_colors(). The codepath where this value is false is
untested, because I can't seem to find a terminal that doesn't
provide default colors.
* src/ui.cc:
Connect up the new cache functions to display a helpful (?)
message when a read-only cache is modified. This enforces a
rule that modifying the cache during a download is Not Allowed,
and it resets the cache to not-read-only after displaying a
single warning message otherwise.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add support for making the cache 'read-only'; writing to a
read-only cache will generate what you could loosely describe as
a 'page fault', to be dealt with by slots connected to a public
signal.
* src/generic/util/bool_accumulate, src/ui/ui.h, src/vscreen/bool_accumulate, src/vscreen/vs_menu.h:
Move bool_accumulate to generic code.
* doc/en/aptitude.xml, src/generic/apt/aptcache.cc:
Add an option to purge packages that are unused, with big red
warning flags in its documentation appropriate to the level of
foot-shooting-ness that it enables. (Closes: #275150)
* src/cmdline/cmdline_download.cc, src/cmdline/cmdline_upgrade.cc, src/main.cc:
Fix the remaining points in the code that need to be updated for
quietness. The code should now work just fine in quiet mode.
(Closes: #217477)
* src/cmdline/cmdline_update.cc, src/cmdline/cmdline_forget_new.cc, src/cmdline/cmdline_progress.cc, src/cmdline/cmdline_do_action.cc:
Fix a bunch of typos and update do_action for quietness.
* src/cmdline/cmdline_clean.cc:
Update the clean and autoclean code for quietness.
* src/cmdline/cmdline_progress.cc:
Make downloads quiet.
* src/cmdline/cmdline_update.cc:
Update for quietness.
* src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_spinner.cc, src/cmdline/cmdline_spinner.h:
Disable output from the spinner when the quiet level is greater
than zero.
* doc/en/aptitude.xml, doc/en/manpage.xml, src/main.cc:
Add basic support for a 'quiet' option; it needs to be
integrated into all cmdline files.
* doc/en/aptitude.xml:
Explicitly note that ~a matches the *current state* of a
package; for instance, ~aupgrade doesn't do what ~U does.
(Closes: #311290)
* FAQ, doc/en/aptitude.xml:
Apply several typo fixes submitted by
Olivier Trichet <olivier.trichet@freesurf.fr>.
(Closes: #268916)
* doc/en/manpage.xml:
Fix the SEE ALSO reference to the full documentation
(Closes: #265723).
* src/vscreen/vscreen.cc:
Don't initialize the unused style WidgetFrame.
* doc/en/aptitude.xml, src/defaults.cc, src/ui.cc:
Add keybindings and menu items to directly select the first and
last generated solution.
* src/load_config.cc, src/vscreen/config/colors.cc, src/vscreen/config/colors.h, src/vscreen/config/style.cc, src/vscreen/config/style.h:
Support using the default background color by encoding it in the
slots that would be used for an identical foreground &
background color. Attempts to set identical foreground &
background now return an arbitrary color with the same
background, and the style code sets A_INVIS in such a case
(resulting in a blank space with the same background). This is
a bit of a hack, but it's the only way to do this when you
consider that xterm provides 9 colors (including the default
color) but only 64 color pairs. (Closes: #161872)
* src/cmdline/cmdline_clean.cc:
Unreverse the logic that determines the return value of 'clean':
it was returning 0 iff there WERE errors. (Closes: #274098)
* src/ui.cc:
Try to start a background solution calculation when connecting
up the signal (it's possible that we missed a signal that gets
emitted when the resolver is created).
* src/cmdline/cmdline_upgrade.cc:
When we have to abort an upgrade, display any broken packages
that forced us to abort. Maybe this should hook into the full
resolver in the future? (Closes: #316027)
2005-09-25 Miroslav Kure <kurem@upcase.inf.upol.cz>
* update Czech translation. Closes:#330014
2005-09-24 Daniel Burrows <dburrows@debian.org>
* src/generic/util/setset.h, tests/***:
Fix more include files that I missed (oops).
* src/vscreen/vs_menubar.cc:
Display left and right arrows at the edge of the terminal if the
menu bar is too large for it.
* src/***:
Fix all the include file problems and other stuff arising from
the reorganization.
* po/POTFILES.in:
Update POTFILES.in.
* Makefile.am, src/Makefile.am, src/vscreen/Makefile.am, src/generic/***:
Massively reorganize the generic/ subdirectory. The code is now
split into three parts: code which is fully generic (util/), the
problem resolver, and "generic" apt routines (apt/). Not only
is this more aesthetically pleasing, it also means that there
are no weird cross-directory dependencies (dependencies still
exist but they aren't weird any more: specifically, a straight
"make" will now always build code before its dependencies are
built.
* src/ui.cc:
Fix do_next_solution_enabled().
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Eliminate out_of_solutions; use the solutions_exhausted member
of the state snapshot to calculate
solution_generation_complete().
* src/generic/resolver_manager.cc:
Use the resolver counts instead of out_of_solutions to set the
solutions_exhausted member of the state snapshot. This fixes
the 'are there more solutions?' indicator.
* src/generic/problemresolver/problemresolver.h:
Add an element to the counts cache that mirrors 'finished', and
update the cache at the important exit points from the solver
and (if no solver is running) when retrieving queue counts.
* src/generic/problemresolver/problemresolver.h:
When screening out solutions that we've already generated a
subset of, take into account the set of unresolved dependencies
as well as the set of actions.
* src/generic/problemresolver/solution.h:
If an action coincidentally fixes an unresolved dependency,
remove that dependency from the unresolved set.
* src/generic/problemresolver/problemresolver.h:
Remove the forced_broken interface from the resolver itself.
Switch a call to unforce_break that I missed earlier to invoke
unapprove_break instead.
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Rip the forced_broken stuff out of the resolver manager.
* src/solution_item.cc:
Switch the solution_unresolved_item class to using the new
approved_broken stuff instead of forced_broken.
* src/generic/problemresolver/problemresolver.h:
Doh, of course the MUTATORS for the new structure shouldn't be
constant!
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Expose the approved_broken stuff from the manager.
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Collect all the resolver manipulations into a common routine.
* src/generic/problemresolver/problemresolver.h:
Add a set of "approved breaks" that should provide a more
sensible way of handling soft dependencies: instead of forbidden
the dependency to be solved outright, it just says that we
should place it in the 'unresolved' set whenever it comes up as
an option. In other words, it defers any solution in which an
action is labelled with that dependency.
* src/generic/problemresolver/problemresolver.h:
Fix the resolver indentation (finally).
2005-09-24 Rubén Porras <nahoo@inicia.es>
* Update spanish translation
* regenerate po/aptitude.pot, po/POTFILES.in and po files
2005-09-23 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
When force-breaking a soft dependency, make sure to reject its
source as well. NOTE: the semantics of force-breaking may be a
bit off; maybe they should be reviewed to better match approval?
(i.e., only reject solutions due to force-breaking if something
force-broken is listed as a justification)
* src/ui.cc:
Connect state_changed to vscreen_update, so an update is always
enqueued when the resolver state changes. In particular, this
ensures that a keyboard-invoked undo will always trigger a
screen update.
* src/generic/resolver_manager.cc:
For safety, always unsuspend a background thread before calling
state_changed().
* src/generic/resolver_manager.cc:
Fix background_suspender::unsuspend -- it wasn't clearing its
suspended flag, so the suspender would try to unsuspend AGAIN
when it was destroyed.
* src/solution_screen.cc:
Write a solution_undo_tree (analogue of apt_undo_tree) and use
it to activate the undo command in solution displays.
* src/ui.cc:
Remove the no-longer-necessary do_undo() and undo_enabled()
routines.
* src/apt_info_tree.h, src/pkg_tree.h:
Derive apt_info_tree and pkg_tree from the new undo-supporting
tree.
* src/apt_undo_tree.cc, src/apt_undo_tree.h:
Add a tree class that implements an apt undo interface (i.e., so
package manipulation screens work as expected).
* src/menu_redirect.cc:
Fix a rather silly typo.
* src/menu_redirect.cc, src/menu_redirect.h:
Add menu_redirect hooks for the "undo" command.
* src/ui.cc, src/ui.h:
Connect undo() through a signal instead of directly. For now
do_undo() is still used, though.
* src/generic/resolver_manager.cc:
Always signal state_changed() after an undo.
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Add support for tracking an undo stack for a resolver manager's
state.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/resolver_undo.h:
Correct a typo (generic_problem_resolver, not generic_resolver)
so the new code compiles.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/resolver_undo.h:
Add support in the resolver for recording the inverse of
operations performed on it. (could be done at a higher level,
but for obvious reasons, the resolver is uniquely positioned to
know exactly how to reverse its actions)
* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Allow the user to scroll the menu up and down on small
terminals.
* src/view_changelog.cc:
Write a long menu description for the changelog pager.
* src/ui.cc:
Edit the long menu description of the manual pager.
* src/ui.cc:
Display the user's manual as a top-level widget instead of a
dialog box.
* src/solution_screen.cc:
Switch back to using the widget itself as the menu target, and
bind menu handlers for the info area; the resolver menu works
now!
* src/menu_redirect.cc:
Merge do_menu_test and do_menu_action into do_menu_callback, and
make the new routine use get_widget_active() to filter calls:
menu actions on a widget are valid only when every ancestor of
the widget is either the root or the 'active' widget of its
owner.
* src/vscreen/vs_multiplex.cc:
Make it compile.
* src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
Make get_owner() return a ref_ptr, not a bare pointer.
* src/vscreen/vs_container.h, src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h, src/vscreen/vs_passthrough.cc, src/vscreen/vs_passthrough.h:
Add a routine to fetch the 'active' widget of a container (where
the definition of 'active' varies by widget, but is usually the
widget with the interaction focus).
* src/ui.cc:
Add shortcut characters to the Resolver menu.
2005-09-22 Daniel Burrows <dburrows@debian.org>
* src/menu_tree.cc:
Say "Search Backwards", not "Search Back" (more readable).
* src/ui.cc:
Don't talk about packages in the long menu description of
Search->Find and Search->Find Backwards now that other things
support those commands.
* src/view_changelog.cc, src/view_changelog.h:
Add support for either forward or backwards searching.
* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
Add support for searching backwards in a file.
* src/menu_redirect.cc, src/menu_redirect.h, src/pkg_node.cc, src/solution_item.cc:
Write default implementations for the menu_redirect methods that
cause all commands to be disabled; avoids lots of repetitive and
pointless code in subclasses.
* src/view_changelog.cc:
Make sure that the changelog pager's scroll bar occupies the
full vertical extent of the screen.
* src/menu_tree.cc, src/menu_tree.h, src/pkg_item.cc, src/pkg_item.h, src/pkg_node.cc, src/pkg_node.h, src/pkg_ver_item.cc, src/pkg_ver_item.h, src/solution_item.cc, src/solution_item.h:
Split up the menu_tree monstrosity and eliminate most of the
dynamic_casts. Now it just does a single dynamic_cast of the
currently selected item to the menu_redirect interface; if the
cast succeeds, it just proxies for the result.
* src/solution_screen.cc:
D'oh, connect up the bindings to the examiner, not the info
tree.
* src/menu_tree.cc, src/menu_tree.h:
Implement the resolver commands. This exposed some real
kludginess in the menu_tree that should be fixed in the future
(I imagine it acting as simply a proxy for the selection when
the selection is a menu_redirect).
* src/solution_item.cc, src/solution_item.h:
Split the key response actions into public methods.
* src/Makefile.am, src/apt_info_tree.h, src/load_grouppolicy.cc, src/menu_tree.cc, src/menu_tree.h, src/pkg_tree.cc, src/pkg_tree.h, src/solution_screen.cc, src/ui.cc:
Rename pkg_menu_tree to menu_tree and split it into a separate
file from pkg_tree.
* src/solution_screen.cc:
Use a pkg_menu_tree instead of a vs_tree to build the solution
screen. Note that pkg_menu_tree is a bit of a misnomer now...
* src/pkg_tree.h:
Make pkg_menu_tree::create a static method (whoops).
* src/menu_redirect.cc:
Bind up the resolver menu signals.
* src/Makefile.am, src/menu_redirect.cc, src/menu_redirect.h, src/pkg_view.cc:
Split the code to bind up a menu_redirect object and the active
package view out into a separate .cc file.
* src/ui.cc:
Actually put the new items in the menu and define the signals.
* src/ui.h:
Add signals that will be used to hook up the new menu items.
* src/solution_item.cc, src/solution_item.h, src/solution_screen.cc:
Split the tree items from solution_screen.cc into their own
file.
* src/ui.cc:
Typo fix.
* src/menu_redirect.h, src/pkg_tree.cc, src/pkg_tree.h:
Add stubs for future resolver menu items.
* src/ui.cc:
Add a Resolver menu with various resolver commands, for those
who like such things.
* src/vscreen/vs_staticitem.cc:
Make vs_staticitem really use the whole width (it was using one
character less).
* src/solution_screen.cc:
Add more verbiage to unresolved soft deps when they show up as
possible alternatives to the selected action.
* doc/en/aptitude.xml, src/defaults.cc, src/solution_screen.cc:
Modify the SolutionActionAccepted style and the
SolutionActionAccept keybinding to conform to the new "approved"
terminology; don't overspecify the SolutionAction styles.
* doc/en/aptitude.xml, doc/en/images/broken-snapshot.png, doc/en/images/solution-screen-snapshot.png, doc/en/images/solution-screen-snapshot2.png, doc/en/images/solution-screen-snapshot3.png, doc/en/images/solution-screen-snapshot4.png, doc/en/images/solution-screen-snapshot5.png:
Update the broken packages tutorial.
* src/generic/problemresolver/problemresolver.h, src/generic/resolver_manager.cc:
Make approving and rejecting an action mutually exclusive:
actions that are approved are automatically un-rejected, and
vice versa.
* src/generic/problemresolver/problemresolver.h:
Allow mandated versions to be ignored in favor of other mandated
versions, and don't special-case other versions of the package.
* doc/en/aptitude.xml, src/defaults.cc:
Don't explicitly set the background color in package colors, so
the user can globally override the background color if he/she so
desires.
* doc/en/aptitude.xml, src/defaults.cc, src/pkg_item.cc, src/pkg_item.h, src/reason_fragment.cc:
Make a separate named style for each and every possible package
item state, including both highlighted and non-highlighted
styles. Among other things, this makes xterm display reasonable
cursor colors for highlighted packages (by removing the
A_REVERSE flag, which seems to confuse it in some cases). Of
course, it also means that people have much more flexibility in
customizing the colors of the package list.
* src/generic/resolver_manager.cc:
Optimize for the case of block_steps == 0 (so users can
stop it from using any threading primitives at all).
* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h:
If the screen is too narrow to display a whole menubar, allow it
to "scroll" while the user is interacting with it.
* src/vscreen/vscreen.cc:
(hopefully) fix the cursor placement problems that I was having.
* src/vscreen/curses++.h:
Fix mvaddnstr for std::wstrings.
2005-09-22 Rubén Porras <nahoo@inicia.es>
* Update spanish translation
* regenerate po/aptitude.pot and po files
2005-09-21 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Document Aptitude::ProblemResolver::WaitSteps and
Aptitude::Spin-Interval.
* src/generic/resolver_manager.cc:
Don't hold the lock while calling state_changed(). This avoids
deadlocks if state-changing callbacks trigger code that tries to
grab the instance lock from another thread. (and just avoids
holding the lock over arbitrary code in general, probably a good
idea)
* src/ui.cc:
Use the new maybe-blocking solution fetching routine.
* src/generic/resolver_manager.cc:
Add support for cancelling a suspension before destroying the
corresponding background_suspender object.
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Add a routine that waits for the resolver to perform some number
of steps before returning; can be used to avoid displaying a
progress indicator unless the search seems to be taking a while.
* src/ui.cc:
Ignore attempts to apply solutions that don't exist yet.
* src/broken_indicator.cc, src/cmdline/cmdline_resolver.cc, src/generic/resolver_manager.cc, src/generic/resolver_manager.h, src/solution_dialog.cc, src/solution_screen.cc, src/ui.cc:
Make the number of steps an explicit parameter to get_solution
and get_solution_background.
* src/ui.cc:
Signal that the resolver state changed when it runs out of
solutions.
* src/broken_indicator.cc:
Fix the placement of a bunch of code in broken_indicator::update
that accidentally ended up inside a loop.
* src/broken_indicator.cc:
Dim out the unavailable actions in the broken hint line.
* src/vscreen/fragment.cc:
Make column fragments always have a final newline.
* src/vscreen/vscreen.cc:
When determining how long the timeout thread should sleep,
return the absolute time that the next timeout will trigger at,
not the amount of time until that time (this results in the
timeout thread spinning forever).
* src/ui.cc, src/ui.h:
Trigger package_states_changed from apply_current_solution.
Among other things, this means that the information area is
properly updated when a solution is applied.
* src/solution_screen.cc:
Destroy the whole examiner when there aren't any broken
packages, and do it from external code (not update() or a
connection to destroyed) to avoid any possibility of weirdness.
* src/cmdline/cmdline_do_action.cc, src/generic/aptcache.cc, src/generic/aptcache.h, src/ui.cc:
Upgrade packages that were to-be-removed when doing a
dist-upgrade from the command line. This is achieved by adding
a new flag to mark_all_upgradable that selects one or the other
behavior; also fixed the handling of Unknown packages in
mark_all_upgradable (it was just wrong before, and probably
wasn't noticed because that case should never come up anyway).
* src/broken_indicator.cc, src/dep_item.h, src/download_bar.h, src/download_list.h, src/edit_pkg_hier.h, src/mine/cmine.h, src/pkg_info_screen.h, src/pkg_tree.h, src/pkg_ver_item.h, src/pkg_view.cc, src/solution_dialog.cc, src/solution_screen.cc, src/ui.cc, src/view_changelog.cc, src/vscreen/vs_button.h, src/vscreen/vs_center.h, src/vscreen/vscreen_widget.h, src/vscreen/vs_editline.h, src/vscreen/vs_frame.h, src/vscreen/vs_label.cc, src/vscreen/vs_label.h, src/vscreen/vs_menubar.h, src/vscreen/vs_menu.h, src/vscreen/vs_minibuf_win.h, src/vscreen/vs_multiplex.h, src/vscreen/vs_pager.h, src/vscreen/vs_scrollbar.h, src/vscreen/vs_size_box.h, src/vscreen/vs_stacked.h, src/vscreen/vs_statuschoice.h, src/vscreen/vs_table.h, src/vscreen/vs_text_layout.h, src/vscreen/vs_togglebutton.h, src/vscreen/vs_transient.h, src/vscreen/vs_tree.h:
Make the reference count of vscreen_widgets default to 1, not 0.
As a result, it is necessary for every creation routine to
explicitly decref() its return value before returning it. Also
wrote a ::create() routine for cmine (it was missing one) and
changed ui.cc to call it.
The reason for doing this is that it allows routines run from
the constructor to acquire and release references without
causing the world to explode violently.
* src/apt_info_tree.cc, src/broken_indicator.cc, src/download_bar.cc, src/download_list.cc, src/download_screen.cc, src/edit_pkg_hier.cc, src/mine/cmine.cc, src/pkg_info_screen.cc, src/pkg_view.cc, src/solution_dialog.cc, src/solution_screen.cc, src/vscreen/vs_bin.cc, src/vscreen/vs_button.cc, src/vscreen/vs_center.cc, src/vscreen/vs_container.cc, src/vscreen/vscreen_widget.cc, src/vscreen/vs_editline.cc, src/vscreen/vs_frame.cc, src/vscreen/vs_label.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_menu.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_multiplex.cc, src/vscreen/vs_pager.cc, src/vscreen/vs_passthrough.cc, src/vscreen/vs_scrollbar.cc, src/vscreen/vs_size_box.cc, src/vscreen/vs_stacked.cc, src/vscreen/vs_statuschoice.cc, src/vscreen/vs_table.cc:
Take a self-reference in any routine that's not totally trivial
(in particular, any routine that invokes a virtual method or a
signal) in order to avoid future surprises like the one that
wasted so much time yesterday.
2005-09-20 Daniel Burrows <dburrows@debian.org>
* src/apt_info_tree.cc:
Preemptively fix a likely problem that turned up in an audit for
other instances of the access-this-after-self-destructing bug.
* src/solution_screen.cc:
Have the examiner take a reference to itself in the destroy()
call; fixes a crash due to accessing members of the examiner
after it's deleted by destroy().
* src/solution_screen.cc:
Clear out the other information areas when the multiplex goes.
* src/vscreen/vs_multiplex.cc, src/vscreen/vs_table.cc:
Tighten some asserts.
* src/vscreen/vs_table.cc:
Fix the logic that chooses a new focus after the current focus
goes away: most places were only looking at *UN*focussable
widgets; instead, only consider widgets that are visible and can
be focussed.
* src/vscreen/vscreen_widget.cc:
Don't mark the widget as having been destroyed until after it's
been hidden and removed from its owner; this avoids some nasty
weirdness due to the way that the vscreen_widget accessors
change their behavior when the widget is destroyed.
* src/broken_indicator.cc, src/solution_screen.cc:
Display the resolver progress in the solution screen instead of
in the broken indicator; use the new slot timeout object
to set up the broken indicator's timeout.
* src/vscreen/vscreen.cc, src/vscreen/vscreen.h:
Add a slot_event that wraps a sigc++ slot in a safe
vscreen_event wrapper.
* src/vscreen/vs_tree.cc:
Be robust in the face of a totally empty tree (one with a NULL
root pointer).
* src/solution_screen.cc:
Display a list of the possible resolutions of the dependency
corresponding to each action.
* src/solution_fragment.cc, src/solution_fragment.h:
Add a routine to display a description of a dependency that
might be a conflict through a Provides.
* src/solution_screen.cc:
Remember that both trees have their visible flag set even though
only one is actually shown; the proper way to determine the
active child of a multiplexer is to call visible_widget().
* src/solution_screen.cc:
Use the changes to vs_tree and vs_multiplex to correctly manage
the auxillary status areas.
* src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h:
Add a signal that is emitted when the visible widget changes.
* src/vscreen/vs_tree.cc:
Fix a silly compilation error.
* src/vscreen/vs_tree.cc, src/vscreen/vs_tree.h:
Add hooks for highlighting or unhighlighting the currently
selected item.
* src/solution_screen.cc:
Set up a split-screen display of prospective solutions; this
will be used (in the future) to display alternatives to a given
action.
* src/apt_options.cc:
Fix button placement in the options dialog: the Ok/Cancel
buttons were being crammed into the first column instead of
spreading across both columns.
* src/vscreen/vs_editline.cc:
Don't crash when creating a very small line-editor, such as when
displaying the options dialog in a thin terminal (it has other
problems in a thin terminal, but at least this one is fixed
now).
2005-09-19 Daniel Burrows <dburrows@debian.org>
* src/broken_indicator.cc, src/mine/cmine.cc, src/vscreen/vscreen.cc:
It turns out that sigc++ isn't really threadsafe -- thanks to
weak references and deletion callbacks, read access to a slot
created in one thread can be interefered with (disastrously) by
the deletion of an apparently unrelated object in another
thread. As it's virtually impossible to guarantee that this
doesn't occur, I have decided to just avoid touching slots
anywhere but the main thread. The easiest way to make this
explicit is to require a vscreen_event to be passed to the
timeout thread (although a heap structure containing a slot
could also be safe).
* src/solutions_screen.cc:
Make pressing Enter (or whatever is bound to InfoScreen) on an
action solution item pop up the information screen about the
corresponding version.
* doc/en/aptitude.xml, src/cmdline/cmdline_resolver.cc:
Make the version score tweaking default to 0.
* src/generic/resolver_manager.cc:
When the resolver is interrupted, put the job we were working on
back onto the queue, so that we start working on it again at the
next opportunity.
* src/broken_indicator.cc:
Format the statistics in the interactive UI better.
* src/cmdline/cmdline_resolver.cc:
Display resolver statistics from the command line.
* src/cmdline/cmdline_spinner.cc:
Really handle the case where the message we want to display is
longer than the screen width.
* src/broken_indicator.cc:
Display the resolver statistics while it's running.
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Expose the resolver's queue counts in the state snapshot.
* src/generic/problemresolver/problemresolver.h:
Allow users of the resolver to check the size of its various
queues.
* src/generic/resolver_manager.cc:
Indicate that the background thread left the resolver before
calling the continuation (so if we ran out of threads, the
foreground thread will know to hide the spinner).
* src/broken_indicator.cc:
Use columns to display the spinner flush-right and to display it
even when the user selects a finished solution again.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add a simple column-generating class. It has a caveat regarding
indentation, but aside from that it should be safe.
* src/broken_indicator.cc, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_spinner.cc, src/cmdline/cmdline_spinner.h, src/cmdline/Makefile.am, src/generic/resolver_manager.cc, src/generic/resolver_manager.h, src/solution_dialog.cc, src/solution_screen.cc, src/ui.cc:
Use the background thread to keep the UI responsive while the
resolver is running.
* src/vscreen/vscreen.cc:
Fix the timeout thread; it was utterly broken (whoops).
2005-09-17 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
When building a prospective solution from an old one, use
find_submap_containing instead of find_submap; this virtually
eliminates the huge amount of time that was being spent in
find_submap.
* tests/test_dense_setset.cc:
Fix the predicate search test: the id halver was declared to
return bool, so it was actually only returning 0 or 1!
* tests/test_dense_setset.c:
Add more tests of find_subset_containing.
* tests/test_wtree.cc:
Correct a mistake in the test.
* src/generic/immset.h:
Switch the second comparison of the roots of the two trees in
node_contains() -- I forgot to transform that one to its dual.
* tests/test_wtree.cc:
Add a test for the subset (containment) routine.
* src/generic/dense_setset.h, tests/Makefile.am, tests/test_dense_setset.cc:
Add a routine in dense_setset that searches for a subset of a
set that contains a particular element; will be useful for
optimizing the core resolver.
* src/generic/immset.h:
Write an intrinsic subset routine for the binary trees that
should be quicker than iterating over them.
* src/generic/problemresolver/conflictset.h, src/generic/problemresolver/problemresolver.h, tests/test_resolver.cc:
Back out the conflictset class, since it didn't speed anything
up and may have slowed stuff down. Also, I have a better
high-level idea about cutting back on the cost of conflict
testing.
2005-09-16 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/conflictset.h:
Properly handle the case of an empty right branch by just
setting right_offset to one past the left branch. This is
exactly correct, although it has the effect of causing the tree
to overlap itself (if you work it out, though, this is exactly
what's desired anyway).
* tests/test_resolver.cc, src/generic/problemresolver/conflictset.h, src/generic/problemresolver/problemresolver.h:
Add an experimental conflict set optimized under some
assumptions that may or may not turn out to actually hold for
real programs once I get it working.
* src/generic/resolver_manager.cc:
Make a thread-kill override all other control messages, so that
the program doesn't deadlock trying to shut the background
thread down. What would happen was that if, e.g., the resolver
was null and the foreground thread tried to kill the background
thread, the background thread would sit there waiting for the
resolver to be non-null.
* src/generic/resolver_manager.cc:
Fix a segfault that occurred when shutting down the resolver
thread.
2005-09-15 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/Makefile.am:
Don't put threads.o and util.o in LDADD any more; the changes in
the last commit made this unnecessary.
* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
Rewrite the threading support to allow multiple simultaneous
jobs in the background thread; the foreground thread now just
posts jobs to the background thread and waits for a reply.
Furthermore, the complicated dance of constantly
stopping/starting the background thread has been removed in
favor of a scheme where the thread is started once and then
suspended using condition variables.
* src/generic/problemresolver/problemresolver.h:
Allow the cancellation of a find_next_solution call to be
revoked or posted before the call starts. Needed to avoid
races.
* src/generic/threads.h:
Let the filled state of void boxes be directly set in the
constructor.
* src/download_list.cc:
Fix a divide-by-zero.
* src/ui.cc, src/ui.h, src/view_changelog.cc:
Add support for the new display mode of download_list.
* src/generic/resolver_manager.cc:
Initialize the continuation to NULL to prevent nasty nasty
segfaults.
* src/download_list.cc, src/download_list.h:
Add support for a display mode in which no estimated time is
provided and the progress bar assumes that all files have the
same size; this will be useful for list updates (where apt
kindly provides absolutely useless total-size information to the
status object). Note that since TotalItems is not meaningful,
this doesn't (can't) fix all the problems.
2005-09-14 Daniel Burrows <dburrows@debian.org>
* src/generic/resolver_manager.cc:
Reset the currently selected solution to 0 when discarding the
resolver.
* src/generic/resolver_manager.cc:
Don't let the solution pointer go past
one-off-the-end-of-the-list; fixes some uncaught exceptions.
* src/resolver_manager.cc, src/resolver_manager.h:
Add coarse-grained threading support: the manager can start a
background thread for computations; thread-safety is ensured by
completely stopping the thread before performing dangerous
mutations.
* src/generic/immset.h:
Fix a silly error in the implementation of clone(): pass the
value to the wtree_node constructor in addition to the children.
Also fix constructor ordering in the set-from-a-node constructor
(needed for the set's clone()).
* src/generic/problemresolver/solution.h:
Add support for cloning an entire solution.
* src/resolver_manager.cc, src/resolver_manager.h:
Instead of providing a limited interface to just step around and
get the current solution, allow steps to be taken without
implicitly calculating a new solution, and allow any solution to
be queried (possibly generating a bunch in the process).
* src/ui.cc:
When accessing resman in contexts where the apt cache might not
be loaded (hence the globals don't exist), check whether it's
NULL before accessing it.
* src/generic/resolver_manager.cc:
In maybe_create_resolver, don't try to create a resolver unless
none exists (sometimes maybe_create_resolver is called
unnecessarily, because nothing actually changed and the resolver
wasn't discarded).
* src/broken_indicator.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/apt.cc, src/generic/apt.h, src/generic/Makefile.am, src/generic/resolver_manager.cc, src/generic/resolver_manager.h, src/solution_dialog.cc, src/solution_screen.cc, src/ui.cc:
Factor the resolver management functions of the cache file out
into a separate class.
* src/generic/problemresolver/problemresolver.h:
includes is in namespace std, add a qualifier (why did this ever
compile?).
* src/generic/problemresolver/Makefile.am:
Ugh: link threads.o and util.o into test. In the future I need
to rearrange the files here and maybe use a less stupid build
system so that this isn't so fragile.
* src/generic/problemresolver/problemresolver.h:
Add a missing #include <algorithm> to the resolver header.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add a method to the backend cache which applies a given
solution, rather than just applying the currently selected
solution.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add a new signal that gets called *before* the package states
change; this is needed to run the resolver in the background
(since it's a reader of the depcache, it has to be killed before
anything writes back to the depcache).
2005-09-13 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Don't even try to auto-keep packages that are unused due to an
upgrade. It is possible that auto-keeping a package will lead
to broken dependencies even in a situation where nothing was
previously broken; I think it's worse to break the output of the
problem resolver than to do the "wrong" thing sometimes in a
broken situation, and I don't see a simple solution that retains
the auto-keep behavior, so I'm just backing it out.
* src/download_list.cc:
Fix download cancellation: don't actually destroy the widget
managing the download until Complete is received (indicating
that the background task is finished); just store the
cancellation and report it on the next Pulse.
2005-09-12 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Only run mark-and-sweep after setting a candidate version if the
grouping level is 0.
* src/generic/problemresolver/problemresolver.h:
I embarassingly forgot to initialize solver_cancelled and
solver_running; do so.
2005-09-10 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/exceptions.h, src/generic/problemresolver/problemresolver.h:
Add code to manage the resolver in the presence of threads; it
ensures that at most one find_next_solution call is running at
once, and allows a find_next_solution call to be cleanly
cancelled (throwing a special exception); it's guaranteed that
you can start the resolver back up after cancelling it.
2005-09-10 Jean-Luc Coulon <jean-luc.coulon@wanadoo.fr>
* update French translation
2005-09-09 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_prompt.cc:
Add a missing #include.
* src/generic/immset.h:
Add routines to create non-overlapping copies of trees (since
the overhead from locking the reference count of trees is too
high, this is the only way to safely pass set structures between
threads).
* doc/en/aptitude.xml, src/cmdline/cmdline_prompt.cc:
By popular demand, add a configuration option to bypass the
trust check in command-line mode (apparently this is useful for
scripted installations and so on).
* src/download_list.cc:
Eliminate all uses of vscreen_mainloop by using the continuation
callbacks instead. (Closes: #136973)
* src/download_thread.cc, src/download_thread.h:
Directly invoke the continuation-passing methods of
download_manager from the background thread.
* src/download_manager.cc, src/download_manager.h, src/download_list.h, src/generic/acqprogress.cc, src/generic/acqprogress.h:
Write basic support for continuation-passing in the download
status callbacks; this will allow complete elimination of
vscreen_mainloop calls.
2005-09-07 Daniel Burrows <dburrows@debian.org>
* src/generic/aptitude_resolver_universe.h, src/generic/dense_setset.h, src/generic/problemresolver/problemresolver.h:
Add a 'dense' set-set class optimized for the case where the set
elements can be mapped to a dense domain of integers (i.e., use
an array instead of a hash table); yields a small but noticable
improvement in the code's performance.
2005-09-06 Daniel Burrows <dburrows@debian.org>
* src/download_list.cc:
Remove a bunch of no-longer-necessary tryupdate calls and don't
invoke vscreen_poll; only queue display updates if the download
list is visible..
* src/ui.cc:
Move package downloads to a background thread.
* src/generic/setset.h:
Significantly speed up the operation of find_subset by
preallocating space to store its hit counts. This means that it
has to pass over the whole conflict set, but it appears that
it's better to do that than to allocate; I get a speedup of 2-3
times out of this change, which is fairly important when you
consider that find_subset is invoked almost a million times and
is where most of the time of the test case I'm considering is
spent.
Note that this makes find_subset NOT threadsafe.
* doc/cs/aptitude.xml:
Correct several XML errors in the Czech documentation.
* doc/en/aptitude.xml:
Apply Miroslav's corrections to fix some typos.
* src/generic/problemresolver/problemresolver.h:
When a solution is encountered immediately after forcing a
dependency, actually produce it instead of silently discarding
it.
* src/generic/solution.h:
Yes, I need to check that it compiles before I commit it.
* src/generic/solution.h:
Actually factor in the full_solution_score when a new solution
will be broken-dep-less.
* tests/test_resolver.cc:
Fix a stupidity in the test (infinity is expected to be
positive, not negative, when setting up the resolver).
* tests/test_resolver.cc:
Add a basic test that the rejection system won't go nuts and
reject other versions of the same package.
* tests/test_wtree.cc:
Strip out some useless debugging dumps and correct some thinkos
in the tests.
* tests/test_wtree.cc:
Explicitly test commutativity of intersection.
* src/generic/immset.h, tests/test_wtree.cc:
Fix a very dumb error when intersecting against an empty set.
* src/generic/immset.h, tests/test_wtree.cc:
Generalize the intersection routine to only find intersections
matching a predicate; add hooks in the map class to test for
domain intersection, containing an identical element, and
general intersection.
Also, actually fail if the intersection test doesn't work
(oops); this turns up a mistake in the current implementation
(double oops).
* src/generic/immset.h, tests/test_wtree.cc:
Write a set routine to test whether two sets intersect.
2005-09-05 Miroslav Kure <kurem@upcase.inf.upol.cz>
* update Czech translation and Czech manual translation
2005-09-05 Miguel Figueiredo <elmig@debianpt.org>
* update Portuguese translation
2005-09-04 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Fix a bug in contains_rejected: instead of returning true on
solutions that installed a rejected version, it was returning
true on solutions that installed a package with a rejected
version.
* src/generic/problemresolver/problemresolver.h:
Add more debugging output for figuring out why deferrals occur.
* src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_upgrade.cc, src/download.cc, src/download.h, src/ui.cc:
Split the download-and-install routines the same way that update
was split. NB: both splits should be refined in the future by
creating classes that encapsulate the algorithms.
In the process of doing this, made the message about
installation failures a little less silly. (Closes: #230188)
2005-09-04 Clytie Siddall <clytie@riverland.net.au>
* Update vietnamese translation
2005-09-04 Rubén Porras <nahoo@inicia.es>
* Update spanish translation
* regenerate po/aptitude.pot and po files
2005-09-03 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_update.cc, src/download.cc, src/download.h, src/download_thread.cc, src/download_thread.h, src/ui.cc:
Use the download_thread class to run list updates in the
background.
2005-09-02 Daniel Burrows <dburrows@debian.org>
* src/Makefile.am, src/download_thread.cc, src/download_thread.h:
Write harness code for running downloads in the background.
* src/generic/threads.h:
Fix some silly compilation errors; make all broken-out box
functions inline so they don't cause link failures.
* src/generic/threads.h:
Add a helper class to bootstrap noncopyable functors in threads,
and write an explicit specialization of threads::box for void
that acts as a "baton repository".
* src/cmdline/cmdline_update.cc, src/download.cc, src/download.h:
Split the package-list updating code around the download
operation, so that the download itself can be pushed into a
separate thread eventually.
* configure.ac, src/download_bar.cc, src/download.cc, src/download_list.cc, src/download_screen.cc, src/vscreen/Makefile.am, src/vscreen/curses++.cc, src/vscreen/vscreen.cc, src/vscreen/vscreen.h:
Explicitly support and use threading in the vscreen core. The
design is relatively conservative: only the "main" thread is
permitted to access most vscreen stuff; other threads carry out
vscreen tasks by "posting" events to the main loop; the events
are run serially in the main loop.
The core vscreen loop has been split into a small main loop and
three auxillary threads that dispatch input, timeout, and
asynchronous signal events to the main loop. The resulting code
should be a lot cleaner than what I had before, although there
are still some warts that could be taken care of.
Unfortunately, resizing seems to be slightly broken by this, or
at least broken in a different way than it was before; the
terminal sometimes displays incorrectly until you press a key.
* src/generic/threads.h:
Support mutex attributes and add a recursive mutex type (for
static initialization).
2005-09-01 Daniel Burrows <dburrows@debian.org>
* src/generic/threads.h:
Bind pthread_cancel.
* src/generic/threads.h:
Add a convenience box proxy that stores a pointer and deletes it
when destroyed (if it's full).
* src/generic/event_queue.h, src/generic/threads.h, tests/test_threads.cc:
Add support for timed waits.
* src/generic/event_queue.h, tests/test_threads.cc:
Write a simple event queue abstraction.
2005-08-31 Daniel Burrows <dburrows@debian.org>
* src/generic/threads.cc, src/generic/threads.h, test/test_threads.cc:
Add some generic code that wraps pthreads in a less error-prone
interface, based on boost::threads (didn't just use
boost::threads because of the unstable interface and the extra
dependency it would introduce).
* src/generic/immset.h:
When extracting and removing the minimum element of a tree,
remember that while the minimum has (by definition) no *left*
children, it might have a *right* child. Thus, instead of just
replacing the removed element with an empty tree, replace it
with its right child.
* src/generic/immset.h, tests/interactive_set_test.cc:
Make the set dump a dump() routine instead of operator<<, since
it's not really suitable as a generic way of displaying a tree.
* tests/test_wtree.cc:
Write a test targetted at the bug that showed up today in
imm::set.
* tests/Makefile.am, tests/interactive_set_test.cc:
Add a simple interactive test for the set code.
* src/generic/immset.h:
Yet another silly error from moving the code: use getRight, not
getLeft.
* src/generic/immset.h:
Add missing #include of iostream.
* src/generic/immset.h:
Right, don't crash on empty nodes (somehow that got lost when
pasting from the code in the staging area).
* src/generic/immset.h:
Add operator<< implementations that show the structure of each
set/map.
2005-08-31 Sorin Batariuc <sorin@bonbon.net>
* Update Romanian translation
2005-08-31 Daniel Burrows <dburrows@debian.org>
* src/generic/aptitude_resolver_universe.cc:
Don't skip packages that aren't InstBroken when searching for
broken packages; fixes the broken-list anomaly that recently
turned up.
* tests/test_apt_universe.cc, tests/data/*:
Add an apt_universe test for the consistency of the broken list,
and update the data to my current system, where the consistency
check fails. (TODO: support several data directories and test
all of 'em)
* src/generic/aptitude_resolver_universe.cc:
Fix the self-dependency check in broken_iterator::operator++;
now the global list of broken packages in aptitude_universe
properly excludes self-conflicts. Fixes an assert failure.
* src/generic/problemresolver/dummy_universe.cc, src/generic/problemresolver/dummy_universe.h, src/generic/problemresolver/solution.h, src/generic/aptitude_resolver_universe.cc:
Canonicalize some of the debugging output of the resolver to
make it a bit easier to verify that it works properly.
* src/generic/problemresolver/dummy_universe.cc:
Don't put commas in the dumped form of dummy dependencies.
* src/generic/aptcache.cc:
Update the dump format to match the expected input format of the
resolver test.
* src/generic/util.cc, src/generic/util.h, src/solution_fragment.cc:
Lift pkg_name_lt and ver_name_lt to generic code.
* src/solution_fragment.cc:
Sort elements of a solution by name.
* src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_util.cc, src/cmdline/cmdline_util.h, src/ui.cc, src/ui.h:
Let the user enter the visual interface from the resolver
prompt.
* src/generic/aptcache.cc:
In mark_all_upgradable, only mark packages that are already
installed; don't flag uninstalled but stickily-to-be-installed
packages for installation. (Closes: #317885)
* src/generic/aptitude_resolver_universe.h, src/generic/apt.cc, src/generic/apt.h:
Pass the package cache into surrounding_or when calling it
before apt_cache_file is initialized, to avoid crashes.
* src/generic/apt.h:
Add a const qualifier that might not matter but that certainly
can go in.
2005-08-30 Daniel Burrows <dburrows@debian.org>
* src/generic/tags.cc:
Optimize tag::operator++: testing for whitespace isn't strictly
necessary so don't waste time calling isspace.
* src/main.cc:
Add a "nop" command, which might or might not be useful for
profiling the startup activities.
* src/generic/setset.h:
Also use a hash table to represent the intermediate map object
used in find_subset.
* src/generic/problemresolver/problemresolver.h, src/generic/setset.h, tests/test_setset.cc:
Use a hash table to represent the by-value indexing in a setset.
This appears to significantly speed up the setset structure --
by which I mean that finds go from being a major time sink (over
20% of the time in my test case) to taking negligible amounts of
time.
* src/generic/setset.h:
Use a vector instead of a set to store the sets containing an
element.
* src/generic/problemresolver/problemresolver.h:
Print a newline after the resolver statistics.
* src/generic/immset.h:
Don't automatically split pairs in imm::map::for_each.
* src/generic/util.h:
Also add project1st.
* src/generic/util.h:
Add some missing functor classes that are in libstdc++ but
aren't standard.
* src/generic/immset.h:
Add a missing const qualifier.
* src/generic/immset.h:
Slightly optimize for_each and the other immset routines by
avoiding some wtree_node copies (hence avoiding reference-count
updates).
2005-08-30 Christian Perrier <bubulle@debian.org>
* po/fr.po: Completed by Jean-Luc Coulon and the French team
2005-08-30 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Make the conflict set a mapset instead of a std::set; use
setmap's special abilities to accelerate searches.
* src/generic/setset.h:
Add a size() routine in setset and mapset.
* src/generic/setset.h, tests/test_setset.cc:
Add a setset wrapper for sets of maps.
* src/generic/immset.h, tests/test_wtree.cc:
Make imm::map::put update existing entries.
* src/generic/immset.h:
Expose key_compare at the toplevel.
2005-08-29 Daniel Burrows <dburrows@debian.org>
* src/generic/setset.h, tests/test_setset.cc:
Make the necessary modifications to the 'setset' object to allow
extra relations on sets to be calculated (mainly to support
the subsumption relation as used to find conflicts).
* src/generic/setset.h, tests/test_setset.cc:
Add a data structure that stores a set of sets, optimized for
searching for a superset or a subset of a given set without
using imm::set's slow operator++.
* src/generic/immset.h:
Add missing const qualifier on wtree_node::for_each.
* src/generic/problemresolver/problemresolver.h:
Fix compilation error in contains_rejected.
* src/generic/immset.h:
Doh, fix for_each.
* src/generic/immset.h:
Add a for_each operation that should be quicker for simple
iteration over trees.
* src/generic/problemresolver/problemresolver.h:
Fix contains_rejected, which was not just slow (due to
imm::*::const_iterator), but was actually flat-out wrong.
* src/broken_indicator.cc, src/cmdline/cmdline_resolver.cc, src/generic/aptcache.cc, src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/solution.h, src/generic/problemresolver/test.cc, src/solution_fragment.cc, src/solution_screen.cc, tests/test_resolver.cc:
Use the new imm::* containers instead of std::*. This makes
everything much slower...but on the upside, aptitude no longer
eats all my memory before giving up on a search.
* src/generic/immset.h, tests/test_wtree.cc:
Add a 'node' member type to imm::map, and write comparison and
equality tests for wtrees.
* tests/test_apt_universe.cc:
Actually load the local test data in the apt tests.
* src/generic/problemresolver/problemresolver.h:
Eliminate the major bottleneck in the resolver code: rather than
constructing full solutions while searching for forcings and
unresolved dependencies, just construct as much of the solution
as is necessary. In particular, the resolver now just
constructs a new actions map to search for conflicts.
With this change, the resolver goes from taking several minutes
to return a first result from 'dist-upgrade' to returning it
almost instantaneously. The clue to finding this bottleneck was
the observation that the profiler reported a huge amount of time
being spent in broken_under, but that in fact hardly any time at
all was being spent in each individual call to that routine; the
problem was that it was being called millions of times to
construct the sets of broken dependencies for successor
solutions that were being discarded.
* src/generic/problemresolver/solution.h:
Dereferencing a revdep_iterator is a bit expensive; cache the
result of doing so.
* src/generic/immset.h:
Add a convenience routine to check if a value is in the domain
of a mapping.
2005-08-28 Daniel Burrows <dburrows@debian.org>
* src/generic/apt.cc:
Memoize surrounding_or: somewhat surprisingly, gprof reports
that aptitude's resolver is now (since the recent changes -- and
I suspect that the ones which caused this were *required* for
correctness' sake) spending 25% of its time in this routine!
The current change just memoizes the start of the OR group,
calculating the group's end directly from the start.
* src/generic/immset.h:
Correct the corresponding thinko in the double left rotate.
* tests/test_wtree.cc:
Write simple test cases for *all* the rotation operations.
* tests/test_wtree.cc:
Correct a wrong test assertion.
* src/generic/immset.h:
Correct a rather dumb thinko in the double right rotation that
caused segfaults.
* src/generic/immset.h, tests/test_wtree.cc:
Rename wtree to set, and add a wrapper class to make it work as
a mapping.
2005-08-27 Daniel Burrows <dburrows@debian.org>
* src/generic/immset.h, tests/test_wtree.cc:
Add support for removing elements from a wtree and for finding a
particular element in the tree.
2005-08-26 Daniel Burrows <dburrows@debian.org>
* src/generic/immset.h, tests/Makefile.am, tests/test_wtree.h:
Write a basic framework for weight-based immutable trees. These
trees explicitly share memory between different versions of a
tree (for instance, if a tree is updated by adding one element)
and I hope they'll help with some of the time and space issues
in the problem resolver.
* src/generic/problemresolver/problemresolver.h:
Fix the generation of conflicts from forbiddings: if a -> b c
and a was removed, an attempt to install b would generate a
conflict against b rather than against a.
* src/generic/problemresolver/problemresolver.h:
Fix an assertion failure: when re-processing a solution that's
been forced, remember that the iteration over dependencies
should be over the new solution's dependency set, not the old
one's.
2005-08-25 Daniel Burrows <dburrows@debian.org>
* tests/test_apt_universe.cc:
Add more diagnostic information to the connectivity tester.
* src/generic/apt.cc:
Fix the behavior of is_interesting_dep on reverse dependencies:
they weren't being expanded to the surrounding OR, so the
subsumption relation was wrong.
* tests/test_apt_universe.cc:
Provide more specific information in failure messages for the
connectivity test.
* src/generic/aptitude_resolver_universe.cc:
Finally (I hope) fix the case of conflicts-through-provides in
solved_by(). It passes the test now.
* tests/test_apt_universe.cc:
Discard apt errors rather than spewing them out (is this a good
idea?).
* tests/test_apt_universe.cc:
Add a tester to verify that only interesting dependencies are
produced by the various dependency iterators.
* src/generic/aptitude_resolver_universe.cc:
Give in and strictly conform to the providedness rule (i.e.,
dependencies that represent conflicts-through-provides are
exactly tuned to a single Provides relationship). It's not
clear how to validate the reverse connectivity of the dependency
graph without this change.
* src/generic/aptitude_resolver_universe.cc:
Set 'provides_open' to true before calling applicable(), so that
versioned reverse dependencies on a provided package are
correctly handled. Also, remove a bunch of redundant
is_interesting_dep() calls.
* src/generic/aptitude_resolver_universe.h:
When comparing dependencies, ignore the attached provides
iterator unless the dependency is a conflict. This solves
problems caused by junk Provides iterators showing up when
revdep_iterators that passed through a Provides were
dereferenced.
* tests/test_apt_universe.cc:
Fix the connectivity test to actually ignore stuff that fixes
the dependency under consideration (doh).
* tests/test_apt_universe.cc:
Right, take sources into account in the other branch (this code
should probably be reorganized to be less brittle!).
* tests/test_apt_universe.cc:
Instead of completely ceasing tests after a certain amount of
time, just test the rest of the archive less aggressively.
* tests/test_apt_universe.cc:
Arbitrarily limit testSolves() so that it terminates in a
reasonable amount of time.
* src/generic/aptitude_resolver_universe.cc:
Further fix handling of conflicts-through-provides in
solved_by(): claim that any version not providing the conflicted
package "solves" the conflict, for consistency with the
solver_iterator class.
* src/generic/aptitude_resolver_universe.cc:
Fix handling of conflicts-through-provides.
* src/generic/aptitude_resolver_universe.cc:
Follow Provides in solved_by().
2005-08-24 Daniel Burrows <dburrows@debian.org>
* src/generic/aptitude_resolver_universe.cc:
Don't crash when an UNINST version is passed to solved_by().
* tests/test_apt_universe.cc:
Handle dependency sources correctly when testing the solver
graph.
* tests/test_apt_universe.cc:
Generate more useful test failure messages.
* tests/Makefile.am, tests/data:
Add some test data so I can have well-defined tests in the
future.
* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h, tests/test_apt_universe.cc:
Move the operator<< for aptitude_universe_dep objects to
aptitude_resolver_universe, so stuff that just uses the universe
(e.g., the test code) can avoid including the whole resolver.
* tests/Makefile.am, tests/test_apt_universe.cc:
Add tests for the graph-structure of the apt universe
translation layer.
* src/generic/problemresolver/solution.h, tests/test_resolver.h:
Avoid crashing in test code by making the tester a friend of the
solution and directly constructing solutions for the solution
test (bypassing the sanity-checking public constructors).
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/solution.h, tests/test_resolver.h:
Massive refactoring of the problem resolver. The solution
abstraction is now much stronger: solutions can *only* be
constructed as either a root node or a successor to an existing
solution, and score calculation is handled in the constructor
(actually a static factory function).
Instead of trying hard to not actually build solution objects,
the main resolver now generates all solutions up-front; this
introduces some new inefficiencies while removing others, but it
does seem to have slightly slowed the program down.
Needless to say, separating solution generation from solution
processing makes everything so much cleaner that it's not even
funny. Some errors may also been introduced that will need to
be dealt with; actual testing is probably a good idea here.
2005-08-23 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Fix several obvious errors and inconsistencies in calculating
solution scores.
* src/generic/problemresolver/problemresolver.h:
Efficiency tweak: when comparing solutions by their contents,
don't do a full lexicographical compare unless the two solutions
have different sizes and different scores. This moves
lexicographical_compare from second place with 18% of the
running time to ninth place with 2.47% of the running time.
2005-08-20 Daniel Burrows <dburrows@debian.org>
* src/generic/aptitude_resolver_universe.cc:
Fix the projection of conflicts-through-provides into the
abstract universe: the gateway test should check that the
current version provides the *target* of the Conflict, not the
*source*.
* src/generic/problemresolver/problemresolver.h:
Fix a silly error: of course when populating a partial conflict
map, we shouldn't randomly stick the forbidden versions into it.
* src/generic/matchers.cc:
Fix an uninitialized variable usage turned up by compiling with
-O2.
* src/generic/problemresolver/problemresolver.h:
Don't spew quite so much in debug mode when checking for
conflicts, and add a note about how long the search took when it
fails.
* src/generic/problemresolver/problemresolver.h:
When checking whether a solution is irrelevant, also check
whether it contains a known conflict.
* src/generic/problemresolver/problemresolver.h:
Split the monstrosity of will_conflict into four routines.
* src/generic/problemresolver/problemresolver.h:
Get everything compiling and sort of working. Probably all
sorts of stuff needs to be fixed up, though :-/.
2005-08-19 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Fix will_conflict (the previous definition was obviously wrong).
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/solution.h:
Add preliminary support for tracking logical conflicts within
solutions. This will eventually allow the elimination of some
cases where the resolver currently goes exponential.
* src/generic/problemresolver/problemresolver.h:
Improve debugging output (used to catch the below bug) and add
early branching for user requests (should mean that if the user
requests something impossible, we tell them ASAP).
* src/generic/aptitude_resolver_universe.cc:
Fix solved_by(): it was returning "true" for most non-virtual
Conflicts (whoops).
* src/broken_indicator.cc:
Base the decision on whether to really update the broken
indicator both on the actual generated solution and on whether
the completed-state of the backend resolver changed.
* src/generic/aptcache.cc:
Call selected_solution_changed() when we run out of solutions.
* src/broken_indicator.cc:
When displaying the summary of the current number of broken
packages, always show how many solutions have been generated so
far; for instance, 1(2)/... .
* src/generic/aptcache.cc, src/generic/aptcache.h:
Tell parties who are interested in the resolver that they should
update themselves even if we only might have changed the
open-endedness of the queue.
* src/generic/problemresolver/problemresolver.h:
Always check the deferred queue before checking whether we've
run out of solutions.
* src/cmdline/cmdline_resolver.cc:
Fix the messages displayed when accepting a version, and
actually accept it!
* src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h, src/generic/problemresolver/dummy_universe.cc, src/generic/problemresolver/dummy_universe.h, src/generic/problemresolver/problemresolver.h:
Redefine acceptedness of versions: instead of rejecting all
other versions of the package (which is wrong anyway), accepting
a version now discards any solution that *COULD* have picked
that version but didn't.
2005-08-18 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Extend the tutorial on managing packages with notes about broken
dependencies, and document the new styles corresponding to
solutions. Needs more work (but I've realized that the code is
actually wrong now).
* src/solution_fragment.cc:
Add a newline after each note about an unresolved
recommendation.
* src/solution_screen.cc:
Fix the text displayed for a 'story' in the curses interface
when a package's removal is going to be cancelled.
* doc/en/aptitude.xml:
Start updating the documentation for the next version: fix some
comments in the tutorial, and fix some keystroke documentation.
2005-08-17 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Add support for adding an extra penalty to solutions that break
a user hold or install a forbidden package version.
* src/vscreen/vs_tree.cc:
Fix the bug that caused the screen to scroll pointlessly at the
end of the list.
* src/generic/problemresolver/problemresolver.h:
Check for unresolved hardened deps both when enqueuing solutions
and when dequeuing them.
* src/generic/problemresolver/problemresolver.h:
Fix breaks_hardened() to actually work.
* src/solutions_screen.cc:
Use the new hardening/force-breaking stuff to allow users to
manipulate solutions containing a broken recommendation.
* src/generic/problemresolver/problemresolver.h:
Fix force_break() and unforce_break() to call reject_version()
and unreject_version() rather than reject() and unreject().
Fixes compilation.
* src/generic/problemresolver/problemresolver.h, src/generic/aptcache.cc, src/generic/aptcache.h:
Add support for "hardening" soft dependencies; basically this
functions like a rejection of the decision to leave the
dependency unresolved.
* src/solution_screen.cc:
Use an aptitude_universe::dep, not a pkgCache::DepIterator, to
track unresolved soft deps.
* src/vscreen/transcode.h:
Remove format_arg specifiers, they don't work and break
compilation.
* src/vscreen/transcode.h:
Add format_arg specifiers that are presently useless since gcc
doesn't know about wide strings.
* src/aptitude.h:
Add a format_arg attribute to P_.
* src/solution_screen.cc:
Fix a bad parameter type turned up by the ssprintf attribute.
* src/generic/util.h:
Add a formatting __attribute__ specifier to ssprintf (can't add
one to swsprintf because gcc doesn't know about checking wide
strings).
* src/generic/aptcache.cc:
Penalize broken soft deps less than removals, and add some
cautionary text about the danger of fiddling with the resolver
settings.
* src/cmdline/cmdline_resolver.cc:
In the 'story', make sure to insert the dep_text with %ls, not
%s.
* src/cmdline/cmdline_resolver.cc:
Add support for rejecting/accepting versions from the
command-line.
* src/solution_fragment.cc:
Silly compilation fix.
* src/solution_fragment.cc, src/solution_fragment.h, src/solution_screen.cc:
Move archives() to solution_fragment and call it
archives_text(); eliminate archives_fragment(). (probably this
whole collection of routines should be pushed down to generic/)
* src/generic/problemresolver/problemresolver.h, src/generic/aptcache.cc, src/generic/aptcache.h, src/solution_screen.cc:
Push the mandatory-version handling down into the generic
problem resolver class.
* doc/en/aptitude.xml:
Document SearchBack and that '\' is no longer ReSearch.
* src/vscreen/vscreen.cc:
Fix the definition of ReSearch.
* src/pkg_tree.cc:
Fix the initialization of last_search_backwards when incremental
search is enabled.
* src/vscreen/vs_tree.cc:
When directly setting the selection to a new tree location, make
sure to expand the parents of the new selection first.
* src/menu_redirect.h, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_view.cc, src/ui.cc, src/ui.h, src/vscreen/vscreen.cc:
Add UI hooks to support reverse searching. (Closes: #323239)
* src/vscreen/vs_tree.cc, src/vscreen/vs_tree.h:
Add widget support (untested) for reverse searching.
* src/solution_screen.cc:
Use the fragment subsystem to add text attributes to the story.
* src/defaults.cc, src/solution_screen.cc:
Add support for switching between a 'solution' viewing mode and
a 'story' viewing mode.
* src/vscreen/vs_tree.cc:
Clean up line_up and line_down (NB: it's not quite clear that
their behavior is identical) and rewrite set_selection so that
it adjusts the top of the screen correctly, at the cost of a
line_of call.
2005-08-16 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_tree.cc:
Handle the case of the first element in a tree being
unselectable in line_up().
* src/solution_screen.cc:
Add and activate support for displaying a "story" in the visual
interface (currently you can't switch between story and
non-story mode, though).
* src/cmdline/cmdline_resolver.cc, src/solution_fragment.cc, src/solution_fragment.h:
Change dep_fragment to dep_text, returning a wstring, not a
fragment.
* src/dep_item.cc, src/dep_item.h:
Expose the dep_item class to the world.
* src/cmdline/cmdline_resolver.cc, src/generic/solution.h:
Move the by-id comparison functor to the solution class.
* src/solution_screen.cc:
Add a class that describes an action instead of just presenting
its associated version.
* src/generic/problemresolver/dump_universe.h:
Indent soft dependencies the same way as hard dependencies.
* src/generic/apt.cc:
Uh, yeah, recommends-important defaults to true.
* src/generic/apt.cc:
Make recommends interesting iff Recommends-Important is true.
* src/generic/aptcache.cc:
Discard any extant resolver when Recommends-Important changes.
* src/generic/aptcache.cc:
Connect the mark-and-sweep signal to keep-suggests, not
keep-important.
* src/generic/apt.cc:
Fix the deletion of cached_deps_interesting on a cache reload,
and set it up to also be deleted+reset when the
Recommends-Important variable is modified.
* src/generic/apt.cc:
Only treat currently satisfied recommendations as interesting if
they belong to the current package version OR they subsume/are
subsumed by a recommendation of the current version.
* src/generic/apt.cc:
Fix subsumes(): when the first dependency used a >= comparison,
it was checking for (> | <= | =) instead of (> | >= | =). This
resulted, unsurprisingly, in >= recommendations that hadn't even
changed appearing as soft dependencies to the resolver.
* src/generic/apt.cc:
Fix or_group_subsumes to not enter an infinite loop.
* src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h:
Memoize calls to is_interesting_dep(). The major change caused
by this is that objects in the aptitude_universe store
backpointers to the universe, not the cache (because calls to
is_interesting_dep need to go through the universe).
NB: is_interesting_dep could also be a global function in
apt.cc; would it be useful there?
* src/generic/aptitude_resolver_universe.cc:
Redefine is_interesting_dep in terms of "subsumption": a
recommendation is now considered "interesting" iff it covers
neither a subset nor a superset of the version space covered by
a recommendation of the current version.
* src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h:
Make the is_interesting_dep function really be a static member
of aptitude_universe, and move it into the .cc file.
* src/generic/Makefile.am, src/generic/aptitude_resolver_universe.cc, src/generic/aptitude_resolver_universe.h:
Move most of the implementation of the resolver universe into a
.cc file.
* src/solution_screen.cc:
View unresolved recomendations in the solution tree too.
Untested; I need to come up with a test case where recommends
can't be satisfied.
* src/solution_fragment.cc, src/solution_fragment.h:
Rename dep_targets_fragment to dep_targets; now it just
generates a plain string (and is a candidate for being pushed
down into the generic layer).
* src/generic/aptcache.cc:
Slightly *reward* longer solutions, rather than slightly
penalizing them. Although this might produce lower-quality
solutions, it has the effect of encouraging the resolver to
focus on more "mature" lines of reasoning, rather than backing
up and looking at alternatives first.
* src/cmdline/cmdline_resolver.cc, src/solution_fragment.cc, src/solution_fragment.h:
Move some code for formatting information relevant to solutions
into solution_fragment.cc, and use it to output a list of
unresolved soft dependencies.
* src/generic/problemresolver/problemresolver.h:
When looking for forced deps, leave soft deps with exactly one
resolver alone instead of discarding them.
2005-08-15 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Add an assert to check that things remain sane.
* src/generic/problemresolver/problemresolver.h:
Correct the calculation of the new score when choosing to leave
a soft dependency unfixed.
* tests/test_resolver.cc:
Correct the comparison of s1 and s2 (they should be equivalent).
* src/generic/problemresolver/solution.h:
Uh, yeah, let's construct the set of unresolved soft deps by
*inserting* elements instead of removing them, eh?
* tests/test_resolver.cc:
Fix the solution test to not require an operator<.
* src/generic/problemresolver/problemresolver.h:
Make the ResolverTest class a friend so it can test internals of
the resolver.
* src/generic/problemresolver/solution.h:
Keep the compiler from automatically generating an operator< for
solutions (which fooled me on at least one occasion into using
solutions as if they had a meaningful operator<).
* tests/test_resolver.cc:
Fix several outright crashes in the solution test.
* src/generic/problemresolver/test1.txt, src/generic/problemresolver/test3.txt:
Fix the test cases for the new solution formats.
* tests/test_resolver.cc:
Add a test case for solution comparison; add more test cases to
action comparison.
* tests/Makefile.am, tests/test_resolver.cc:
Add a first iteration of a real test case for the resolver.
* src/generic/problemresolver/dummy_universe.cc, src/generic/problemresolver/dummy_universe.h, src/generic/problemresolver/test.cc:
Move some of the universe parsing code to the dummy_universe
interface file. More to be done here.
* src/generic/problemresolver/dummy_universe.h:
Add an interface for changing the current version of a package
after the fact.
* src/generic/problemresolver/Makefile.am, src/generic/problemresolver/dummy_universe.cc, src/generic/problemresolver/dummy_universe.h, src/generic/problemresolver/test.cc:
Split the dummy universe out of the resolver test program so
that it can be used by other code.
* src/generic/Makefile.am:
Add exceptions.h to Makefile.am.
* src/generic/problemresolver/exceptions.h:
Make the problem resolver exceptions variants of Exception.
* src/generic/Makefile.am, src/generic/exception.h:
Move the Exception class to the generic layer.
* src/generic/problemresolver/problemresolver.h:
Fix comparison-by-contents of solutions so that the set of
unresolved soft dependencies is taken into account; should fix
the bug where the option of leaving a soft dependency unresolved
was dismissed immediately.
* src/generic/problemresolver/solution.h:
Write operator== and operator!= that obey the rule about action
identities being based on the version installed.
* src/generic/problemresolver/problemresolver.h:
Add missing conditionalization (only dump information about soft
dependencies when debugging is enabled).
* src/generic/problemresolver/solution.h:
Fix how unresolved soft dependencies are displayed when dumping
a solution.
* src/generic/aptitude_resolver_universe.h:
Make all critical deps and all recommends interesting.
2005-08-15 Miroslav Kure <kurem@upcase.inf.upol.cz>
* General Czech translation update
2005-08-12 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc, src/generic/aptitude_resolver_universe.h, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/problemresolver/dump_universe.h, src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/solution.h, src/generic/problemresolver/test.cc:
Add basic support for "soft dependencies" (i.e., recommends) to
the resolver.
* src/generic/aptcache.cc:
Don't try so hard to avoid keeping or upgrading packages, try a
little harder to preserve manual selections.
* src/generic/aptitude_resolver.cc:
Make changes to automatically installed, automatically
to-be-removed, or removed packages costless. This fixes an
exponential blowup caused by one-step-forward-two-steps-back
tendencies in the resolver.
* src/generic/problemresolver/problemresolver.h:
Add a counter to show (when debugging) how many steps the
resolver took to converge on a solution.
2005-08-11 Daniel Burrows <dburrows@debian.org>
* src/solution_screen.cc:
Advance to the next element after selecting/rejecting an element
in a solution.
* src/generic/problemresolver/problemresolver.h, src/generic/aptcache.h, src/generic/aptcache.cc, src/solution_screen.cc:
The "I have too many forbids floating around" commit: change the
API that lets the user entirely forbid the resolver from
generating solutions containing a particular version so that it
instead talks about "rejecting" such solutions.
* src/cmdline/cmdline_action.cc:
Honor the Auto-Install option in the command-line layer.
* src/generic/aptitude_resolver.cc, src/generic/problemresolver/problemresolver.h:
Add an option to enable or disable the elimination of "stupid
pairs".
* src/generic/problemresolver/problemresolver.h:
Only put destupidified solutions back on the open queue if they
dropped versions (otherwise we just discard them because they're
already on the closed queue).
* src/generic/problemresolver/problemresolver.h:
Add a debug output line and an assert.
* src/generic/problemresolver/problemresolver.h:
Drop stupid pairs that are eliminated from the table of stupid
pairs.
* src/cmdline/cmdline_resolver.cc:
Add support for viewing a solution in "action order".
* src/solution_fragment.h:
Export archives_fragment.
* src/ui.cc:
Trim unnecessary #includes here too.
* src/solution_screen.cc:
Trim unnecessary includes here too.
* src/solution_fragment.cc:
Don't #include problemresolver.h from here either.
* src/solution_dialog.cc:
Trim back #includes further.
* src/cmdline/cmdline_resolver.cc:
Trim back #includes of problemresolver stuff.
* src/cmdline/cmdline_dump_resolver.cc:
Trim back the #includes of problemresolver stuff.
* src/cmdline/cmdline_do_action.cc:
Remove an unnecessary #include.
* src/broken_indicator.cc:
Trim back the #includes of problemresolver stuff to just the
solution class.
* src/generic/problemresolver/solution.h:
Add #includes that are missing now that this file has been
lifted out of problemresolver.h.
* src/main.cc:
Only #include exceptions.h, not problemresolver.h.
* src/generic/problemresolver/Makefile.am, src/generic/problemresolver/exceptions.h, src/generic/problemresolver/problemresolver.h:
Move the exceptions generated by the resolver to a separate
file.
* src/generic/problemresolver/Makefile.am, src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/solution.h:
Move the solution class to a separate file.
* src/generic/Makefile.am, src/generic/aptitude_resolver.h, src/generic/aptitude_resolver_universe.h:
Push the aptitude resolver "universe" into a separate file.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Add an initial implementation of the stupid pair elimination
algorithm. This is a bit messy; some of the auxillary templated
classes I introduced look to me like candidates for elimination
or candidates to be moved to a more generic location.
2005-08-10 Daniel Burrows <dburrows@debian.org>
* src/generic/util.h, tests/test_misc.cc:
Add a generic routine to compare pairs without respect to order.
* src/generic/problemresolver/model.tex:
Put both algorithms on one page.
* src/generic/problemresolver/model.tex:
Fix LaTeX errors.
* src/generic/problemresolver/model.tex:
Finish the correctness proof of the algorithm, start blathering
about efficiency.
* src/generic/problemresolver/model.tex:
Start describing how to eliminate "stupid pairs" from solutions,
including a preliminary writeup of the algorithm to use.
2005-08-10 Clytie Siddall <clytie@riverland.net.au>
* Update to Vietnamese translation. (Closes: #322276)
2005-08-09 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Add support for reading off dependencies and placing them in
"story order".
* src/defaults.cc, src/solution_fragment.cc:
Use the new methods to allow the user to interactively narrow
the search for a solution.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add hooks in the apt cache interface layer for manipulating
forbidden versions.
* src/generic/problemresolver/problemresolver.h:
Add initial support for user-forbidden versions.
* src/solution_screen.cc:
Fix item highlighting.
* src/vscreen/vs_tree.cc:
Include the highlight status in the style passed to
vs_treeitem::paint().
* src/solution_screen.cc:
Write a specialized treeitem class to represent the elements of
a solution.
* src/Makefile.am, src/solution_screen.cc, src/solution_screen.h, src/ui.cc:
Initial work towards a top-level solution examination screen.
* src/pkg_info_screen.cc:
Remove a #include of vs_staticitem.
* src/vscreen/vs_staticitem.h:
Further adjustment to vs_staticitem: tag() and label()
should be non-const now.
* src/vscreen/vs_staticitem.cc, src/vscreen/vs_staticitem.h:
Make vs_staticitem a concrete class.
* src/vscreen/vscreen.cc:
When trapping KEY_RESIZE, check first that we have a
KEY_CODE_YES event.
* src/ui.cc:
If su-to-root fails, load selections from the file that we saved
in order to become root (rather than immediately zapping it and
forgetting all stored selections). (Closes: #281232)
* src/vs_progress.cc:
Hide the progress bar in Done *after* triggering a screen
update, and un-hide it in Update(). With this change, progress
bars will be displayed across multiple Done() calls, but will
hide themselves after the last Done() call.
2005-08-08 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Redesign how the active preview and tree are handled: use the
active preview for everything but actually building the tree; it
particular, show and destroy it instead of the tree. Fixes the
problem where the preview tree disappeared from the preview
screen, without crashing due to double-destroying the preview.
* src/download_list.cc:
*Do* destroy the download list when the download is complete, so
it disappears (it's safe: the only other way to destroy it is
from the 'q' handler, which can't trigger once the list is
destroyed).
* src/ui.cc:
Don't redundantly delete the preview tree; fixes a segfault.
* src/generic/matchers.cc, doc/en/aptitude.xml:
Add a "downgrade" action for use with ~a.
* Makefile.am:
Distribute README.SMART-POINTERS.
* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
Restore the old behavior of setting the background of the whole
widget from the constructor of vs_label, not just the color of
the actual text.
* src/ui.cc:
Use sw?sprintf rather than a local w?snprintf in several spots.
* src/vscreen/vs_util.cc:
Change an implementation signature of vs_dialog_fileview to
match the corresponding interface signature (fixes an undefined
reference at link time).
* src/vscreen/vs_table.cc, src/vscreen/vs_table.h:
Fill in the missing focus_widget_bare routine.
* src/ui.cc:
Pre-emptively weaken a bound reference.
* src/view_changelog.cc:
Update the changelog viewer for refcounting.
* src/vscreen/vs_pager.h:
Restore the default value for the "encoding" argument of the
vs_file_pager constructors.
* src/vscreen/vs_pager.h:
Make the vs_file_pager constructors protected, not private.
* src/download_list.cc:
Fix the default second parameter to download_list::create.
* src/ui.cc:
Many updates to ui.cc to bring it in line with the new
interfaces and conventions.
* src/dep_item.h:
Update pkg_dep_screen for the reference-counting protocol.
* src/download_manager.cc:
Doh, set_widget isn't a constructor, don't write it like one.
* src/download_manager.cc, src/download_manager.h:
Implement the constructors and set_widget in the .cc to avoid
needing more includes.
* src/vscreen/vscreen_widget.cc:
Go past silently doing nothing if a widget is destroyed twice;
actually abort the program if this occurs.
* src/vscreen/vs_menubar.cc, src/vscreen/vs_minibuf.cc, src/vscree/vs_stacked.cc, src/vscreen/vs_table.cc:
Make sure that we explicitly zero out the "owner" field of
widgets that are removed from these containers. This has the
useful side effect of causing the Curses windows to be
invalidated and hence making the assertion(!win) succeed.
* src/vscreen/vs_radiogroup.cc:
Fix a thinko: when we're removing the last button in a radio
group, of course there should be exactly ONE button in the
group, not exactly ZERO.
* src/vscreen/vs_table.cc:
Be more careful in handling iterators so that the table routines
don't crash when the last widget is removed.
* src/vscreen/vs_bin.cc, src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h, src/vscreen/vs_menubar.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_multiplex.cc, src/vscreen/vs_stacked.cc, src/vscreen/vs_table.cc:
Make sure that all containers destroy their contents in their
own destroy() routines. NB: since destroy() has a side effect
of "remove me from my parent", the actual form of these routines
may be a bit surprising!.
* src/ui.cc, src/vscreen/testvscreen.cc, src/vscreen/vscreen.cc, src/vscreen/vscreen.h:
Update the handling of the top-level widget: you should now call
vscreen_shutdown() when shutting the program down instead of
rootwin.endwin(), which will destroy and drop the top-level
widget; and you can retrieve the old top-level when setting up a
new one (in fact, you must, in order to make sure that destroy()
is called before deleting the pointer).
* src/vscreen/vscreen_widget.cc:
Don't call destroy() from the destructor, and don't bother
clearing out the signals in destroy() (the latter change could
be reversed if I made it a requirement for ALL derived classes
to clear ALL signal lists in destroy(), but I think that for the
time being, I'll settle for requiring the widget to be
disconnected from all events after destroy().
Incidentally, calling destroy() from the destructor was a truly
awful idea -- not only is it a complex member function, it's
virtual! [EDIT: doh, it wasn't being called from a destructor.
Please ignore my stupidity]
* src/vscreen/vs_radiogroup.cc:
Handle the case of removing the last button in a radio group.
* src/vscreen/testvscreen.cc:
Close a memory leak reported by valgrind.
* src/vscreen/vs_bin.cc, src/vscreen/vs_bin.h, src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h, src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_minibuf_win.h, src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h, src/vscreen/vs_stacked.cc, src/vscreen/vs_stacked.h, src/vscreen/vs_table.cc, src/vscreen/vs_table.h:
Create a new protocol for destroying widgets: a widget should
destroy and disconnect all of its children immediately upon
receiving destroy(), but the actual deletion of its instance
might be deferred if strong references to it exist (for
instance, if some information needs to be retrieved from it).
The test program runs and exits without errors now.
* src/vscreen/vscreen_widget.cc:
Only assert that we lost our window if we had an owner: owned
widgets are removed from their owners, which must invalidate the
window, but unowned widgets can be the top-level widget and
might still have a window when the program exits.
* src/solution_dialog.cc, src/solution_dialog.h:
Update the solution dialog for refcounting.
* src/pkg_view.cc, src/pkg_view.h:
Update the package view generation code for refcounting.
* src/vscreen/ref_ptr.h:
Make the dynamic downcast take a target class, not a target
class pointer, as its template argument.
* src/pkg_ver_item.cc, src/pkg_ver_item.h:
Update pkg_ver_item for refcounting.
* src/pkg_info_screen.h:
Update the pkg_info_screen signature for refcounting.
* src/pkg_tree.cc, src/pkg_tree.h:
Update pkg_tree for refcounting.
* src/edit_pkg_hier.h:
Whoops, make ::create() static.
* src/pkg_item.cc:
Update the pkg_item implementation for refcounting.
* src/edit_pkg_hier.h:
Update the vs_hier_editor class for the refcounting protocol.
* src/vs_progress.cc, src/vs_progress.h:
Update the vs_progress class for the refcounting protocol.
* src/download_bar.cc, src/download_bar.h:
Add missing size request implementations so the bar compiles.
* src/download_list.cc, src/download_list.h:
Update the download list for refcounting.
* src/download_bar.cc:
Make the constructor protected.
* src/download_bar.cc:
Fix the download bar for the refcounting protocol.
* src/download.cc:
Fix the download code for the refcounting protocol.
* src/broken_indicator.cc, src/broken_indicator.h:
Fix the broken_indicator class to work in the presence of
reference counting.
* src/vscreen/vs_text_layout.h:
Constructors should be protected, not private.
* src/apt_config_widgets.cc, src/apt_config_widgets.h, src/apt_options.cc, src/apt_options.h:
Convert the configuration <-> UI interface layer to use the
reference-counting protocol (and, while I'm at it, stop using
multiple inheritance here).
* src/main.cc:
Use a counting reference for the initial progress bar.
* README.SMART-POINTERS:
Add some documentation on the use of smart pointers in aptitude.
* src/cmine/cmine.cc, src/cmine/cmine.h:
Fix the Minesweeper code for ref_ptrs.
* src/ui.h:
Use ref_ptrs in interface routines.
* src/vscreen/vs_editline.h:
Add missing "const" qualifier to a constructor reference
argument.
* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Further reduce header interdependencies by forward-declaring the
ref_ptr class.
* src/vscreen/ref_ptr.h, src/vscreen/testvscreen.cc, src/vscreen/vs_bin.cc, src/vscreen/vs_bin.h, src/vscreen/vs_container.cc, src/vscreen/vs_container.h, src/vscreen/vs_frame.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h, src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h, src/vscreen/vs_radiogroup.cc, src/vscreen/vs_radiogroup.h, src/vscreen/vs_stacked.cc, src/vscreen/vs_stacked.h, src/vscreen/vs_table.cc, src/vscreen/vs_table.h, src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Binding references as slot arguments causes weird and painful
problems. Instead, use sigc++ weak references (sigc::ref);
since I want to be able to easily connect signals to public
methods, adopt the convention of providing a (non-virtual) _bare
variant of methods that take a refcounted pointer as an
argument; the variant accepts a reference to the underlying type
and wraps it in a ref_ptr before handing it to the real method.
2005-08-06 Rubén Porras <nahoo@inicia.es>
* updated po/es.po
* fixed Last-Translator field in po/vi.po
* regenerate po/aptitude.pot and po files.
2005-08-06 Erçin EKER <erc.caldera@gmx.net>
* updated po/tr.po
* new help-tr.txt
2005-08-06 Daniel Burrows <dburrows@debian.org>
* src/vscreen/fragment.cc:
Fix an access-past-end-of-string discovered by valgrind.
* src/vscreen/testvscreen.cc, src/vscreen/vs_bin.cc, src/vscreen/vs_bin.h, src/vscreen/vs_button.h, src/vscreen/vs_center.cc, src/vscreen/vs_center.h, src/vscreen/vs_container.cc, src/vscreen/vs_container.h, src/vscreen/vscreen.cc, src/vscreen/vscreen.h, src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h, src/vscreen/vs_editline.cc, src/vscreen/vs_editline.h, src/vscreen/vs_frame.cc, src/vscreen/vs_frame.h, src/vscreen/vs_label.cc, src/vscreen/vs_label.h, src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h, src/vscreen/vs_menu.h, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_minibuf_win.h, src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h, src/vscreen/vs_pager.h, src/vscreen/vs_passthrough.cc, src/vscreen/vs_passthrough.h, src/vscreen/vs_radiogroup.cc, src/vscreen/vs_radiogroup.h, src/vscreen/vs_scrollbar.h, src/vscreen/vs_size_box.cc, src/vscreen/vs_size_box.h, src/vscreen/vs_stacked.cc, src/vscreen/vs_stacked.h, src/vscreen/vs_statuschoice.h, src/vscreen/vs_table.cc, src/vscreen/vs_table.h, src/vscreen/vs_text_layout.h, src/vscreen/vs_togglebutton.h, src/vscreen/vs_transient.cc, src/vscreen/vs_transient.h, src/vscreen/vs_tree.h, src/vscreen/vs_util.cc, src/vscreen/vs_util.h, src/vscreen/ref_ptr.h:
Convert the vscreen code over to using reference-counted
pointers for inter-object references. This is a sensible thing
to do since widgets form a tree -- normally you'll just see a
widget's owner holding onto references to it (but in special
cases some other references could exist).
This change breaks everything. Whee!
* src/vscreen/vscreen_widget.cc:
Fix a gaping bug and memory leak that only just came to my
attention. Stuff that was destroyed wasn't being deleted!
Apparently I commented the code that did the deletion out while
debugging and never reinstated it. Doh!
* src/ui.cc:
Really set the global apt error dialog to NULL when it is
destroyed. Should fix the problem where the apt error dialog
only appears once...not to mention any weird memory corruption
bugs caused by this.
* src/pkg_tree.cc:
Fix the invocation of parse_pattern so it doesn't flag errors
(restoring the past behavior).
* src/generic/matchers.cc:
Change the 'keep' matcher to detect ANY package that no action
is being performed on, including not-installed packages.
* src/generic/matchers.cc:
Fix the behavior of NOT when match results are being stored.
* src/generic/aptcache.cc:
Only write the target version if the user actually planned to
install it; only set up an installation if the user requested it
previously (i.e., the Upgrade field was written).
* src/pkg_item.cc, src/pkg_ver_item.cc, src/ui.cc:
Always destroy progress bars when we're done with them, so they
don't leak and hang around taking up space (in the past they
just leaked silently, but now they also make stuff look bad!)
* src/vscreen/vscreen.cc, src/vscreen/vscreen.h, src/vscreen/vscreen_widget.h:
Explicitly reset SIGCONT and SIGTSTP to SIG_DFL in
vscreen_suspend and restore them in vscreen_resume. If you
don't want to reset the signals for some reason, you can use
vscreen_suspend_without_signals(). (Closes: #137311, #169479)
2005-08-05 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Always save the version to be installed, so long as it's a
change from the current version but not the same as the default
candidate version. This should handle the problem that the
version to install isn't saved in a reasonably intuitive way.
(Closes: #158771)
* src/ui.cc:
Add canned views to display a flat package list and to display a
debtags browser.
* src/cmdline/cmdline_show.cc, src/desc_parse.cc, src/desc_parse.h, src/pkg_info_screen.cc, src/pkg_view.cc:
Show package tags right after the description everywhere that
it's appropriate.
* src/load_grouppolicy.cc:
Parse empty policies without crashing.
* doc/en/aptitude.xml, src/load_grouppolicy.cc, src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h:
Add support for grouping packages using debtags information.
* src/generic/tags.cc, src/generic/tags.h:
Add code to load in the tag vocabulary database.
* src/download.cc:
Apply Michael Vogt's patch for apt status reporting.
2005-08-04 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml, src/generic/matchers.cc, src/generic/matchers.h:
Make the matching language whitespace-insensitive: to include
literal whitespace, you must now place it between double quotes
or tilde-escape it.
* src/generic/matchers.h, src/load_grouppolicy.cc, src/pkg_grouppolicy.h:
Total rewrite of the load_grouppolicy code, and a few interface
changes to accomodate it. Instead of assuming a fully regular
syntax and splitting grouping declarations up-front,
load_grouppolicy now works by chaining parsers together, where
each parser implicitly pulls its text off as a side effect.
This will make nested policies feasible; it also means that the
pattern grouping policy should now work correctly even in the
presence of things like parentheses within the pattern.
* src/generic/matchers.cc, src/generic/matchers.h:
Change the parse_pattern interface again (and make it less
efficient) in order to allow arbitrary (possibly
multi-character) strings to be used as terminators. In
particular, this will mean I can get the patterns grouping
policy (with its "=>" delimiter) working properly without
comprimising on the syntax.
* src/generic/util.cc, src/generic/util.h:
Write generic (inefficient) code to produce string objects
from formatting codes (like printf).
2005-08-02 Daniel Burrows <dburrows@debian.org>
* src/generic/matchers.cc, src/generic/matchers.h:
Make the parser more generic: you can pass in a set of
characters that should terminate the match if they are
encountered at the top syntactic level. The loader will use
this (but doesn't yet) to safely split its arguments.
2005-07-27 Daniel Burrows <dburrows@debian.org>
* src/generic/matchers.cc, src/generic/matchers.h:
Change the external and internal interfaces to use iterators
rather than passing in a string and directly indexing into it.
The start iterator is modified as a side-effect, which should
eventually allow continuation-based parsing (i.e., just parse
the first thing that looks like a match term and then stop). I
might need to think more about just how this will work, though.
2005-07-26 Daniel Burrows <dburrows@debian.org>
* tests/Makefile.am, tests/test_misc.cc:
Add a file for tests that don't belong elsewhere.
* tests/Makefile.am, tests/test_tags.cc:
Update the source to compile with the lifted suites.
* configure.ac, Makefile.am, src/generic/Makefile.am, src/generic/tests/, tests/:
Move the test suites up to the top level.
2005-07-25 Daniel Burrows <dburrows@debian.org>
* src/pkg_grouppolicy.cc:
In the custom pattern-based grouping policy, stop checking
patterns after the first match.
* src/pkg_grouppolicy.cc:
In the custom pattern-based grouping policy, when creating a new
subtree of the current tree, make sure to actually add the
object that triggered the creation of the subtree to the new
subtree.
* src/generic/tasks.cc:
For some reason, pkgTagSection.Scan() requires one more than the
length of the section to work properly. Either that or GetRec
returns an inclusive range. Either way, parsing tags from the
Packages file should work now.
* src/generic/tags.cc, src/generic/tags.h, src/generic/tests/test_tags.cc:
Keep a local copy of the data for each tag and tag list.
Without this, all sorts of hell breaks loose due to stuff being
deleted at bad times (doh).
* src/generic/tags.cc:
Fix the tag list parser so it doesn't routinely skip the first
tag out of a list of tags. All tests pass now!
* src/generic/tests/test_tags.cc:
Fix a reversed-sense test (we want to test a<b and b>a,
not a<b and a>b).
* src/generic/tags.h:
Fix the breakage in the comparison operators.
* src/generic/tests/test_tags.cc:
Add specialized test forms for comparison tests.
* src/generic/tags.cc:
Fix an incorrect bounds-check (I tested an iterator on the
container "other" against the end() of "this"). Clears up
another failing test case. :-)
* src/generic/tags.cc:
Strip whitespace from the front and back of tags upon
construction.
* src/generic/tests/test_tags.cc:
Add an operator<< implementation to write tags directly
for debug messages.
* src/generic/tests/test_tags.cc:
Use ASSERT_EQUAL instead of ASSERT for equality-based tests; I
hope that this prints more useful assertion-failure messages.
* src/generic/tests/main.cc:
As I suspected, the return value of runner.run() was reversed;
fix it so the test harness actually reports errors to its
caller.
* src/generic/tests/Makefile.am:
Run the tests on "make check".
* src/generic/tests/test_tags.cc:
Test the tag parser more exhaustively.
* doc/en/aptitude.xml, src/generic/matchers.cc:
Add a tag matcher, to match against the new Tags field.
Currently it's broken, but it's a start.
(Closes: #243830)
* src/generic/tags.h:
Add a routine to retrieve the plain text of a single tag.
* src/cmdline/cmdline_changelog.cc:
Add heuristics to guess where the changelog of a package that we
don't have direct information about /might/ be; i.e., to allow
fetching changelogs of packages that aren't referenced from
sources.list.
* src/generic/pkg_changelog.cc:
It's no longer necessary to look up the source package in
pkg_changelog_form_source, so don't.
* src/generic/pkg_changelog.cc:
Don't crash if an end version iterator is passed into
get_changelog.
* doc/en/manpage.xml, src/cmdline/cmdline_changelog.cc, src/generic/pkg_changelog.cc, src/generic/pkg_changelog.h:
Let the user pass source packages as well as binary packages
into the "changelog" command-line action.
* src/cmdline/cmdline_changelog.cc, src/generic/pkg_changelog.cc, src/generic/pkg_changelog.h:
Add the ability to find changelog based on the source package
name as well as an iterator to a binary package version. Also
eliminated the hardcoded default for PulseInterval and changed
the invocation of pkg_changelog in cmdline_changelog.cc
accordingly.
* src/pkg_grouppolicy.cc:
Patch up a memory leak in the matchers grouping policy.
* doc/en/aptitude.xml, src/load_grouppolicy.cc, src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h, src/pkg_tree.cc, src/ui.cc:
Do something like the "missing" filter in pkg_tree itself.
Handle patterns in the filter class now, but for backwards
compatibility, interpret the literal string "missing" as a NOP.
* doc/en/aptitude.xml, src/load_grouppolicy.cc, src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h, src/generic/Makefile.am, src/generic/util.cc, src/generic/util.h:
Add a "patterns" grouping policy and start a long-overdue
collection of generic utility routines to kill off some of my
duplication of code. (Closes: #156065)
* src/generic/matchers.cc:
Match anything with an empty pattern.
2005-07-24 Clytie Siddall <clytie@riverland.net.au>
* Updated Vietnamese translation
Closes: #319702
2005-07-24 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Fix the formatting of the %# documentation and change the
dangling secStyles reference to refer to secStyle.
2005-07-23 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml, src/cmdline/cmdline_search.cc, src/pkg_columnizer.cc, src/pkg_item_width_subtree.h, src/vscreen/config/column_definitions.cc, src/vscreen/config/column_definitions.h:
Add support for parametric column formatting.
* src/generic/matchers.cc, src/generic/matchers.h:
Move implementation of ~pkg_matcher to the .cc file,
mark get_match in pkg_matcher as abstract; give get_match
in pkg_task_matcher the correct signature to implement
the abstract interface.
* src/generic/matchers.cc, src/generic/matchers.h:
Add support for retrieving a string corresponding to a match.
2005-07-22 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Fix the Python tribute (thanks to Andy G. Wood for pointing this
out).
2005-07-21 Daniel Burrows <dburrows@debian.org>
* configure.ac, src/generic/Makefile.am, src/generic/tests/Makefile.am, src/generic/tests/main.cc, src/generic/tests/test_tags.cc:
Add some basic magic to generate a unit tester with cppunit.
* src/generic/Makefile.am, src/generic/apt.cc, src/generic/tags.cc, src/generic/tags.h:
Add backend support for parsing the new tag database.
* src/generic/tasks.cc, src/generic/apt.h:
Lift the stuff to order versions by their file location
into apt.h so other modules can use it.
2005-07-12 Jean-Luc Coulon <jean-luc.coulon@wanadoo.fr>
* Completed French translation. Closes: #318906
2005-07-19 Sorin Batariuc <sorin@bonbon.net>
* Updated romanian translation. Closes #318947
2005-07-16 Rubén Porras <nahoo@inicia.es>
* Fix po/aptitude.pot and po files. Last time I forgot to add
--keyword=P_ to xgettext.
* Fix redundancy in displayed string. Thanks to Jacobo Tarrio
<jtarrio@trasno.net>. Closes #318396
2005-07-16 Morten Bo Johansen <mojo@gatsby.mbjnet.dk>
* Updated danish translation. Closes #317824
2005-07-15 Rubén Porras <nahoo@inicia.es>
* Add comments for tranlators to src/pkg_ver_item.cc and
src/pkg_columnizer.cc
* Regenerated po/aptitude.pot and all po files
* Updated spanish translation
* Now we need to add --add-comments=ForTranslators to xgettext
command line to generate the aptitude.pot with comments.
NOTE: the full command is
xgettext --keyword=_ --keyword=P_ --keyword=N_
--add-comments=ForTranslators -o po/aptitude.pot -f po/POTFILES.in
2005-07-13 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Remove an obsolete reference to Aptitude::UI::Colors.
* doc/en/manpage.xml, src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_do_action.h, src/cmdline/cmdline_upgrade.cc, src/cmdline/cmdline_upgrade.h, src/main.cc:
Add basic support for writing commands to the selection database
without actually executing them. (NB: this may do bad things in
corner cases, like selecting particular versions)
(Closes: #312249)
* doc/en/aptitude.xml, src/cmdline/cmdline_do_action.cc, src/main.cc:
Add support for "keep" and "keep-all" commands; the former
cancels actions on a single package, while the latter cancels
all currently contemplated actions. (Closes: #312923)
2005-07-12 Jean-Luc Coulon <jean-luc.coulon@wanadoo.fr>
* Updated French translation (sent through the French mailing list)
2005-07-11 Daniel Burrows <dburrows@debian.org>
* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Remove some no-longer-necessary debug code.
* src/generic/aptitude_resolver.h:
When leaving a Provides list while iterating over broken deps,
make sure to explicitly set the variable indicating whether the
list is open or not to "false" (oops!). The other pieces of
code that use the prv_open pattern seem to handle it correctly.
* src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h:
Add missing virtual destructor for pkg_grouppolicy_factory.
* src/generic/strhash.h:
Add a missing "template <>".
* src/generic/problemresolver/problemresolver.h:
Remove a never-used method that referred to a nonexistant
variable.
2005-07-10 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/test.cc:
Disable dumping the world in the test code by default, but let
the user enable it with --dump.
* doc/en/aptitude.xml:
Correct the documentation of the default binding of DumpResolver
(it was originally F6, which was a bad idea for obvious reasons,
but I apparently changed it to '*' and forgot to change the
docs).
2005-07-10 Clytie Siddall <clytie@riverland.net.au>
* Updated Vietnamese translation
Closes: #317629
2005-07-07 Daniel Burrows <dburrows@debian.org>
* src/cmine.cc, src/ui.cc:
Use the new support to add search repetition capabilities to all
dialogs. (Closes: #270699)
* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Also add support for binding up a callback for the 'ReSearch'
keystroke.
* src/reason_fragment.cc:
Remove a no longer necessary %S escape.
* src/view_changelog.cc:
Add support for searching for text in the changelog viewer.
2005-07-05 Rubén Porras <nahoo@inicia.es>
* New spanish help file help-es.txt
2005-07-07 Jean-Luc Coulon <jean-luc.coulon@wanadoo.fr>
* Updated French translation (still to be completed)
2005-07-06 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Delete a no-longer-needed reference to a style name.
* src/vscreen/fragment.cc:
Actually recognize the %S escape.
* src/vscreen/vs_pager.cc:
Fix a number of corner cases involving negative widths and
unprintable characters. (Closes: #317115)
* src/cmdline/cmdline_show.cc:
Fix output of wide characters. (Closes: #317115)
2005-07-05 Rubén Porras <nahoo@inicia.es>
* Convert to UTF8 the following files:
help-zh_CN.txt
help-ja.txt
help-fi.txt
help-cs.txt
help-gl.txt
help-fr.txt
help-pl.txt
help-pt_BR.txt
2005-07-05 Jaakko Kangasharju <ashar@iki.fi>
* Complete Finnish translation for Aptitude. After adding the
relevants patches from #316225 (the ones modifing debian'n dir
in aptitude-fi.patch.gz) we can close this bug.
2005-07-05 Clytie Siddall <clytie@riverland.net.au>
* Updated Vietnamese translation
Closes: #316994
2005-07-05 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_resolver.cc:
Display information about what went wrong when there's a problem
writing out a resolver dump.
* src/generic/aptitude_resolver.h:
Don't abort when trying to dump a package that has only one
version. (doh, 0 is a valid index!)
* doc/en/aptitude.xml:
Fix several typos pointed out by Miroslav Kure.
* src/cmdline/cmdline_progress.cc:
Calculate the screen width correctly: I suspect that there is an
off-by-one error in the progress bar that the
update_screen_width function originally compensated for.
* src/cmdline/cmdline_search.cc:
Fix a minor race condition that could have resulted in "search"
not obeying the -w (width) option if the terminal was resized
during a search.
* src/cmdline/cmdline_search.cc:
Fix "search" output. (Retroactively Closes: #317115)
2005-07-05 Rubén Porras <nahoo@inicia>
* Updated spanish translation
2005-07-04 Daniel Burrows <dburrows@debian.org>
* NEWS, README, doc/en/aptitude.xml:
Bump version to 0.3.3.
* doc/en/aptitude.xml:
Correct the documentation of several configuration options that
had been invalidated by changes to the program.
* src/download.cc, src/view_changelog.cc:
Decrease the polling rate of downloads. Again.
* doc/aptitude.css:
Various tweaks to make the generated documentation a bit
nicer-looking (maybe too fancy in some places, though?).
* doc/aptitude.css, doc/aptitude-common.xsl:
Update the stylesheets: shade.verbatim is deprecated, so I've
moved those configuration parameters into CSS.
* doc/en/aptitude.xml:
Replace the documentation dealing with color configuration with
documentation addressing style configuration.
* src/load_config.cc:
Pass Value to parse_color, not Tag; setting colors in the
configuration file now works.
* src/load_config.cc:
Don't go into an infinite loop trying to parse text attributes.
2005-07-03 Daniel Burrows <dburrows@debian.org>
* src/generic/pkg_changelog.cc, src/generic/pkg_changelog.h, src/view_changelog.cc:
Update more frequently when downloading changelogs, too.
* doc/en/aptitude.xml, src/download.cc:
Drop the frequency of screen updates by an order of magnitude,
to quit hogging the CPU.
* src/mine/cmine.cc:
Add and use support for adjusting the coloration of uncovered
squares according to how many bombs adjoin them. Make detonated
mines bright red too.
* src/mine/cmine.cc:
In the new-game dialog, connect the Confirm binding with
connect_key_post so that it doesn't override pressing Enter on
the Cancel button.
* src/mine/cmine.cc:
Fix the location of the right-hand border, and add some more
color customization possibilities.
* src/main.cc:
Don't complain loudly about invalid encodings; just generate
output with the offending characters replaced by '?'.
* src/vscreen/vs_pager.cc:
Actually support wide characters in the pager: calculate
widths correctly and use wide character output routines
(so characters don't get randomly degraded to ASCII..oops!)
* README.i18n:
Document the existence of encoding translations.
* src/mine/cmine.cc:
Allow the encoding of mine-help.txt to be specified, and
be robust against it missing.
* src/ui.cc:
Also allow the encoding of README to be specified.
* po/Makefile.in.in:
Rebuild po/Makefile if po/Makevars changes.
* po/Makevars:
Recognize P_() as a gettext marker.
* src/ui.cc:
Fix various places in the ui glue code to handle the new pager
API.
* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
Allow the encoding to be specified when a vs_pager is created
with a pre-loaded file (oops).
* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Allow the user to specify the encoding of the file to be loaded
in a vs_dialog_fileview.
* src/aptitude.h:
Whoops, need to #include <string.h> for strchr.
* src/aptitude.h, README.i18n:
Add a routine 'P_()' which strips off everything up to the first
pipe symbol in the string.
* src/vscreen/transcode.cc:
When coding errors are encountered, replace the offending
characters with '?' and continue attempting to decode the rest
of the string.
* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
Use wide characters in the vs_pager, and transcode the input
text from a (optionally specified) encoding.
* src/vscreen/transcode.cc, src/vscreen/transcode.h:
Add transcode-with-punted-errors variants that read directly
from a character buffer.
2005-07-02 Daniel Burrows <dburrows@debian.org>
* src/generic/aptitude_resolver.h:
Add some safety code to make sure that the resolver compiles
even when the compiler is being ultra-strict.
* po/POTFILES.in:
Remove another reference to strhash.h.
* src/Makefile.am:
Remove reference to strhash.h.
* src/download.cc:
Try greatly increasing the resolution of pulses, to make the UI
more responsive during a download.
* src/ui.cc:
Force the broken indicator to start out hidden.
* src/vscreen/columnify.cc:
Fix the algorithm that "renders" column-formatted text:
due to a logic error, nothing at all was being produced.
* src/ui.cc:
Instead of trying to pass a NULL string to pkg_tree::pkg_tree,
just don't pass the third argument. Fixes a SIGABRT.
* src/ui.cc:
Implement the wstring variant of show_message.
* src/main.cc:
Add default transcoding error handlers that push an error on the
apt error stack.
* src/vs_progress.cc:
Update the core progress bar for wide characters.
* src/ui.cc:
Update ui.cc to use wide characters internally.
* src/apt_info_tree.cc, src/apt_info_tree.h:
Update copyright info.
* src/apt_info_tree.cc, src/apt_info_tree.h:
Make the desc_signal of apt_info_trees accept a wide string.
* src/solution_fragment.cc:
Pass a wchar_t* to join_fragment instead of a char*.
* src/reason_fragment.cc:
Pass a wchar_t* to join_fragment instead of a char*.
* src/pkg_view.cc:
Update the pkg_view code for wide characters and new interfaces.
* src/pkg_info_screen.cc:
Fix the pkg_info_screen code to pass a wstring to desc_parse.
* src/cmdline/cmdline_show.cc:
Fix the 'show' command to pass a wstring to desc_parse.
* src/desc_parse.cc, src/desc_parse.h:
Update the description parser to take a wide string as input.
* src/mine/cmine.cc, src/mine/cmine.h:
Update cmine for the new prompt_string signature.
* src/vscreen/vs_tree.h, src/vscreen/vs_treeitem.h:
Explicitly make searches take wide character strings as input.
* src/pkg_tree.cc, src/pkg_tree.h:
Wide-character conversion of pkg_tree.
* src/ui.h:
Make the string callbacks take wstrings.
* src/ui.h:
Add wstring variants of some interface functions.
* src/pkg_sortpolicy.h:
Make operator() non-const; the new sort policy protocol
requires this.
* src/pkg_sortpolicy.cc:
Fix the sorting policy to work with the new internal interfaces.
* src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h:
Update the display of the multiplex's tabs for wide characters.
* src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h:
Update pkg_grouppolicy for wide characters.
* src/pkg_item.cc, src/pkg_item.h:
Update the pkg_item code for wide characters.
* src/ui.h:
Undo that last change: most of the code passes statically
translated strings into those routines, so it will be a lot
simpler to do the transcoding in ui.cc.
* src/ui.h:
Use wstrings in the UI's external interface.
* src/pkg_info_screen.cc:
Update pkg_info_screen for wide characters.
* src/load_grouppolicy.cc:
Update the #include of strhash to use the correct copy, not the
old one that I removed.
* src/load_config.cc:
Update the configuration loader for wide characters.
* src/download_list.cc, src/download_screen.cc:
Allow the user to cancel a media change. Although I can't
really test it, this hopefully Closes: #315885.
* src/generic/Makefile.am, src/generic/mut_fun.h:
Add a functor class that assigns its argument to a fixed
variable.
* src/download_screen.cc, src/download_screen.h:
Update the download-screen class for wide characters.
* src/download_item.cc, src/download_item.h:
Update the download-item class for wide characters.
* src/vscreen/vs_subtree.h:
Update the current display column properly in vs_subtree::paint.
Fixes the bug where the current line's highlight "overflowed" to
the next line.
* src/edit_pkg_hier.cc:
Update the package hierarchy editor for wide characters
(slightly hackily?)
* src/download_bar.cc:
Update the download-bar to use the new signature of
show_string_as_progbar.
* src/dep_item.cc:
Make dep_item.cc work with wide characters.
* src/pkg_item_with_subtree.h:
Convert the package-item-plus-subtree class to wide characters.
* src/pkg_subtree.cc, src/pkg_subtree.h:
Convert the pkg_subtree class to wide characters.
* src/pkg_node.cc, src/pkg_node.h:
Convert the core package node class to wide characters.
* src/pkg_item_with_subtree.h, src/pkg_item.h, src/pkg_ver_item.cc, src/pkg_ver_item.h:
Fix some more tree items, to the point that pkg_ver_item now
compiles.
* src/pkg_ver_item.cc, src/pkg_ver_item.h:
Update the pkg_ver_item to reflect the changes in the vscreen
API.
* src/vscreen/vs_layout_item.cc:
Make vs_layout_item less absurdly inefficient by really caching
all of its contents up-front, rather than calling layout() once
for EVERY LINE IN THE ITEM.
* src/vscreen/vs_layout_item.cc, src/vscreen/vs_layout_item.h:
Avoid several copies when displaying a vs_layout_item.
* src/vscreen/testvscreen.cc, src/vscreen/vs_layout_item.cc, src/vscreen/vs_layout_item.h, src/vscreen/vs_staticitem.h, src/vscreen/vs_subtree.h, src/vscreen/vs_tree.cc, src/vscreen/vs_treeitem.cc, src/vscreen/vs_treeitem.h:
Adjust the treeitem interface to use wide characters; while I'm
at it, I removed a bunch of const qualifiers that looked
dangerous (const qualifiers on a virtual method are potentially
problematic).
* src/edit_pkg_hier.cc, src/edit_pkg_hier.h:
Update the package hierarchy editor for wide characters.
* src/download_list.cc, src/download_list.h:
Update the download_list for wide characters.
2005-07-01 Daniel Burrows <dburrows@debian.org>
* src/vscreen/curses++.cc, src/vscreen/curses++.h, src/vscreen/vscreen_widget.h:
While I'm at it...pass strings by reference, not value.
* src/vscreen/curses++.cc, src/vscreen/curses++.h, src/vscreen/vscreen_widget.h:
Update show_string_as_progbar for wide characters.
* src/download_bar.cc, src/download_bar.h:
Fix the download bar for wide characters.
* src/defaults.cc:
Change the default setting initializations to use the new
wide-character interfaces.
* src/broken_indicator.cc:
Convert the broken indicator to handle wide characters.
* src/apt_config_widgets.cc, src/apt_config_widgets.h:
Convert the apt config widgets to support wide characters.
2005-06-30 Daniel Burrows <dburrows@debian.org>
* src/mine/cmine.cc, src/mine/cmine.h:
Update the mine code for wide characters. Sort of, anyway.
At least, it should work.
2005-06-31 Tim Dijkstra <tim@famdijkstra.org>
* Updated minor corrections to nl.po
Closes: #316279
2005-06-29 Daniel Burrows <dburrows@debian.org>
* src/vscreen/curses++.cc, src/vscreen/curses++.h, src/vscreen/vscreen_widget.h:
Update display_header and display_status to handle wide
characters.
* src/vscreen/vs_button.cc, src/vscreen/vs_scrollbar.cc:
Convert all uses of ACS_* to WACS_*.
* src/vscreen/vs_statuschoice.cc, src/vscreen/vs_statuschoice.h:
Convert vs_statuschoice to handle wide characters.
* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h, src/vscreen/testvscreen.cc:
Convert vs_menubar to handle wide characters.
* src/vscreen/vscreen.cc:
Use A_REVERSE on HighlightedMenuEntry -- this gives a more
brilliant white background than the non-reversed version (ew).
* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Don't bother caching the width for now (this is much more
obviously correct; width caching can be reinstated without
losing correctness if speed ever becomes an issue).
* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Rewrote vs_menu to properly handle wide characters.
* src/vscreen/curses++.h, src/vscreen/vscreen_widget.h:
Get rid of the attribute argument, it seems to cause unexpected
behavior. Add variants to pass in pregenerated cchar_t strings.
* src/vscreen/curses++.h, src/vscreen/vscreen_widget.h:
Expose the add_wch and wadd_wch functions.
2005-06-28 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_editline.cc:
Correct several errors in how normalize_cursor works.
* src/vscreen/vs_editline.cc:
Fix get_char() to produce correct results (oops).
* src/vscreen/config/colors.cc:
Don't make the cursor invisible, at the cost of losing
black-on-black text.
* src/vscreen/vs_editline.cc, src/vscreen/vs_editline.h:
Fix the line editor widget to support wide characters properly
(it now honors wide character widths).
* src/vscreen/curses++.h:
#undef the *add_wch functions for future use.
2005-06-27 Daniel Burrows <dburrows@debian.org>
* src/vscreen/fragment.cc:
Initialize the current line's width to 0 in clipbox::layout
rather than using random uninitialized values.
* src/vscreen/fragment.cc:
Fix a segfault in clipbox::layout due to an insufficiently
bounded loop.
* src/vscreen/testvscreen.cc:
Add some actual wide characters to test the formatting code.
* src/vscreen/fragment.cc:
Add a long string escape to fragf (for printing out stuff that's
already been transcoded).
* src/vscreen/testvscreen.cc:
Use setlocale() to actually enter the current locale (so UTF-8
locales actually work now!).
* src/vscreen/config/keybindings.cc:
Fix the definition of KEY_CTRL and keyname to be slightly more
sane (as sane as is possible given how control keys are
handled).
2005-06-27 Håvard Korsvoll <korsvoll@skulelinux.no>
* Updated Norwegian nynorsk translation
Closes: #315988
2005-06-23 Miguel Figueiredo <elmig@debianpt.org>
* Updated Portuguese translation
Closes: #315486
2005-06-27 Daniel Burrows <dburrows@debian.org>
* src/vscreen/testvscreen.cc:
Update the testvscreen code for the new keybindings magic.
* src/vscreen/vs_subtree.h src/vscreen/vs_tree.cc src/vscreen/vs_treeitem.h:
Convert various dispatch_char routines to dispatch_key. (DANGER:
forgetting to do this will result in a silently broken widget at
the moment)
* src/vscreen/vs_tree.cc, src/vscreen/vs_tree.h:
Convert vs_tree::handle_char to vs_tree::handle_key.
* src/vscreen/vs_table.cc, src/vscreen/vs_table.h:
Convert vs_table::handle_char to vs_table::handle_key.
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Convert vs_text_layout::handle_char to
vs_text_layout::handle_key.
* src/vscreen/vs_statuschoice.h:
Convert vs_statuschoice::handle_char to
vs_statuschoice::handle_key.
* src/vscreen/vs_passthrough.cc, src/vscreen/vs_passthrough.h:
Convert vs_passthrough::handle_char to
vs_passthrough::handle_key.
* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
Convert vs_pager::handle_char to vs_pager::handle_key.
* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h:
Convert vs_menubar::handle_char to vs_menubar::handle_key.
* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Convert vs_menu::handle_char to vs_editline::handle_key.
* src/vscreen/vs_editline.cc, src/vscreen/vs_editline.h:
Convert vs_editline::handle_char to vs_editline::handle_key.
* src/vscreen/vs_button.cc, src/vscreen/vs_button.h:
Convert vs_button::handle_char to vs_button::handle_key.
* src/vscreen/vscreen_widget.cc:
Name change update: handle_char -> handle_key.
* src/vscreen/vscreen.cc, src/vscreen/vscreen.h:
Fix compilation problems from the new keybindings stuff.
* src/vscreen/vscreen.cc:
Use the function-key information from get_wch() to decide what
sort of key event to generate, and call the new names of the
key-handling methods.
* src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
Make the key-handling methods take keys instead of wint_ts.
* src/vscreen/config/keybindings.cc, src/vscreen/config/keybindings.h:
First crack at revising the keybinding routines to handle
Unicode input. In particular, the "key" type now includes a
flag to indicate function-key-ness (this is useful since we need
to distinguish function keys (KEY_*) from other keys now --
curses uses a special return value from get_wch to indicate
them, and I think it's because they might overlap real
codepoints).
This probably breaks everything again.
2005-06-26 Daniel Burrows <dburrows@debian.org>
* src/strhash.h:
This copy of strhash is obsolete and broken, remove it to avoid
confusion.
* src/vscreen/vscreen.cc:
Update the other place where input is read to handle wide
characters (oops).
* src/vscreen/testvscreen.cc:
Update the test program for the new vscreen interfaces.
* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h:
Use const string &'s in the vs_file_pager interface.
* src/vscreen/vs_pager.cc:
Allow wide character strings to be used for the filename of a
vs_file_pager, to make it easy to bind the vs_editline's
"entered" signal to vs_file_pager::load_file. Is this a hack?
(and for that matter, why is vs_file_pager still separate from
vs_pager?)
* src/vscreen/columnify.cc:
Use the new transcoder, so transcoding errors can be reported at
a higher level.
* src/vscreen/transcode.cc, src/vscreen/transcode.h:
Implement the new transcoder, and fix some types in the
header (oops).
* src/vscreen/vs_util.cc:
Add explicit transcoding in the fallback routines.
* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
Add initializers for wstrings.
* src/vscreen/transcode.h:
Add a kinder, gentler transcoding interface for when error
detection isn't important.
* src/vscreen/vs_editline.cc, src/vscreen/vs_editline.h:
Convert the public interface of the line-editor to wide
characters. (this is important since it's the main interface
for string input at the moment)
* src/vscreen/transcode.h:
Add inline convenience functions to "directly" go from
strings to strings.
* src/vscreen/vs_button.cc, src/vscreen/vs_button.h:
Change the argument type of handle_char() so it gets correctly
overridden.
* src/vscreen/config/keybindings.cc, src/vscreen/config/keybindings.h:
Make the keybinding lookup tables take wide character values.
* src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
Modify the prototypes of dispatch_char and handle_char to
take wint_t values.
* src/vscreen/vs_button.h:
Doh, actually overload vs_button::vs_button.
* src/vscreen/vscreen.cc:
Use get_wch() instead of getch() -- this will need to be
propagated into the vscreen_widget hierarchy.
* src/vscreen/curses++.h:
Doh, make it compile (forgot to #undef the macros and dropped
some paramters from mvget_wch).
* src/vscreen/curses++.h:
Expose wget_wch and mvwget_wch as methods on cwindow.
* src/vscreen/vs_button.cc, src/vscreen/vs_button.h:
Add a variant constructor for wstrings.
* src/vscreen/transcode.cc, src/vscreen/transcode.h:
Add a transcode variant that changes strings from wide character
codings to multibyte codings.
* src/pkg_view.cc:
When altering the column format of a view, transcode the input
column template.
* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
Add an overloading of set_text that accepts wstrings.
* src/pkg_ver_item.cc:
Store the output of the columnizer in a wstring.
* src/Makefile.am, src/pkg_item_with_subtree.cc, src/pkg_item_with_subtree.h:
Doh, of course since pkg_i_w_s is templated, all its method
implementations have to go in the .h (ew).
* src/pkg_item.cc:
Store the output of the columnizer in the right type.
* src/pkg_columnizer.cc:
Oops, missing std::.
* src/pkg_columnizer.cc, src/pkg_columnizer.h:
Make the column name formatter return a wstring.
* src/pkg_columnizer.cc:
Transcode column definitions before parsing.
* src/pkg_columnizer.cc:
Mark an overlooked string for translation.
* src/vscreen/columnify.cc, src/vscreen/columnify.h:
Add an implicit transcoding constructor for column_disposition.
2005-06-25 Daniel Burrows <dburrows@debian.org>
* src/load_pkgview.cc:
When parsing column information, transcode it to a wide
character set first.
* src/Makefile.am, src/pkg_item_with_subtree.cc, src/pkg_item_with_subtree.h:
Transcode the package name to force it into the wide character
set; move the column-generation function for the
item-with-subtree class into a .cc file to avoid polluting other
headers with too much junk.
* src/vscreen/curses++.h, src/vscreen/vscreen_widget.h:
Expose the addwstr family of functions.
* src/broken_indicator.cc:
Fix two calls to join_fragments().
* src/cmdline/cmdline_show.cc:
Fix a number of calls to join_fragments() to use wide joining
strings, and extract the character text using ().ch, not
()&A_CHARTEXT.
* src/cmdline/cmdline_search.cc:
Transcode the format string specified by the user for displaying
search results.
* src/vscreen/fragment.cc:
Rewrite the clipbox for wide characters.
* src/vscreen/fragment.cc:
Fix the fill algorithm to compile, and rewrite the hard-wrapping
algorithm to handle wide characters.
* src/vscreen/fragment.cc:
Rewrite the fill algorithm to handle wide characters.
* src/vscreen/fragment.cc:
Rewrite the main flow algorithm to handle wide characters (i.e.,
separate the concepts of "visible width" and "character count").
* src/vscreen/columnify.cc, src/vscren/columnify.h, src/vscreen/config/column_definition.cc, src/vscreen/config/column_definition.h:
Rewrite the columnification code to handle wide characters
properly: you can include literal wide characters in the
configuration, and multi-column wide characters are accounted
for in calculating widths.
* src/vscreen/transcode.cc:
Get rid of the use of auto_ptr and new[], they aren't really
appropriate here. Use good old malloc/realloc/free calls to
manage our dynamic store.
* src/vscreen/transcode.cc:
Use nl_langinfo(), not localeset(), to find out what the current
charset is when transcoding.
* src/vscreen/curses++.cc:
Fix the generation of attributes+wide characters to preserve
color information.
* src/vscreen/transcode.cc:
Doh, correct the actual name of the transcoding function.
Everything links now.
* src/vscreen/vs_button.cc, src/vscreen/vs_layout_item.cc, src/vscreen/vs_layout_item.h:
Update places where chstring was explicitly used to call on
fragment_line instead; factor some common code in
vs_layout_item::paint and vs_layout_item::vs_layout_line::paint
into vs_layout_item::paint_line.
* src/vscreen/vscreen_widget.h:
Mirror the new cwindow addstr routines in vscreen_widget.
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
Instead of requiring a separate function to be called for
transcoding, just overload text_fragment (NB: is this wise?).
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/fragment_contents.h:
Use wide character strings internally to format text fragments,
and require explicit conversion of std::strings.
* src/vscreen/curses++.h:
Add a convenience constructor to build a wchstring by repeating
a wchar_t.
* src/vscreen/curses++.cc, src/vscreen/curses++.h:
Add a preliminary, very hacky, routine to output wide-character
strings.
* src/vscreen/Makefile.am, src/vscreen/transcode.cc, src/vscreen/transcode.h:
Add support code to wrap iconv in a simpler (less efficient)
interface.
* src/vscreen/curses++.h:
Fix formatting errors in a comment.
2005-06-22 Daniel Burrows <dburrows@debian.org>
* src/pkg_tree.cc:
Make the package tree progress bar actually move (I forgot to
increment its progress! Oops).
* src/vs_progress.cc:
Done() just indicates that a suboperation completed, not that
everything completed. Don't hide() the widget in Done()
(anyway, it'll get hidden when it's destroyed).
* src/generic/aptcache.cc:
Disable auto-installation of dependencies when restoring package
states, to make sure we reproduce the state the user expects and
to avoid ordering bugs (my goodness, how did this big gaping
monster manage to avoid detection for so long?).
Closes: #315359
2005-06-22 Luk Claes <luk@debian.org>
* Updated Dutch translation
Closes: #315376
2005-06-22 Michal Politowski <mpol@charybda.icm.edu.pl>
* Updated Polish translation
Closes: #315338
2005-06-21 Dennis Stampfer <seppy@debian.org>
* Small German translation update by Jens Seidel
2005-06-18 Darius Zitkevicius <skystis@splius.lt>
* Updated Lituanian translation
Closes: #314643
2005-06-16 Miroslav Kure <kurem@upcase.inf.upol.cz>
* Updated Czech translation
Closes: #314328
2005-06-15 Yongtao Yang <yongtao.yang@telia.com>
* Updated Simplified Chinese translation
Closes: #314330
2005-06-15 Daniel Burrows <dburrows@debian.org>
* src/broken_indicator.cc:
Fix the generation of the solution summary: due to a logic error,
cancelled installations were being counted as installations rather
than keeps.
* src/vscreen/curses++.cc, src/vscreen/curses++.h:
Fix the missing reference to operator=(wstring&) in wchstring by
removing it and just writing it into the constructor where it was
used.
* src/vscreen/config/style.h, src/vscreen/curses++.cc, src/vscreen/curses++.h:
Add definitions of a chstring-analogue for wide-characters (it
stores wide characters combined with attributes). Currently this
isn't used anywhere; that's the next step of UTF8ization.
2005-06-15 Jens Seidel <jensseidel@users.sf.net>
* Spellcheck German translation
Closes: #313663
2005-06-15 Yuri Kozlov <yuray@id.ru>
* Update Russian translation
Closes: #313619
2005-06-15 dooteo <dooteo@euskalgnu.org>
* Update Basque translation
2005-06-13 Bjørn Steensrud <bjornst@powertech.no>
* Update Norwegian Bokmal translation
Closes: #313459
2005-06-13 Ruben Porras <nahoo82@telefonica.net>
* Update Spanish translation (still incomplete)
Closes: #313412
2005-06-13 Jaakko Kangasharju <ashar@iki.fi>
* Complete Finnish translation
Closes: #313450
2005-06-13 Stanislav Valášek <valasek@fastmail.fm>
* Complete Slovak translation. Closes: #309824
2005-06-13 Christian Perrier <bubulle@debian.org>
* src/cmdline/cmdline_prompt.cc: Corrected typo : "modifaction"
Closes: #313322
2005-06-13 Clytie Siddall <clytie@riverland.net.au>
* Completed Vietnamese translation. Closes: #313321
2005-06-13 Daniel Burrows <dburrows@debian.org>
* src/generic/apt.cc:
Make the read-only-ness warning more explicit (Closes: #313417)
2005-06-08 Daniel Burrows <dburrows@debian.org>
* src/vscreen/config/colors.cc, src/vscreen/config/colors.h, src/vscreen/curses++.cc:
Call init_colors() from init_curses(), and don't call it from the
color-handling routines. This makes it safe to perform 'dummy'
color mixing when Curses isn't initialized (for instance, when
formatting text from the command-line).
* src/cmdline/cmdline_show.cc, src/solution_fragment.cc:
Fix several places where aptitude could crash because I forgot
that PkgFileIterator::Archive can return a NULL pointer.
(Closes: #312553)
2005-06-08 Christian Perrier <bubulle@debian.org>
* po/fi.po: Overtranslation corrected. Closes: #312311
2005-06-07 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_util.cc:
Implement the file viewer as a specialized OK dialog.
* src/vscreen/vscreen.cc:
Force edit-line widgets to always appear white-on-black, even in
A_REVERSE environments.
* src/generic/matchers.cc, src/generic/matchers.h:
Add an option to parse_matcher that causes the matchers generated
for plain strings to match both names and descriptions.
* src/vscreen/fragment.cc:
Take the style of an indentbox's formatting from the surrounding
context.
* src/ui.cc:
Use %N in one appropriate place.
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
Add a %N escape that resets the current style to the empty style.
* src/ui.cc:
Remove several uses of %C or replace them with %S.
* src/load_config.h, src/ui.cc:
Call load_styles from ui.cc, not load_colors.
* src/view_changelog.cc:
Update the changelog viewer for the new display code.
* src/ui.cc:
Fix compilation by deleting a stray parenthesis.
* src/vscreen/vs_statuschoice.cc, src/vscreen/vs_statuschoice.h:
Update the statuschoice widget for styles.
* src/vs_progress.cc, src/vs_progress.h:
Update the vs_progress code for styles.
* src/ui.cc, src/ui.h:
Update the core UI code for styles.
* src/trust.cc:
Update the trust dialog for styles.
* src/solution_dialog.cc:
Update the solution dialog for styles.
* src/defaults.cc:
Make bullets 'transparent' (the style now only changes the
foreground color).
* src/reason_fragment.cc:
Update the generation of 'reason' fragments for styles.
* src/vscreen/fragment.cc:
Fix the composition of styles by style_fragments: instead of
composing our style with the enclosing style, compose the
enclosing style with our style (remember, composition is
noncommutative).
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
When generating a text fragment from a string and a style,
actually wrap it in a style fragment. (maybe I should just
include a style in every text fragment, to increase locality?
Probably doesn't really matter, though, and a lot of text
fragments don't need styles) This makes it easy to generate styled
text that does the right thing (i.e., where the style overrides
any outer styles rather than vice versa).
Also stopped using chstrings for text_fragments: they are almost
guaranteed to do the wrong thing anyway.
* src/pkg_view.cc:
Adjust the remaining bits of pkg_view to handle styles properly:
change paint()'s signature, and use set_bg_style instead of
set_bg.
* src/pkg_item.cc, src/pkg_item.h:
Extend the signature of pkg_item::paint() to properly override its
abstract ancestor, and adjust the code that sets the attributes of
a package item to be style-based.
* src/load_pkgview.cc, src/pkg_view.h:
Adjust the package view loading code to use styles rather than
colors, and change the package view structure to store a style
rather than a color.
* src/load_config.cc:
Change load_colors to load_styles.
* src/edit_pkg_hier.cc, src/edit_pkg_hier.h:
Update for the new display protocols; add missing copyright
boilerplate.
* src/download_screen.cc:
Use get_style instead of get_color.
* src/download_screen.h:
Extend the signature of download_tree::paint, so that it
implements the virtual method as expected.
* src/download_list.cc:
Adjust the download list code for styles.
2005-06-06 Daniel Burrows <dburrows@debian.org>
* src/download_item.cc:
Update the download item code to use styles instead of colors.
* src/download_bar.cc:
Update to use styles.
* src/dep_item.cc:
Fix the signature of pkg_depitem::paint().
* src/pkg_subtree.cc, src/pkg_subtree.h:
Adjust method signatures so all abstract methods are implemented.
* src/dep_item.cc, src/dep_item.h:
Change pkg_depitem::get_normal_attr to pkg_depitem::get_normal_style.
* src/pkg_ver_item.cc, src/pkg_ver_item.h:
Fix some confusion over the return type of pkg_ver_item::get_normal_style.
* src/pkg_item_with_subtree.h:
Change the signature of paint() to match its new signature in
vs_subtree.
* src/pkg_ver_item.cc, src/pkg_ver_item.h:
Adjust the attribute-selection methods to work with styles instead
of colors.
* src/pkg_ver_item.h:
Also fill in the virtual "paint" method of pkg_vertree_generic.
* src/pkg_ver_item.cc, src/pkg_ver_item.h:
Fill in the virtual method "paint" of pkg_ver_item.
* src/defaults.cc:
Change the assignment of default colors to an assignment of
default styles.
* src/broken_indicator.cc:
Update for styles.
* src/apt_options.cc:
Update the option dialog generation to use styles.
* src/apt_config_widgets.cc:
Don't bother setting the color of apt_bool_widget; this shouldn't
be necessary any more.
* src/desc_parse.cc:
Update the description parser for styles.
* src/mine/cmine.cc, src/mine/cmine.h:
Fix the minesweeper game for the new display system.
* src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_show.cc:
Adjust the command-line code to work properly with the new
fragment API (note: arguably a better approach is to add a routine
that does the layout and output of a fragment in one step).
* src/vscreen/vscreen_widget.cc:
Change both the widget's attributes and its background in
apply_style. I don't for the life of me know why this should be
necessary, but without it, buttons in dialog boxes don't display
properly.
* src/vscreen/vscreen.cc:
Fix the color of highlighted multiplexer tabs, and get rid of
unnecessary reverse attributes.
* src/vscreen/testvscreen.cc:
Also make sure that the scrollbar fills its vertical space. (this
change is needed to compensate for past adjustments in vs_table's
behavior)
* src/vscreen/testvscreen.cc:
Fix the creation of the main test screen so that the scrollbar is
visible again.
* src/vscreen/testvscreen.cc:
Get rid of no-longer-necessary uses of the removed %C escape.
* src/vscreen/vs_button.cc:
Don't drop character attributes from the enclosed text -- this is
safe now that we have cascading styles. This means that button
labels can have (for instance) highlighted characters.
* src/vscreen/vs_minibuf_win.cc:
Fix the minibuf window to set the basic style of its header and
status labels from the corrent style (use Status instead of
ScreenStatusColor).
* src/vscreen/config/colors.cc:
Correct color updating: use PAIR_NUMBER to retrieve the old pair
number (since color is now an attribute set, not a pair number).
* src/vscreen/vscreen.cc:
Fix menu coloration by putting full style information into each
menu style, rather than implicitly expecting the menu code to
inherit from the "Menu" style (which it doesn't).
* src/vscreen/config/colors.cc, src/vscreen/config/colors.h, src/vscreen/config/style.h:
Further fixes to how styles and colors are applied to characters.
mix_color now operates on attribute values and returns an
attribute value, and the appropriate bits of code have been
updated to reflect this change.
* src/vscreen/vscreen.cc:
Remove some uses of the NOP style_attrs_on(0).
* src/vscreen/config/style.h:
Fix the composition of styles by including information from both
styles, not just the last one (doh).
* src/vscreen/config/style.h:
Fix part of the problem with compositing styles: previously,
colors only got overwritten if they were *currently*
nontransparent (correct behavior would be to only use
nontransparent colors to overwrite the existing colors).
* src/vscreen/vscreen_widget.cc:
Initialize pre_display_erase to 'true' in the constructor.
* src/vscreen/vscreen.cc:
Fix some style definitions.
* src/vscreen/vs_label.cc:
Fix an infinite recursion in vs_label::set_text.
* src/vscreen/curses++.cc:
Add a missing definition of chstring::chstring.
* src/vscreen/testvscreen.cc:
Update the test program to use styles instead of attributes.
* src/vscreen/vs_editline.cc, src/vscreen/vs_editline.h:
Update the line-editor widget for the new display protocol.
* src/vscreen/vs_pager.cc:
Update the pager for the new display protocol.
* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Update the vscreen dialog utilities to use styles instead of
attributes.
* src/vscreen/vs_scrollbar.cc, src/vscreen/vs_scrollbar.h:
Update the scrollbar widget to the new display protocol.
* src/vscreen/vs_text_layout.h:
D'oh, update the signature of freshen_contents() and make lastst
non-const.
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Finish updating the text_layout widget: include style information
in its cache and handle the enclosing style environment in
paint().
* src/vscreen/vscreen_widget.cc:
Always set the display attributes of a widget to its basic style,
even if it's non-opaque. No change to current behavior as all
existing transparent widgets are also invisible except for their
subwidgets.
* src/vscreen/vs_table.cc, src/vscreen/vs_table.h:
Update the vs_table widget for the new display protocol.
* src/vscreen/vs_togglebutton.cc:
Update the vs_togglebutton widget for the new display protocol.
* src/vscreen/vs_text_layout.cc:
Update the text layout widget to use the new display protocol.
* src/vscreen/vs_stacked.cc, src/vscreen/vs_stacked.h:
Update the stacked widget to use the new display protocol.
* src/vscreen/vs_size_box.cc:
Update the size-box to use set_opaque() instead of set_bg().
* src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_minibuf_win.:h:
Update the minibuf-win for the new display protocol.
* src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h:
Update the multiplexer for the new display protocol.
* src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h:
Update the menubar for the new display protocol.
2005-06-04 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Update menus for the new display protocol.
* src/vscreen/vs_layout_item.cc, src/vscreen/vs_layout_item.h:
Handle the new display protocol.
* src/vscreen/vs_subtree.h:
Update a few minor things in vs_subtree (particularly
added code to avoid string copies).
* src/vscreen/vs_tree.cc, src/vscreen/vs_tree.h, src/vscreen/vs_treeitem.cc, src/vscreen/vs_treeitem.h:
Update the core tree code to the new display protocol.
* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
Update the label widget to the new display protocol.
* src/vscreen/vs_editline.cc:
Update the edit-line widget to the new display protocol.
* src/vscreen/vs_frame.cc, src/vscreen/vs_frame.h:
Update the frame widget to the new display protocol.
* src/vscreen/vs_center.cc:
Update the center widget to the new display protocol.
* src/vscreen/vs_bin.cc, src/vscreen/vs_bin.h:
Update the bin widget to the new display protocol.
* src/vscreen/fragment.h:
Add a note clarifying the guarantees provided by layout().
* src/vscreen/vs_button.cc, src/vscreen/vs_button.h:
Fix the vs_button class for the new display protocol.
* src/vscreen/vscreen_widget.cc:
Properly pass style information into the paint() call.
* src/vscreen/config/style.h:
Make several operators const that should be and weren't.
* src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
Remove the stack of styles, it's the Wrong Way to do things. (if
this were Lisp, a with-style macro would be appropriate, but it's
not so it isn't) Instead, just let the user directly set the
current text attributes based on a full style.
2005-06-02 Tetralet <tetralet@pchome.com.tw>
* po/zh_TW.po: Updated from sarge branch. Closes: #311587
2005-05-26 Ruben Porras <nahoo@inicia.es>
* po/es.po: Various updates
2005-05-26 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
Fix some compilation problems with the new stuff.
* src/vscreen/vscreen_widget.h:
Add in a per-widget stack of styles to be used when drawing the
widget.
* src/vscreen/config/style.h:
Take the color data into account when generating attrs from a
style.
2005-05-26 Christian Perrier <bubulle@debian.org>
* po/fr.po: Typo corrections from sarge branch
2005-05-20 Stanislav Valáše k <valasek@fastmail.fm>
* po/sk.po: Updated. Closes: #309824
2005-05-10 Daniel Burrows <dburrows@debian.org>
* src/vscreen/fragment_cache.cc:
Fix the compilation errors in fragment_cache. Note: the cache now
updates itself based on its last known style; would it make any
sense to keep a map of styles for fragments whose formatting
changes?
* src/vscreen/config/style.h:
Write operator== and operator!=.
* src/vscreen/fragment.cc:
Fix compile errors.
* src/vscreen/curses++.cc, src/vscreen/curses++.h:
Add some new constructors to chstring that will be needed later;
remove direct attribute manipulation and replace it with style
adjustment.
* src/vscreen/config/colors.cc:
Fix a silly compile error.
* src/vscreen/config/style.h:
Add an interface to apply a style to a chtype value.
* src/vscreen/config/colors.cc, src/vscreen/config/colors.h:
Add an interface to 'mix' colors.
2005-05-08 Daniel Burrows <dburrows@debian.org>
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
Rewrite the fragment code to handle styles.
* src/vscreen/vscreen.cc, src/vscreen/vs_minibuf_win.h, src/vscreen/vs_treeitem.h:
Make vscreen.cc compile, and change some 'get the color' routines
to 'get the style'. Note that 'normal' colors now just correspond
to an empty style!
* src/vscreen/config/style.h:
Oops, use attrs_on, not attr_on.
* src/vscreen/config/style.cc, src/vscreen/config/style.h:
Cancel that; instead, just return a 'null' style. I'd like to
have unknown styles blow up, but that has other problems
(especially when the user is allowed to create screen regions and
specify their styles).
* src/vscreen/config/style.cc, src/vscreen/config/style.h:
Throw an exception if a style is missing, rather than just
silently creating a new style.
* src/vscreen/config/style.h:
Add factory routines to make it easy to generate canned styles.
2005-05-07 Daniel Burrows <dburrows@debian.org>
* src/vscreen/config/colors.cc, src/vscreen/config/colors.h:
Change the color database to allow orthogonal selection of fg/bg
colors. Now nothing compiles. Whee!
* src/vscreen/config/Makefile.am, src/vscreen/config/styles.cc, src/vscreen/config/styles.h:
Add basic support for styles that allow you to override the
surrounding character attributes orthogonally.
2005-05-05 Daniel Burrows <dburrows@debian.org>
* src/main.cc:
Make it compile without them.
* src/main.cc:
Remove the utf8 guards in main.
* configure.ac, src/vscreen/curses++.h:
Start using ncursesw instead of straight curses.
2005-05-04 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/model.tex:
More Stuff[tm] -- wrote up some comments on Recommends, added a
Future Work section.
* src/generic/problemresolver/model.tex:
Edit a bunch of stuff in the document, and write up that second proof.
2005-05-01 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Document the change to StepLimit.
* src/generic/aptcache.cc:
Live dangerously: bump the default StepLimit to 5000. It seems
from empirical tests that the various changes to the problem
resolver -- especially the 'forbidden' version tests, forced
installations, and the reduction of the branching factor -- have
made longer searches feasible; also, some interesting test cases
(like 'aptitude -s -t experimental dist-upgrade') need more steps
to complete.
* src/cmdline/cmdline_resolver.cc:
Give up, don't loop forever, if the user asks to terminate a
search.
* src/generic/aptcache.cc:
Bump the default StepLimit to 500, to deal with the fact that some
interesting problems are a bit too hard for 100.
* src/generic/aptitude_resolver.h:
Fix reversed logic in checking whether a Conflicts is broken.
* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Fix a mistake in how successors are generated -- of course we have
to test the dependencies of the new version being installed as
well!
* src/solution_fragment.cc:
Fix a silly thinko that caused segfaults when trying to display
problem solutions.
* src/generic/problemresolver/Makefile.am:
Uh, yeah, also distribute the problem resolver's header file.
* src/generic/problemresolver/Makefile.am:
Distribute more problemresolver-related stuff, including the TeX
file explaining how it all works.
* po/*.po, po/aptitude.pot:
Ran "make dist" and update-po.
* src/generic/Makefile.am:
Add problemresolver to the "official" source tree as seen by
automake.
* NEWS, configure.ac, doc/en/aptitude.xml:
Bump version to 0.3.2.
* doc/en/manpage.xml:
Oops, fix a link target to actually work.
* src/cmdline/cmdline_action.cc:
Actually support keeping packages from the command-line prompt, as
advertised.
* po/*.po, po/aptitude.pot:
Run update-po again.
* doc/en/manpage.xml:
Further correct the manual page to adjust for the new stuff in
0.3.2.
* configure.ac:
Add vi to ALL_LINGUAS (it was left out..oops).
* Everything:
Merge with the stable branch up to r3238. In order to keep from
going nuts, though, I held out most of the .po changes (they seem
to be impossible to automatically merge).
* doc/en/manpage.xml:
Minor tweaks to more accurately reflect the way the world works
now.
--------------- END MERGE FROM 0.2.x ---------------
2005-04-28 Carlos Z.F. Liu <carlosliu@users.sourceforge.net>
* Correct both Chinese translations for "DL size".
Closes: #306361
2005-04-27 Clytie Siddall <clytie@riverland.net.au>
* Added Vietnamese translation.
2005-04-24 Inaki Larranaga Murgotio <dooteo@euskalgnu.org>
* Complete Basque translation. Closes: #275704
2005-04-20 Daniel Burrows <dburrows@debian.org>
* doc/en/manpage.xml:
Document dist-upgrade (with prodding from Branden).
Closes: #268697.
2005-04-17 Sorin Batariuc <sorin@bonbon.net>
* Complete Romanian translation. Closes: #305282
2005-04-17 Danilo Piazzalunga <danilopiazza@libero.it>
* Complete Italian translation. Closes: #304906
2005-04-11 Luk Claes <Luk.Claes@UGent.be>
* Complete Dutch translation. Closes: #304210
2005-04-06 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml, doc/cs/aptitude.xml, doc/fr/aptitude.xml, doc/de/aptitude.xml, doc/fi/aptitude.xml:
Just to be completely safe, use DocBook 4.2 for now
(not 4.3, which is also available).
* doc/en/aptitude.xml, doc/cs/aptitude.xml, doc/fr/aptitude.xml, doc/de/aptitude.xml, doc/fi/aptitude.xml:
Make sure to use file: URLs, not http: URLs, for retrieving
the DTD.
2005-04-04 Konstantinos Margaritis <markos@debian.org>
* Complete Greek translation. Closes: #302851
2005-04-02 Olivier Trichet <trichet.olivier@ec-lille.fr>
* Make French documentation consistent with the program
translation
2005-03-29 Miroslav kure <kurem@upcase.inf.upol.cz>
* Complete Czech translation. Closes: #302107
2005-03-29 Ryan Escarez <rescarez@gmail.com>
* First Tagalog translation. Closes: #302085
2005-03-29 Luk Claes <luk.claes@ugent.be>
* Really completed Dutch translation. Closes: #301809
2005-03-28 Miguel Figuereido <elmig@debianpt.org>
* Completed Portuguese translation. Closes: #301830
2005-03-28 Luk Claes <luk.claes@ugent.be>
* Completed Dutch translation. Closes: #301809
2005-03-28 Daniel Burrows <dburrows@debian.org>
* po/*.po:
Ran update-po.
* src/cmdline/cmdline_prompt.cc:
Use a more formal wording for the security prompt.
2005-03-28 Christian Perrier <bubulle@debian.org>
* Completed French translation (to be proofread)
2005-03-26 Daniel Burrows <dburrows@debian.org>
* po/*.po:
Re-run update-po again.
* po/lt.po:
Update the Lithuanian translation (same bug).
* src/cmdline/cmdline_prompt.cc:
Use "Yes"/"No", not "yes"/"no" to make translations work better.
* doc/fr/Makefile.am:
Oops, distribute the mysterious "fixman" program.
* configure.ac, doc/cs/aptitude.xml, doc/de/aptitude.xml, doc/en/aptitude.xml, doc/fi/aptitude.xml, doc/fr/aptitude.xml:
Bump the version to 0.2.15.9.
* po/*:
Run update-po.
* po/POTFILES.in:
Add trust.cc and trust.h.
* doc/fr/Makefile.am:
Make the French documentation compile instead of blowing up.
* configure.ac:
Same for doc/fr/images/Makefile.
* configure.ac:
Actually generate doc/fr/Makefile.
* src/pkg_columnizer.cc:
Make sure it compiles against the older apt version.
* src/pkg_columnizer.cc, src/pkg_columnizer.h, src/pkg_ver_item.cc:
Backport the column display of untrusted packages.
* src/defaults.cc:
Backport a default color for TrustWarning.
* src/Makefile.am, src/pkg_info_screen.cc, src/pkg_view.cc, src/trust.cc, src/trust.h:
Backport the display of trust info in the package information
displays.
* src/cmdline/cmdline_prompt.cc:
Add a security warning prompt to the command-line mode.
* src/generic/apt.cc, src/generic/apt.h, src/ui.cc:
Backport the apt 0.6 support (compiled out by default, unless
you compile aptitude on a system with apt 0.6).
* src/download_item.cc:
Fix the compile failure with apt 0.6 (use conditional
compilation to compile the right version of the code depending
on the version of apt that's in use).
* NEWS:
Start preparing a new release (mostly translations).
2005-02-16 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Correct a major oversight in the documentation of Delete-Unused:
the documentation stated that packages matching it would be the
only things deleted, whereas it's packages that DON'T match it
that will be the only things deleted.
Probably this was originally a coding error, but in the stable
branch I won't change the name or behavior of the option, so the
documentation is getting fixed instead.
Thanks to Michael Vogt for pointing this out.
2005-02-02 Dennis Stampfer <seppy@debian.org>
* Correcting German shortcut for cleaning cache
in de.po: Closes: #293127
2005-01-28 Christian Perrier <bubulle@debian.org>
* Corrected Lithuanian translation by
Darius Zitkevicius
Closes: #280049
2005-01-19 Christian Perrier <bubulle@debian.org>
* Corrected Traditional Chinese translation
and help file. Closes: #290284
2005-01-05 Christian Perrier <bubulle@debian.org>
* Corrected Dutch translation. Closes: #288815
----------------- BEGIN MERGE FROM 0.2.x --------------------
2005-05-01 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/test.cc:
Fix dummy_universe::broken_under (it was returning false for all
dependencies except totally unsatisfiable ones (i.e., deps with
no solvers whatsoever).
* src/generic/problemresolver/test.cc:
Always enable debugging.
* src/generic/problemresolver/test.cc:
Fix a refcounting error.
* src/generic/aptcache.cc:
Fix the dumper to conform to the test input format.
* src/generic/problemresolver/test.cc:
Remove a now-unnecessary try/catch pair, reindent a lot of stuff
as a result.
* src/generic/problemresolver/test.cc:
Fix a crash that occured when an error was encountered in
parsing a test file: the resolver copied the universe, which had
references to the package objects, and hence the packages got
double-deleted. Now universes are reference-counted and it's
the references that are copied around, so the problem should go
away.
* src/generic/problemresolver/problemresolver.h:
When dumping version scores, actually write the scores instead
of just writing which versions have non-zero scores.
* src/cmdline/cmdline_resolver.cc:
Add support for dumping the resolver state from the
command-line. (enter a tilde)
* doc/en/aptitude.xml, src/defaults.cc, src/ui.cc:
Add support for dumping the resolver state to a file from the
visual interface.
* doc/en/aptitude.xml:
Add a brief overview of the command-line resolver interface to
the documentation, and fix a minor typo.
* src/cmdline/cmdline_prompt.cc:
Before, if the list of actions had not been modified by the time
they were displayed, the prompt would be skipped even if some
packages were broken. Now, if packages are broken, we always
continue to the prompt (including the resolver).
* doc/en/aptitude.xml:
Finish documenting the new configuration options.
* src/generic/aptitude_resolver.cc:
When tweaking scores based on priority, don't tweak the score of
the not-installed version.
2005-04-30 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml:
Start documenting the new configuration options.
* doc/en/aptitude.xml, doc/en/images/views-tab-bar.png:
Document the business with having tab-bars at the top of the
display.
* doc/en/aptitude.xml:
Document the new keybindings.
* doc/en/aptitude.xml:
Move a tip around to a place where it will make more sense soon.
* doc/en/aptitude.xml:
Update the tutorial on broken dependencies to discuss the new
dependency resolver.
* src/generic/problemresolver/model.tex:
Further description of the algorithm.
* src/generic/aptcache.cc:
Make packages installed/removed by the resolver get marked as
"automatic" (using a new changed_reason value).
* src/solution_dialog.cc:
Make the top row of the dialog shrinkable, so the buttons never
disappear -- even if it gets too tall.
* src/solution_dialog.cc:
Fix up the layout options in the solution dialog. The most
important change is that the button box is now shrinkable, which
in turn means that the scrollbar will always be visible (because
the first column of the table will be preferentially shrunk).
* src/cmdline/cmdline_prompt.cc:
After running the resolver, always fall out to the main loop, so
that a new preview gets displayed before the prompt is shown
again.
* src/cmdline/cmdline_download.cc, src/cmdline/cmdline_progress.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_search.cc, src/cmdline/cmdline_show.cc, src/main.cc:
Quit running update_screen_width all over the place in
command-line mode; instead, set up a SIGWINCH handler and read
the screen width for the first time in main.
* src/cmdline/cmdline_do_action.cc:
Get rid of the separate resolve step prior to prompting, which
should make the command-line interaction a bit nicer.
* src/cmdline/cmdline_prompt.cc:
Display the prompt help using fragments, so it gets properly
flowed.
* src/cmdline/cmdline_resolver.cc:
Remove an unneeded flowbox, make indentation work correctly
(remember: indentboxes go *outside* flowboxes).
* src/cmdline/cmdline_do_action.cc:
Support the new action flags and stuff in the name-mangling
code.
* src/cmdline/cmdline_action.cc, src/cmdline/cmdline_common.h, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.h:
Add support for manipulating the automatic flag from the
command-line prompt.
* src/cmdline/cmdline_resolver.cc:
Add a space after the resolver prompt string.
* src/cmdline/cmdline_action.cc, src/cmdline/cmdline_common.h, src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc:
Add a 'keep' action (invoked via ':') to the command-line
prompts.
* src/cmdline/cmdline_action.cc, src/cmdline/cmdline_action.h, src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_resolver.h:
Add support for modifying package states from the resolver
prompt; in the process, moved the routine responsible for doing
this from cmdline_prompt.cc to cmdline_action.cc.
* src/cmdline/cmdline_resolver.cc:
Fix some of the formatting problems with the resolver help text.
Introduce help for not-yet-extant commands.
* src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/problemresolver/problemresolver.h:
Add support in the cache abstraction for dumping the resolver
state (including, importantly, the current set of version
scores).
* src/generic/problemresolver/test.cc, src/generic/problemresolver/test1.txt:
Fix the test code to work with the new problem resolver.
* src/generic/aptitude_resolver.h:
Adjust the get_name() routine of versions to mangle versions
when several versions with the same name are available.
* src/generic/aptcache.cc:
Default score tweaking: double the penalty for broken deps, make
infinity much larger, and only work with the first dependency
that generates successors, rather than generating all possible
successors; this is done in order to decrease the branching
factor. In theory only looking at a single dep could generate
worse solutions overall, but it seems to work OK in my tests.
Also, only check up to 100 solutions before giving up!
* src/generic/problemresolver/problemresolver.h:
Right, only spew if debug is enabled.
* src/generic/problemresolver/problemresolver.h:
When generating the successors of a solution, detect "forced"
installs (i.e., installs which must be in any successor
solution, such as deps that have only one solver) and perform
them immediately. In the process, refactored and complicatified
the problem resolver.
* src/generic/problemresolver/problemresolver.h:
Actually drop attempts to install "forbidden" package versions.
* src/generic/problemresolver/problemresolver.h:
Add basic support for maintaining a list of "forbidden" package
versions that varies by solution.
2005-04-29 Daniel Burrows <dburrows@debian.org>
* po/POTFILES.in, po/*.po:
Update POTFILES (oops, forgot to do that for a while) and run
'make update-po'.
* src/cmdline/cmdline_resolver.cc:
Be less strict about obeying command-line instructions, to avoid
spending lots of time searching really bad solutions if the user
asks for something impossible.
* src/cmdline/cmdline_resolver.cc:
Oops, iterate over the whole version list, not just the part of
it that follows the current version.
* src/cmdline/cmdline_resolver.cc:
Uninvert the tweaking logic: now, instead of giving a bonus to
removal if the user *didn't* ask for a package to be removed, we
give a bonus to removal if the user *did* ask for a package to
be removed.
* src/cmdline/cmdline_resolver.cc:
When tweaking scores, generate an end iterator (not an invalid
iterator) for the UNINST version.
* src/generic/aptitude_resolver.h:
Add some asserts to cache situations that shouldn't happen.
* src/generic/problemresolver/problemresolver.h:
Right, test subset-inclusion in the correct order...
* src/ui.cc:
Fix some typos in various strings that were pointed out by the
Vietnamese translator.
2005-04-28 Daniel Burrows <dburrows@debian.org>
* src/generic/aptitude_resolver.h, src/generic/aptitude_resolver.cc, src/generic/problemresolver/problemresolver.h:
Fix a monumentally stupid decision (storing references to a
universe in the problem resolver), fixing the segfault caused by
the previous segfault's fix.
* src/cmdline/cmdline_dump_resolver.cc, src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Carry a backpointer to the cache around in all the resolver glue
code, to avoid segfaulting if apt_cache_file is uninitialized
when we're called (e.g., if packages are broken on startup).
* src/cmdline/cmdline_resolver.cc:
Fix a very stupid infinite loop bug.
* src/generic/problemresolver/problemresolver.h:
Ignore any solution that's a subset of another solution.
* src/generic/problemresolver/problemresolver.h:
Write in a definition of operator!= for solutions -- I don't
know where the default was coming from, but it's wrong, wrong,
WRONG.
* src/generic/problemresolver/problemresolver.h:
Fix an ugliness in the debugging output.
* src/cmdline/cmdline_resolver.cc:
Use the new hooks to enable debugging based on the option
Aptitude::CmdLine::Resolver-Debug.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add hooks for enabling resolver debugging.
* src/cmdline/cmdline_resolver.cc:
Streamline the "reject solution" command.
* src/cmdline/cmdline_resolver.cc:
Doh, C++ varargs have to be explicitly terminated; do that
instead of crashing.
* src/main.cc:
Add debugging catches to trap unhandled exceptions.
* src/cmdline/cmdline_action.cc, src/cmdline/cmdline_action.h, src/cmdline/cmdline_do_action.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_prompt.h, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_resolver.h, src/cmdline/cmdline_show_broken.cc, src/cmdline/cmdline_show.cc, src/cmdline/cmdline_show.h, src/cmdline/cmdline_simulate.cc, src/cmdline/cmdline_simulate.h, src/cmdline/cmdline_upgrade.cc, src/cmdline/Makefile.am:
Start work on hooking the new resolver into the command-line.
The new approach works by having a sub-loop that gets entered if
broken dependencies are detected at the command-line prompt.
* src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/problemresolver/problemresolver.h:
Add provisions for adjusting package scores before running the
resolver.
2005-04-27 Daniel Burrows <dburrows@debian.org>
* src/main.cc:
Ignore -s when running in interactive mode. (Closes: #243192)
* src/vscreen/vs_multiplex.cc:
Recognize mouse clicks on the "tabs".
* src/download.cc, src/pkg_item.cc, src/pkg_ver_item.cc, src/ui.cc, src/ui.h, src/view_changelog.cc:
Use tabs for the main multiplex.
* doc/en/aptitude.xml, src/vscreen/vscreen.cc:
Use less vomit-inducing default colors for multiplex tabs.
* src/vscreen/vs_multiplex.cc:
Use the correct addstr() variant; the chstring variant is a bit
broken right now :( (and of course it doesn't preserve
attributes).
* src/vscreen/testvscreen.cc:
Enable tabs in the test program.
* src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h:
Oh yeah, make it possible to actually turn on the tab support.
* doc/en/aptitude.xml, src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h, src/vscreen/vscreen.cc:
Add theoretical support for 'tabbed' multiplexes (untested as
yet). In order to do this properly, I had to extend the
vs_multiplex API and rewrite its internals to represent each
child using an actual structure.
* src/main.cc:
Hook the layer of indirection up to "dump errors to cerr" before
executing command-line requests.
* src/generic/apt.cc, src/generic/apt.h, src/ui.cc:
Add a layer of indirection (a signal) between the request to
clear the error list and the clearing of the error list. Among
other things, this means that the command-line no longer
segfaults when errors occur.
* src/ui.cc:
Use the new support in vs_text_layout to not open tons of
extraneous error dialogs (instead we just reuse the existing
ones).
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Add a way to append text to a vs_text_layout 'after the fact'.
* src/generic/apt.cc:
Hackily avoid discarding the error list by instead asking the UI
to clear it out for us (making sure that errors don't get lost).
(Closes: #160418)
* doc/en/aptitude.xml, src/generic/matchers.cc:
Make ~ahold find packages that are actually *held*. ~akeep now
finds packages upon which no action is being taken; the old
meaning of ~ahold is available via "~U~akeep".
(Closes: #216730)
* src/apt_info_tree.cc, src/apt_info_tree.h, src/ui.cc:
Apply a similar treatment to the various apt_info_trees: create
a method that explicitly re-issues the various signals, and tell
the user to invoke it after connecting said signals.
* src/pkg_tree.cc, src/pkg_tree.h, src/ui.cc:
Don't implicitly build a pkg_tree when it's created. Instead,
expect the caller to call build_tree() once the tree is fully
hooked up. This avoids the inconsistencies caused by the tree's
signal getting emitted before it's connected to anything.
* src/vscreen/vs_text_layout.cc:
Fix the caching of text layouts: the 'lastw' variable wasn't
being updated, so the layout always looked stale!
* src/vscreen/vs_tree.cc:
Remove the grotesque hack of calling highlighted() in paint();
among other things, it was responsible for making everything
slow when the user was scrolling around the description area.
* src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
Put a cap on how many successors will be generated for any given
dep. This is sufficient to generate all solutions (albiet
possibly in a bad order); for simple problems (where everything
worked already) it has no effect if the cap is large enough; and
it should produce reasonable results for complicated programs.
* src/generic/aptcache.cc:
Penalize brokenness less again; placing too high a bounty on
fixing broken deps makes solutions turn up in the wrong order.
* src/generic/aptcache.cc:
Make infinity smaller and penalize brokenness more. Now if
aptitude goes nuts (although I should do more to stop this) it
at least won't eat all your virtual memory before figuring out
that no solutions exist. This is a bit of a hack, though..
* src/generic/problemresolver/problemresolver.h:
Incrementally calculate the new score, and abort as soon as it
drops below minimum_score.
* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
Add a 'broken_under' method to the aptitude_resolver_dep class,
and use it in the problem resolver to (hopefully) speed up
checking whether dependencies are broken in a given solution.
* src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
Add basic support in the problem-resolver for specifying
"infinity" -- a boundary for solution badness beyond which all
solutions are dropped.
* src/generic/aptcache.cc:
Decrease the default max_steps value so that hard-to-resolve
problems don't cause aptitude to lock up. (not very successful
yet)
* src/vscreen/config/keybindings.cc, src/vscreen/keybindings.h:
Make a global readable_keyname as well.
* src/vscreen/config/keybindings.cc, src/vscreen/config/keybindings.h:
Oops, properly declare the new keyname function.
* src/broken_indicator.cc, src/solution_dialog.cc, src/ui.cc, src/vscreen/testvscreen.cc, src/vscreen/vs_menu.cc:
Use the readable_keyname function as appropriate.
* src/vscreen/config/keybindings.cc, src/vscreen/config/keybindings.h:
Add a 'readable_keyname' function, whose current useful feature
is that it maps ',' to ',' instead of 'comma'.
* src/pkg_item.cc:
Reflow some manually wrapped messages.
* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Add a vs_dialog_string variant that allows raw fragments to be
passed.
* src/download_bar.cc, src/download_list.cc:
Word the question less awkwardly.
* src/download_bar.cc, src/download_list.cc:
Flow the other media-change question, and get rid of an
unnecessary newline in both media-change questions (since the
text is wrapped now, there's no need to break after the first
half).
2005-04-26 Daniel Burrows <dburrows@debian.org>
* src/download_bar.cc:
Flow the media-change question.
* src/ui.cc:
Also flow the query regarding switching to the root account.
* src/ui.cc:
Wrap the menu descriptions in the status area and eliminate some
literal newlines (need to get rid of other literal newlines
elsewhere in the program...)
* src/vscreen/vs_label.cc:
Implement the fragment set_text and fix a memory leak.
* src/vscreen/vs_label.cc:
When no attribute is provided, the widget's background is used
to set default text attributes.
* src/vscreen/vs_util.cc:
Fix the canned dialogs to properly initialize the attributes of
their labels.
* src/vscreen/testvscreen.cc:
Fix the label test.
* src/vscreen/testvscreen.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
Add a attribute-less set_text; fix various places where it needs
to not be used.
* src/vscreen/vs_label.cc, src/vscreen/vs_label.h:
Make labels use fragments internally. IMPORTANT: this means
that implicit interpretation of \n and \t no longer works...
* src/apt_options.cc:
Use FILL appropriately so the buttons at the bottom of the
options dialogs get appropriately centered.
* src/ui.cc:
Use FILL so that we get a display that actually works.
* src/pkg_view.cc:
When setting up the description, insert all widgets with
EXPAND/FILL.
* src/vscreen/testvscreen.cc:
Fix the test program's use of EXPAND/FILL.
* src/vscreen/vs_table.cc:
Change the semantics of FILL/EXPAND: EXPAND only changes whether
a widget's row can be expanded; in order to expand the widget
itself you must also specify FILL. For backwards compatibility
and ease of use, the non-opts add_widget sets FILL if EXPAND is
set.
* src/apt_options.cc:
Put the Ok/Cancel button in a separate table.
* src/apt_config_widgets.cc:
Flow the text in the configuration button labels.
* src/vscreen/vs_togglebutton.cc, src/vscreen/vs_togglebutton.h:
For multiline toggles, make sure to put the cursor on the line
containing the toggle button. Also, choose that line according
to the widget size, not the text layout size; if the widget is
smaller than the text layout, only step up to its height when
drawing.
* src/vscreen/fragment_cache.cc, src/vscreen/fragment_cache.h, src/vscreen/vs_button.cc, src/vscreen/vs_button.h, src/vscreen/vs_togglebutton.cc:
Get the cache working, and use it to hold the fragments of
buttons.
* src/vscreen/fragment_cache.cc, src/vscreen/fragment_cache.h:
Add a special intermediate fragment widget that caches the
output of its contents.
* src/vscreen/vs_togglebutton.cc, src/vscreen/vs_togglebutton.h:
Fix the display of toggle buttons; in particular, make sure the
"check" gets lined up in the center of the button.
* src/vscreen/testvscreen.cc:
In the button test screen, use different settings to insert the
various buttons; make sure the buttons are center-aligned.
* src/vscreen/vs_button.cc:
Fix multi-line push-buttons.
* src/vscreen/testvscreen.cc:
Test multi-line fragments.
* src/vscreen/testvscreen.cc:
Test using actual fragments in button labels.
* src/vscreen/vs_togglebutton.cc:
Make sure the right half of the toggle button's check gets
displayed.
* src/vs_button.cc:
Don't go into infinite loops drawing buttons.
* src/vscreen/vs_button.cc, src/vscreen/vs_button.h, src/vscreen/vs_togglebutton.cc, src/vscreen/vs_togglebutton.h:
Add basic support for using fragments as button labels.
* src/vscreen/fragment_contents.h:
Make size() const.
* src/ui.cc:
Oops, actually show a preview after auto-fixing.
* src/solution_fragment.cc:
Don't require that the solution is a sensible solution right
this instant; this allows a fragment describing an
already-applied solution to be generated.
* src/ui.cc:
Eliminate all uses of try_fix_broken() in the pre-installation
phase; in the process, factored out a bunch of common code from
some of the preview setup functions.
* src/generic/aptcache.h:
Pack the extended state information more tightly using field
widths.
* src/vscreen/fragment.cc:
For more correctness, tie the cache to the last seen
indentations. (only the last values are preserved because I
expect them never to change; this is so that in case they do for
some odd reason, the results are still correct)
* src/vscreen/fragment.cc:
Fix sequence_fragment::trailing_width to return the correct
value (previously, it would always return 0, due to an
accidental bool -> int conversion).
* src/solution_dialog.cc:
Make the solution dialog disappear when the user presses the
apply key.
* src/solution_fragment.cc:
Put parens around archives, don't uselessly translate format
strings.
* src/vscreen/vs_table.cc:
Fix a memory leak -- vs_tables didn't delete their children.
* src/vscreen/fragment.cc:
Slightly fix the way sequence fragments calculate their width.
* src/solution_fragment.cc:
Fix some missing newlines in the solution fragment formatting.
* src/cmdline/cmdline_show.cc, src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/vs_layout_item.cc, src/vscreen/vs_text_layout.cc:
Make the text layout algorithm also take indentation into
account.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/vs_text_layout.cc:
Adjust the fragment width calculation to properly take
indentation into account.
* src/solution_dialog.cc:
Move the buttons into a separate "box" table, and add a
scrollbar to the solution dialog.
2005-04-25 Daniel Burrows <dburrows@debian.org>
* src/solution_dialog.cc:
Disable reverse-video for now, till I get proper support for
cascading video attributes (otherwise I lose the bold attribute
on the headers of the various sections, if that makes sense..)
* src/vscreen/fragment.cc:
Make the max-width calculation more obviously correct.
* src/vscreen/vs_text_layout.cc:
When the text layout's fragment changes, queue a full layout run
(not just an update).
* src/solution_dialog:
Make the dialog "dialog colored" in the usual hacky way.
* src/solution_dialog.cc, src/ui.cc, src/ui.h:
Add some pushable buttons to issue solution-viewing commands.
* src/ui.cc:
Pop up an examination dialog when the user presses 'e'.
* src/broken_indicator.cc, src/solution_dialog.cc, src/solution_dialog.h:
Add a start on a dynamically updating solution dialog. The
change to broken_indicator just removes an unnecessary
translatable format string (now what's translated is an argument
to the format string).
2005-04-23 Daniel Burrows <dburrows@debian.org>
* src/broken_indicator.cc:
Actually indicate how many downgrades are needed.
* src/generic/aptitude_resolver.h:
Fix a silly logic error in the revdep_iterator that caused
reverse dependencies through Provides: to not be considered.
* src/generic/aptitude_resolver.h:
Don't generate inapplicable revdeps, even if they're the first
item in the list.
* src/generic/problemresolver/problemresolver.h:
Fix the solution dumper to work properly on non-cout streams too
(it called cout instead of its parameter in a few places).
* src/generic/aptcache.h:
Remove the need to include problemresolver.h from every single
source file by using the fact that templates can be forward
declared.
* src/generic/aptcache.cc:
Deprioritize keeps relative to installs/upgrades: the user
rarely wants us to cancel his/her decisions! (removals are still
deep-sixed unless abolutely necessary, though) Also, greatly
*decrease* the bonus for preserving automatic packages.
* src/ui.cc:
Put the broken indicator above the status area, not in it.
* src/broken_indicator.cc:
Don't display the total number of calculated solutions unless
they've been exhausted (I think that's likely to be confusing).
* src/broken_indicator.cc:
Capitalize the command names in the indicator, to match the
hints at the top of the screen, and make then i18nable.
* src/broken_indicator.cc:
Make the whole broken indicator red, not just the text.
2005-04-22 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Avoid the dread assertion failure in a slightly hacky way.
* src/cmdline/cmdline_do_action.cc, src/generic/aptcache.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
Instead of automatically floating complete solutions to the head
of the queue, apply a configurable bonus score to them (and in
fact it's set rather low by default). This should avoid
situations where a really bad solution happens to appear before
a pretty good one.
Also, remove the now-useless debugging invocation of the
resolver.
* src/solution_fragment.cc:
Display the score of the solution.
* src/generic/aptcache.cc:
Tweak the default scores: be slightly less hostile to changing
the user's selections, and greatly increase the penalties for
broken deps and for removing packages.
* src/generic/aptcache.cc:
Fix a reversed comparison in solutions_exhausted.
* src/generic/problemresolver/problemresolver.h:
For more correctness, always throw NoMoreSolutions when we're
out of potential solutions, even if the last element of the open
queue is a solution.
* src/broken_indicator.cc:
Incorporate the solution counts into the suggestion bar.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add routines to extract more information about cached solutions
(to add to the suggestion bar).
* src/generic/aptcache.cc:
In next_solution(), always advance to the newly created solution
after generating it, and signal that the selection changed.
* src/solution_fragment.cc, src/solution_fragment.h, src/ui.cc:
Add preliminary code to display a solution, and hook it up in
the simplest possible way.
* src/broken_indicator.cc:
Fix an assertion failure due to an incorrect assumption.
* src/broken_indicator.cc:
Use the new signal to reset the broken indicator at appropriate
times.
* src/generic/aptcache.cc:
Actually perform the function call so everything compiles.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add a signal that gets called whenever the currently selected
solution is changed, and make sure to set selected_solution to 0
when we insert the first solution.
* src/ui.cc:
In do_next_solution(), handle exceptional situations from the
problem resolver.
* src/ui.cc:
Hook up the various solution-related commands to do *something*,
although some of them are still incomplete.
* src/generic/aptcache.h:
Clarify the documentation of apply_current_solution.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add an interface routine to easily apply the currently selected
solution.
* src/defaults.cc:
Set up default key bindings for the problem resolver.
* src/broken_indicator.cc:
Also display keeps, don't display ungrammatical text for
singular actions, and move the key hints to the next line.
* src/pkg_view.cc, src/ui.cc:
Move the broken indicator into the status bar area.
* src/broken_indicator.cc:
Hide an inactive indicator; correctly handle cache reloading.
* src/generic/problemresolver/problemresolver.h:
Add a method on solutions to explicitly invalidate them.
* src/broken_indicator.cc:
Doh, fix a compile error.
* src/generic/aptcache.cc:
Add yet one more missing call to package_state_changed (in
end_action_group).
* src/broken_indicator.cc:
Add a sanity-check.
* src/generic/aptcache.cc:
Also call the package-state-changed signal after an
installation.
* src/broken_indicator.cc:
Use the new signal to update the broken indicator.
* src/generic/aptcache.cc, src/generic/aptcache.h, src/main.cc:
Make "package_state_changed" an argumentless signal, and call it
whenever a package's install version changes. Also added a
missing discard_resolver()/create_resolver() pair in
set_candidate_version.
* src/generic/problemresolver/problemresolver.h:
Add a flag to enable or disable debugging; debugging is disabled
by default.
2005-04-21 Daniel Burrows <dburrows@debian.org>
* src/broken_indicator.cc:
Oops, blank the indicator by making it an empty fragment, not by
making it NULL.
* src/broken_indicator.cc, src/pkg_view.cc:
Hook up the broken indicator to the package-view class, and do
some awful hacking to make it sort of update. Needs work, such
as actually getting the package_state_changed signal or
something similar hooked up.
Also, fix the guard against a NULL cache so we don't crash on
startup (doh).
* src/Makefile.am, src/broken_indicator.cc, src/broken_indicator.h, src/generic/aptitude_resolver.h:
Write a first draft of the widget to display information about
the current proposed solution. Also made some methods const
that ought to be. sleepy.
* src/generic/aptcache.cc:
Look up BrokenCount on "this", not on the global apt_cache_file
variable (which might not be initialized yet).
* src/pkg_view.cc:
Ignore both horizontal and vertical size requests for main
widgets/descriptions (should make vertical-split themes work --
I believe they were broken otherwise..)
* src/generic/aptcache.cc, src/generic/aptcache.h:
Write rudimentary code for maintaining a set of known solutions
to any extant problems (expanded on demand).
* src/generic/problemresolver/problemresolver.h:
Add a function that returns "true" if the open queue has been
exhausted.
* src/generic/problemresolver/problemresolver.h:
Once a resolver examines all possible solutions, it now returns
"no more solutions" permanently until you call a "reset" method
(which clears out all scores and empties the open and closed
queues).
* src/generic/problemresolver/problemresolver.h:
Lift the "solution" class out of the generic_problem_resolver
class so I can forward-declare it (and hence declare pointers
and references to it in aptcache.h).
* src/generic/aptitude_resolver.h:
Make the glue code functions static.
2005-04-20 Daniel Burrows <dburrows@debian.org>
* src/desc_parse.cc:
Make sure bullet whitespace-stripping includes the space that
separates the bullet from the following text; position the
initial parse location appropriately. Paragraphs in lists get
flowed now!
* src/desc_parse.cc:
Base the *output* indent level of bulleted text on the number of
bullet levels, not the input indent level.
* src/desc_parse.cc:
Allow bulleted lists that are indented more than 2 spaces.
Don't mangle lists and literal lines that immediately follow a
paragraph.
* src/desc_parse.cc:
Fix a silly thinko in the generation of bullets that was causing
bullets to appear twice in the output.
* src/desc_parse.cc:
Add a missing "break".
* src/desc_parse.cc:
Initial implementation of automagic bullet detection.
Buggy.
* src/desc_parse.cc:
Rework make_desc_fragment to add theoretical support for
indentation levels in the input description. No change should
occur in the resulting text as a result of this modification.
* src/desc_parse.cc:
Include comments on how lists ought to be handled, and hardwrap
preformatted lines as per Policy.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add a "hardwrapbox" which wraps lines hard to the fragment's
width (rather than doing word-wrapping).
* src/generic/problemresolver/model.tex:
Add some discussion of the theoretical basis for the new problem
resolver.
2005-04-10 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_do_action.cc, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Add and use a feature to easily apply heavy penalties to the
removal of Essential packages.
* src/generic/problemresolver/problemresolver.h:
Add missing "const"s to some function prototypes, comment out
some non-generic debug code.
* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Rename add_scores -> add_actions_scores, and write
add_priority_scores (tweaks scores according to Priority).
* src/generic/aptitude_resolver.h:
Always normalize solver_iterators. This should fix the problem
where Conflicts would include the first version of the
conflicted package as a solver.
* src/generic/aptitude_resolver.h:
Only iterate over critical revdeps (I was iterating over *all*
revdeps, which is what caused all the weirdness before).
* src/generic/problemresolver/problemresolver.h:
Add more debugging, to make it easy to find out where
unresolvable deps are coming from.
* src/generic/aptitude_resolver.h:
Add more accessors, the better to debug it with.
2005-04-09 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_do_action.cc:
Penalize, don't reward, broken packages and long solutions.
* src/generic/problemresolver/problemresolver.h:
Fix a big thinko: always enqueue solvers for *both* sides of a
depends!
* src/generic/aptitude_resolver.h:
Fix the version sent to the problem resolver (should be
pkg->ID+VersionCount, not pkg->ID+PackageCount).
* src/generic/aptitude_resolver.h:
Report the correct adjusted version count to the problem
resolver.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Add asserts in order to try and track down where the IDs that
are too large for the version array are coming from.
* src/generic/problemresolver/problemresolver.h:
Use map's operator< to order solutions rather than hacking my
own. Has the benefit of fixing one known and at least one
unknown bug in the ordering of solutions. Closed solutions
actually get dropped now.
* src/cmdline/cmdline_do_action.cc:
Summarize the proposed solutions as debug output.
* src/generic/aptitude_resolver.h:
Fix an extremely stupid bug (== vs !=) in
aptitude_resolver_version::operator!=.
* src/generic/problemresolver/problemresolver.h:
Add some more guards against doubly-changing packages.
* src/generic/aptitude_resolver.h:
Fix some backwards logic that was used when finding broken deps
(it only found *non*-broken deps).
* src/generic/aptitude_resolver.h:
Fix an infinite loop in the revdep_iterator.
* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Add spacing between the components of a depends list.
* src/generic/aptitude_resolver.h:
Don't spin forever looking for broken deps.
* src/generic/aptitude_resolver.h:
Fix a silly segfault by initializing a dep as I meant to do in
the first place.
* src/generic/aptitude_resolver.cc:
Fix the operator<< on deps to be more useful.
* src/generic/aptitude_resolver.h:
Fix an infinite recursion bug in the broken-dep iterator.
* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Fix some multiply-defined functions by making them inline and/or
moving them to the .cc file.
* src/cmdline/cmdline_do_action.cc:
On dist-upgrade, etc, run the new resolver. Its output is
discarded -- this is just to see how it works on real problems.
* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
Further fixes for constness, typing problems.
* src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
Fix various errors in the code that cropped up while trying to
assemble everything.
* src/generic/aptitude_resolver.h:
Use public inheritance from generic_problem_resolver (d'oh).
* src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h:
Add missing get_version_count(), fill in and fix the constructor
of aptitude_resolver.
* src/cmdline/cmdline_dump_resolver.cc:
Update the #include of aptitude_resolver.h to point at the new
location.
* src/generic/Makefile.am, src/generic/aptitude_resolver.cc, src/generic/aptitude_resolver.h, src/generic/problemresolver/problemresolver.h:
Write the body of add_scores(), fix some problems with the
generic resolver that came up in the process, and link it into
the Makefile.
* src/generic/problemresolver/aptitude_resolver.h, src/generic/aptitude_resolver.h:
Move the aptitude_resolver file into generic/ so that
I can easily incorporate a .cc file into the main program.
* src/generic/problemresolver/aptitude_resolver.h:
Write up a prototype for a super-duper-scoring-function.
* src/generic/problemresolver/problemresolver.h:
When dumping the universe, include the syntactic sugar arrows so
that we can parse it back in.
* src/generic/problemresolver/aptitude_resolver.h:
Make sure to never ever ever produce noncritical deps in a dump.
* src/cmdline/cmdline_dump_resolver.cc:
Always return success after a dump.
* src/generic/problemresolver/aptitude_resolver.h:
Make sure to use the correct solver_iterator constructor variant
for each appropriate case.
In dep_iterator's ++, make sure to call normalize in *all*
cases, not just the case of advancing the dep ptr. For
Conflicts, always advance by exactly one step.
* src/generic/problemresolver/aptitude_resolver.h:
When normalizing solver-iterators, include the code to advance
the dependency inside the loop that runs till we run out of deps
(so the program doesn't go into an infinite loop..oops..).
* src/generic/problemresolver/aptitude_resolver.h:
Add code to drop self-conflicts.
* src/generic/problemresolver/aptitude_resolver.h:
Drastically overhaul how Conflicts are handled. Now each
Conflicts line generates a separate dependency for every listed
package *and* one dependency for each provider of every listed
package. This is the only sensible way to handle Conflicts in
the presence of virtual deps.
* src/generic/problemresolver/aptitude_resolver.h:
Actually, no need to test dep_lst.end() -- just correct
the erroneous test of the OR bit (I hate C++).
* src/generic/problemresolver/aptitude_resolver.h:
Assert that dep_lst is non-end BEFORE possibly pushing it off
the end, make dep_lst's end-ness part of the end() condition for
solver_iterators, and test against end() instead of finished.
* src/generic/problemresolver/aptitude_resolver.h:
Fix the dep_iterator to iterate over all dependencies instead of
none.
* src/generic/problemresolver/test.cc:
Run dump_universe on input universes, both for diagnostics
and to test dump_universe.
* src/generic/problemresolver/aptitude_resolver.h:
Fix the dep_iterator to not blow up.
* src/generic/problemresolver/aptitude_resolver.h:
Make sure to include UNINST in version iteration (avoid
adding an extraneous bool by overloading pkg to track
end-ness).
* src/generic/problemresolver/problemresolver.h:
Fix the dump output (again) to comply with the input spec.
* src/main.cc, src/cmdline/Makefile.am, src/cmdline/cmdline_dump_resolver.cc, src/cmdline/cmdline_dump_resolver.h:
Add a debugging command to dump the resolver's state
(currently quite primitive).
* src/generic/problemresolver/aptitude_resolver.h:
Fix some more missing stuff that turned up while trying to use
the aptitude resolver.
* src/generic/problemresolver/aptitude_resolver.h:
Add a preliminary APT-based resolver universe (totally untested, but it
sort of compiles).
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Make changes necessary to support apt universes in a simple way.
In particular, the exported iterators now support end() methods
and their containers only provide a _begin() method (this allows
the iterators to be built on standard APT iterators).
2005-04-08 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Use operator<, not get_id(), to compare versions; use the
fact that version comparisons include package comparisons.
* src/generic/problemresolver/problemresolver.h:
Enable the closed queue, and fix solution_contents_compare to
not treat all solutions as equal to one another.
* src/generic/problemresolver/test.cc:
Overhaul the test code to make the test fully controlled
by its input file -- including support for specifying
tests to run on the universe and the expected results.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Make dump_universe generic, move it to problemresolver.h, and
output exactly the information expected by the test parser.
2005-04-07 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/problemresolver.h:
Remove a bunch of uninteresting debugging output, set up
indentation to make it clearer what's happening.
* src/generic/problemresolver/test.cc, src/generic/problemresolver/test1.txt:
Properly support conflicts in test files, make the simple test
more interesting.
* src/generic/problemresolver/test.cc, src/generic/problemresolver/test1.txt:
The current version must now be given after the list of versions
(makes it easier to change the current version, hopefully).
* src/generic/problemresolver/test.cc:
Fix a rather silly mistake that caused dummy_dep::broken()
to return incorrect answers.
* src/generic/problemresolver/test.cc:
Fix the broken_dep_iter -- it would always claim the
first thing in the list was broken.
* src/generic/problemresolver/problemresolver.h:
Add yet more debugging code.
* src/generic/problemresolver/test.cc:
Add more debugging code; make dump() dump all info by default.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Make the broken dependency list a unique set (ow, big runtime
hit, but otherwise solutions where a single broken dependency is
listed many times will be de-prioritized, which shouldn't always
happen).
* src/generic/problemresolver/test.cc:
Print out the solution when we find one.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Fix the assertion failure: when trying to nullify the LHS of a
depends, install everything *but* the depending version. Also
touched up the debug output.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Fix the segfault by adding the missing "&", and tweak the output
code a bit.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Add some debugging code to try to track down the current
segfault.
* src/generic/problemresolver/test.cc:
Fix the broken_dep_iterator to actually increment
* src/generic/problemresolver/problemresolver.h:
Actually decrement the max_steps counter, and make it
signed to avoid accidents with -1==INT_MAX.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Finish writing the final method of the resolver, and
make the changes (in both files) necessary to hook it
up to the toy package system and get it to run.
* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:
Complete and compile the resolver ...... theoretically.
Now it's time to watch it run reallllly sloowwwly
and produce stoopid answers.
* src/generic/problemresolver/problemresolver.h:
Start work on a currently broken problem resolver.
2005-04-06 Daniel Burrows <dburrows@debian.org>
* src/generic/problemresolver/test.cc:
It seems numerical IDs will be needed, add support
for them.
* configure.ac, src/generic/problemresolver/test.cc, src/generic/problemresolver/test1.txt:
Start adding code to try out some ideas about resolving
dependency problems.
2005-03-09 Daniel Burrows <dburrows@debian.org>
* src/download_list.cc:
Make sure to run the message regarding failed downloads
through fragf. (Closes: #298713)
2005-03-03 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_util.cc:
Fix a crashing bug caused by trying to cast a slotarg
instead of dereferencing it. (Closes: #293935)
2005-01-10 Daniel Burrows <dburrows@debian.org>
* doc/fr/Makefile.am:
Actually delete the generated manpage in the "clean" rule.
* po/POTFILES.in:
Update with the current list of files in the source
distribution.
* configure.ac, NEWS:
Bump version number to 0.3.1.
* doc/en/aptitude.xml:
Update the version number to 0.3.1, and explicitly state which
version of libsigc++ is needed.
* po/nl.po:
Merge up to r2879 (see entry below).
* src/generic/apt.cc:
Whenever the cache is reloaded (with package states from the
global file), immediately try to write back changes to package
states (ie, dselect states).
* src/generic/aptcache.cc:
Finally fix the notorious "aptitude removes stuff you installed
with other package managers" bug. Maybe. The problem is: when
dselect information was being read, aptitude would note changes
to the dselect state and record them...but it *would not flag
the cache as being dirty*. As a result, when the user applied
the naive process to remove some files from the system:
(a) Mark the files for removal
(b) Execute the removal
(c) Quit aptitude
aptitude would quit thinking that dpkg still wanted to install
the files in question. As a result, the next time aptitude
started, it would notice that the dselect state disagreed with
its own selection state -- but would then notice that the "old"
dselect state also called for the packages to be installed, and
assume that nothing changed.
The fix -- dirtying the cache -- isn't perfect: if the user ^Cs
aptitude after installing software but before aptitude saves the
new cache state, the bug will reappear. However, at least the
common case works now.
* src/ui.cc:
Make the About box fragment-based, and make its copyright notice
reflect the last 5 years.
* src/ui.cc, src/pkg_item.cc, src/pkg_tree.cc, src/pkg_view.cc:
Lots of stuff to handle slot type conversions in appropriate
ways for sigc++ 2.0. The program compiles and seems to work now.
* src/vscreen/vs_menu.cc:
Apparently in sigc++ 2.0, you can cast a slot<bool> directly to
a slot<void> and vice versa (?!?!?!), so overloading a function
with both and hiding the slot<bool>'s return value is
unnecessary and leads to compiler errors.
* src/vscreen/slotarg.h:
Use a conversion operator instead of a constructor to convert
between slotarg types.
* src/pkg_item.cc:
Convert a use of slotarg.
* src/edit_pkg_hier.cc:
Add missing include for bind.
* src/download_list.cc:
Convert uses of slotarg, add dereferences.
* src/vscreen/slotarg.h:
Also allow non-const dereferencing of slotarg.
2005-01-09 Daniel Burrows <dburrows@debian.org>
* src/mine/cmine.cc:
Really convert all explicit uses of Slot*Arg*.
* src/download_bar.cc, src/download_list.cc, src/ui.cc, src/download_list.h, src/download.cc, src/ui.h, src/download_screen.cc:
Correct all explicit uses of Slot*Arg* to the new API.
* src/vscreen/slotarg.h, src/vscreen/vs_util.h, src/vscreen/vs_menu.h, src/vscreen/testvscreen.cc, src/vscreen/vs_util.cc:
Overhaul the SlotArg system to (a) make the names fit in better
(no more StudlyCaps), and (b) make it easier to explicitly
create a slotarg (a simple overloaded "arg" routine does it)
* src/download_list.cc, src/download_screen.cc:
More of the same.
* src/download.cc, src/download_bar.cc:
Make some SlotArg instantiations explicit; fix a #include
directive for ptr_fun.
* src/mine/cmine.cc:
Make two SlotArg instantiations explicit; fix an incorrect
argument order bug in a bind invocation.
* src/apt_options.cc, src/cmdline/cmdline_progress.cc, src/pkg_view.cc, src/ui.cc:
Stop using sigc::ref here too. Apparently it works on
references, not pointers, and changing the whole program to
references would be ridiculous. When this causes a problem,
I'll worry about it.
* src/vscreen/testvscreen.cc, src/vscreen/vs_bin.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_multiplex.cc, src/vscreen/vs_radiogroup.cc, src/vscreen/vs_stacked.cc, src/vscreen/vs_table.cc, src/vscreen/vs_util.cc:
Stop using sigc::ref, it causes weird problems that I don't
understand. testvscreen compiles and starts now! (haven't
fully checked it out yet)
* src/vscreen/testvscreen.cc:
Apparently Slot0Args have to be explicitly instantiated now :(.
* src/vscreen/vs_tree.cc:
Correct a #include of ptr_fun.h.
* src/vscreen/vs_util.cc:
Update to the explicit-dereference slotarg API.
* src/vscreen/vs_size_box.cc:
Correct a #include of mem_fun.h.
* src/vscreen/vs_radiogroup.h:
Add a missing #include of sigc++/connection.h.
* src/vscreen/slotarg, src/vscreen/vs_menu.cc:
Require explicit dereferencing of slot-arguments, and convert
vs_menuto use it.
* src/vscreen/vs_size_box.cc:
Correct the include of mem_fun.h
* src/vscreen/vs_menu.cc:
#include retype_return.h, not hide.h, for the hide_return
adaptor.
* aptcache.cc:
Explicitly type NULLs that are being bound so that the bind
adaptors is instantiated with the correct types.
* src/generic/aptcache.cc, src/vscreen/vs_bin.h, src/vscreen/vs_minibuf_win.h, src/vscreen/vs_stacked.h, src/vscreen/vs_table.h:
#include sigc++/connection.h to use sigc::connection.
* src/vscren/bool_accumulate.h:
Use structs, not classes.
* src/ui.cc, src/ui.h, src/vscreen/bool_marshal.h, src/vscreen/bool_accumulate.h, src/vscreen/vs_menu.h, src/vscreen/Makefile.am:
Move from the old Marshal API to the new accumulator API.
* src/generic/config_signal.cc:
Correct #include of <sigc++/functors/mem_fun.h>
* src/generic/aptcache.cc:
Add missing #include <sigc++/adaptors/bind.h>
* src/generic/acqprogress.cc, src/generic/acqprogress.h:
Give acqtextstatus an explicit virtual destructor.
* src/menu_redirect.h, src/generic/aptcache.cc, src/edit_pkg_hier.h, src/download_screen.cc, src/vscreen/vs_bin.h, src/vscreen/vs_minibuf_win.h, src/vscreen/vs_radiogroup.h, src/vscreen/vs_stacked.cc, src/vscreen/vs_stacked.h, src/vscreen/vs_table.cc, src/vscreen/vs_table.h, src/vscreen/vs_menu.cc:
Remove various references to namespace SigC.
* src/pkg_tree.cc:
Remove an unnecessary #include.
* src/download_bar.cc, src/apt_options.cc, src/download_list.cc, src/mine/cmine.cc, src/ui.cc, src/main.cc, src/edit_pkg_hier.cc, src/download.cc, src/cmdline/cmdline_util.cc, src/cmdline/cmdline_progress.cc, src/generic/config_signal.h, src/generic/config_signal.cc, src/generic/aptcache.cc, src/pkg_tree.cc, src/view_changelog.cc, src/pkg_view.cc, src/pkg_grouppolicy.cc, src/apt_info_tree.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_editline.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_togglebutton.h, src/vscreen/vs_center.cc, src/vscreen/vs_text_layout.cc, src/vscreen/vs_size_box.cc, src/vscreen/vs_passthrough.cc, src/vscreen/vs_button.cc, src/vscreen/vs_stacked.cc, src/vscreen/vs_frame.cc, src/vscreen/vs_tree.cc, src/vscreen/vs_multiplex.cc, src/vscreen/vs_table.cc, src/vscreen/testvscreen.cc, src/vscreen/vs_pager.cc, src/vscreen/vs_menu.cc, src/vscreen/vs_transient.cc, src/vscreen/vs_util.cc:
Replace calls to SigC::slot with calls to sigc::ptr_fun and
calls to sigc::mem_fun, as appropriate.
* src/apt_options.cc, src/download_list.cc, src/mine/cmine.cc, src/ui.cc, src/edit_pkg_hier.cc, src/cmdline/cmdline_progress.cc, src/generic/config_signal.cc, src/generic/aptcache.cc, src/pkg_item.cc, src/pkg_tree.cc, src/pkg_view.cc, src/apt_info_tree.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_bin.cc, src/vscreen/vs_radiogroup.cc, src/vscreen/vs_stacked.cc, src/vscreen/vscreen_widget.cc, src/vscreen/vs_multiplex.cc, src/vscreen/vs_table.cc, src/vscreen/testvscreen.cc, src/vscreen/vs_menu.cc, src/vscreen/vs_util.cc
Replace uses of SigC::bind with sigc::bind, and start
converting slot creation.
2005-01-08 Daniel Burrows <dburrows@debian.org>
* src/download_list.cc, src/ui.cc, src/apt_info_tree.h, src/pkg_tree.h, src/download_manager.h, src/cmdline_parse.h, src/pkg_subtree.h, src/pkg_grouppolicy.h, src/pkg_item_with_subtree.h, src/generic/config_signal.h, src/generic/aptcache.h, src/generic/apt.h, src/generic/config_signal.cc, src/generic/aptcache.cc, src/generic/apt.cc, src/pkg_item.cc, src/pkg_item.h, src/ui.h, src/edit_pkg_hier.h, src/cmdline_parse.cc, src/pkg_grouppolicy.cc, src/vscreen/vscreen.cc, src/vscreen/vs_pager.h, src/vscreen/slotarg.h, src/vscreen/vs_togglebutton.h, src/vscreen/vscreen_widget.h, src/vscreen/vs_button.h, src/vscreen/vs_radiogroup.h, src/vscreen/vs_util.h, src/vscreen/vs_editline.h, src/vscreen/vscreen.h, src/vscreen/vscreen_widget.cc, src/vscreen/vs_statuschoice.h, src/vscreen/vs_menu.h, src/vscreen/vs_text_layout.h, src/vscreen/vs_scrollbar.h, src/vscreen/vs_menu.cc, src/vscreen/vs_util.cc:
Use sigc::signal* and sigc::slot* instead of SigC::Signal* and
SigC::Slot*.
* src/apt_options.cc, src/cmdline_parse.h, src/edit_pkg_hier.cc, src/generic/acqprogress.h, src/generic/aptcache.h, src/generic/config_signal.h, src/menu_redirect.h, src/pkg_grouppolicy.cc, src/vscreen/vscreen_widget.h, src/vscreen/vs_radiogroup.h:
Use sigc::trackable instead of SigC::Object.
* configure.ac:
Use sigc++-2.0, not sigc++-1.2. This breaks EVERYTHING.
* src/ui.cc:
Since fragments are now used to render messages, remove the
newlines.
* src/ui.cc:
Work around what appears to be a compiler bug: if
my_cleaner::my_cleaner is implemented inline, it never gets
executed, but if I implement it outside the class definition, it
works fine. (this makes the count of how much stuff was
autocleaned reliable again, hopefully)
* src/ui.cc, src/ui.h:
Make show_message deal in fragments.
* src/vscreen/vs_transient.cc:
Implement the vs_transient constructor.
* src/vscreen/Makefile.am, src/vscreen/vs_transient.cc, src/vscreen/vs_transient.h:
Add a "transient" widget that wraps a real widget but disappears
at the press of a button. This generalizes and obsoletes
vs_transientlabel.
* src/cmdline/cmdline_clean.cc, src/ui.cc:
After cleaning obsolete files, display (approximately) how much
disk space was freed.
* doc/en/manpage.xml:
Display segmented lists more clearly, clarify a few points in
the manpage, and remove a gripe that may be obsolete (not sure).
2004-12-22 Daniel Burrows <dburrows@debian.org>
* src/download_list.cc:
Fix some silly typos in the code that decides whether to show a
summary, so that it works as advertised.
When constructing the summary message, newlines go at the front
of the second chunk of text, not at the end of the first (avoids
unnecessary dialog expansion).
Mark the download as "failed" only when an error message would
be shown.
* src/apt_config_widgets.cc, src/apt_config_widgets.h, src/apt_options.cc:
Add support for multiple-choice options (using radio buttons),
and use this support to fix the display of the "pause after
download" option.
* src/vscreen/vs_radiogroup.cc, src/vscreen/vs_radiogroup.h:
Enhance the vs_radiogroup API so that I can use it in the main
program.
* src/download_list.cc:
Use a fragment to display the success/failure dialog, and add a
comment indicating that some files couldn't be downloaded if an
item failed to be downloaded.
* src/download_list.cc, src/download_list.h:
Make the pause-after-download option tristate; by default,
aptitude will now pause only if some part of the download
failed.
* NEWS, configure.ac, doc/en/aptitude.xml:
Bump version to 0.3.0. Obsolete documentation has not been
bumped, to indicate that it still documents the old version of
the program.
* doc/en/aptitude.xml, doc/en/images/trust-snapshot.png:
Proofread, complete the security section.
2004-12-21 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_util.cc:
Destroy widgets before executing the commands in a slot, so they
aren't visible if a sub-main-loop is spawned. (maybe it would
be better to just hide them to avoid the possibility of some
nasty memory bug?)
* src/ui.cc:
Use more sensible labels for the "really screw your computer?"
prompt.
* src/vscreen/vs_util.cc:
Make yes/no buttons X-shrinkable to avoid the table layout bug.
2004-12-06 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Don't install/remove packages until the user answers the
"untrusted packages" warning.
* src/pkg_view.cc:
Avoid crashing in pkg_description_widget: apparently ver.end()
crashes if pkg.end() is true, so check pkg.end() first.
* src/vscreen/vs_util.cc:
Remove some (theoretically) unnecessary centering widgets. The
correct button now receives focus when the dialog is created.
* src/ui.cc:
Print a nasty warning if trust violations occur.
* src/vscreen/fragment.cc:
Be more specific when generating errors about format codes.
* src/vscreen/vs_frame.cc:
Make sure, when generating a height_request, to give the correct
width to the subwidget (subtract the width of our border).
* src/vscreen/vs_table.cc:
Instrument the table code for debugging.
* src/vscreen/testvscreen.cc, src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Add support for formatting yesno dialog box messages using
fragments.
2005-01-05 Christian Perrier <bubulle@debian.org>
* Corrected Dutch translation. Closes: #288815
2004-12-05 Daniel Burrows <dburrows@debian.org>
* configure.ac, doc/fr/Makefile.am:
List doc/fr/Makefile and doc/fr/images/Makefile, and fix
doc/fr/Makefile.am so that builds no longer fail.
* src/vscreen/vs_table.h:
Make widgets shrinkable by default.
* src/vscreen/vs_util.cc:
Set the background of the layout widget and scrollbar when
creating a stock Ok dialog, and make sure that the main widget
is shrinkable (so the Ok button doesn't disappear).
* src/pkg_view.cc:
Always ignore the vertical size of every main widget and package
description, to get about the same behavior as previous
versions.
* src/vscreen/vs_table.cc, src/vscreen/vs_table.h:
Create another table flag that causes the widget's size request
to be ignored and (0,0) assumed. This is useful (really!) to
force a widget to only take up as much space as it can be
expanded into. (think about the aptitude main screen, for
instance..)
* src/vscreen/vs_util.cc:
Use add_widget_opts to add the "cancel" button. Using plain
add_widget was causing weird problems where Cancel got shoved to
the right of the dialog box. [merge up to r2801]
* src/vscreen/vs_table.cc:
When expanding columns, check for expandability in the X
direction, not the Y direction.
* src/ui.cc:
Remove some old cruft.
* src/pkg_view.cc, src/ui.cc:
Make all the widgets in the main view that are expandable also
shrinkable (arguably this is a bug in the table layout, but I
can work around it like this for now). Now the scrollbars won't
randomly disappear...
* src/pkg_view.cc:
Use more explicit table options for scrollbars.
* src/vscreen/vs_util.cc:
Make sure that scrollbars in stock Ok dialogs expand vertically
but not horizontally.
* src/ui.cc:
Use the new fragf to make apt_error_fragment() much more
legible.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add %A and %C escapes to fragf that directly set the attributes
of following text. %A sets the attributes directly using the
next argument; %C takes the next argument to be a color name,
looks it up, and sets the attributes to the color that it finds.
* src/ui.cc:
Make sure the apt error has the correct color.
* src/download_list.cc, src/download_list.h:
Split download_list::size_request.
* src/vs_progress.cc, src/vs_progress.h:
Split vs_progress::size_request.
* src/mine/cmine.cc, src/mine/cmine.h:
Split cmine::size_request.
* src/ui.cc:
Fix several compile errors. In particular, use the
new vs_dialog_ok instead of apt_error_pager.
* src/vscreen/vs_util.cc, src/vscreen_vs_util.h:
Add a parameter to vs_dialog_ok on fragments that causes a
scrollbar to be added.
* src/vscreen/vs_util.cc, src/vscreen_vs_util.h:
Use labels by default to render OK dialog boxes based on text,
and add a variant of vs_dialog_ok that lets you pass in the main
widget of the dialog box.
* src/vscreen/vs_table.cc:
Fix a stupid thinko that was causing table layout to be
seriously screwed up.
* src/vscreen/vs_util.cc:
Word-wrap Ok dialog boxes, and make sure that the correct
background attributes are used for the layout widget.
* src/vscreen/vs_table.cc:
Initialize num_rows and num_cols to 0 when the table is
constructed.
* src/vscreen/fragment.cc, src/vscreen/vs_center.cc, src/vscreen/vs_label.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_menubar.h, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_size_box.cc, src/vscreen/vs_text_layout.cc:
Fix various other typos that prevented the vscreen layer from
compiling.
* src/vscreen/vs_table.cc, src/vscreen/vs_table.h:
Fix a whole bunch of typos and compile errors.
* src/vscreen/vs_tree.cc:
Split vs_tree::size_request.
* src/vscreen/vs_table.cc, src/vscreen/vs_table.h:
Massively refactor the table layout algorithm. It's now split
into about half a dozen shorter functions that are actually
almost readable. Oh, and it supports two-shot layout.
2004-12-04 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_statuschoice.cc, src/vscreen/vs_statuschoice.h:
Convert the statuschoice widget to the new algorithm.
* src/vscreen/vs_menubar.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_minibuf_win.h, src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h, src/vscreen/vs_scrollbar.cc, src/vscreen/vs_scrollbar.h, src/vscreen/vs_size_box.cc, src/vscreen/vs_size_box.h, src/vscreen/vs_stacked.cc, src/vscreen/vs_stacked.h:
More widgets converted to the two-shot algorithm.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/vs_frame.cc, src/vscreen/vs_frame.h, src/vscreen/vs_label.cc, src/vscreen/vs_label.h, src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h, src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
More widgets converted to the new layout mechanism.
* src/vscreen/vscreen_widget.h:
Clarify the assumptions that a widget can make about layout.
* src/vscreen/vs_button.cc, src/vscreen/vs_button.h, src/vscreen/vs_center.cc, src/vscreen/vs_center.h, src/vscreen/vs_editline.h, src/vscreen/vs_editline.cc, src/vscreen/vs_multiplex.cc, src/vscreen/vs_multiplex.h:
Rewrite the layout mechanisms for a bunch of widgets to work
with the two-shot algorithm.
* src/vscreen/vscreen_widget.h:
Make the changes to vscreen_widget that are necessary to
implement two-stage layout. This breaks everything (fun!).
* src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Overhaul the ok dialog to use text_layouts.
* src/ui.cc:
Write a routine to check the trust state of packages and warn as
appropriate (unfinished).
* src/generic/apt.cc:
It appears that packages with NULL index files are exactly those
which are already installed, so they should be trusted. Now
aptitude doesn't mark every package on the system as
"untrusted"...
2004-12-03 Daniel Burrows <dburrows@debian.org>
* src/Makefile.am, src/desc_parse.cc, src/desc_parse.h, src/pkg_info_screen.cc, src/pkg_view.cc, src/trust.cc, src/trust.h:
Display the same big fat warning in the extended description
area of untrusted packages. (yes, aptitude is now officially
paranoid)
* doc/en/aptitude.xml:
Document the untrusted flag and write a brief section on apt's
trust model (may not quite be accurate; needs to be edited again
before release).
* src/defaults.cc, src/pkg_info_screen.cc:
Add a very strongly worded warning message that is included in
the information screen for an untrusted package.
* src/generic/apt.cc, src/pkg_columnizer.cc, src/pkg_columnizer.h, src/pkg_ver_item.cc:
Create an extra column, visible by default, that flags untrusted
packages.
* po/pt_BR.po:
Automagic changes, don't look at me.
* src/generic/apt.h, src/generic/matchers.cc, src/generic/tasks.cc, src/pkg_columnizer.cc, src/pkg_info_screen.cc, src/pkg_ver_item.cc, src/pkg_view.cc:
Remove some totally unnecessary #includes in apt.h.
* src/generic/apt.h, src/generic/apt.cc:
Add a "package_trusted" function that checks a package version's
trust state. In order to support this non-wastefully, a global
source-list variable is now available, updated whenever the
package lists are re-read.
* src/download_item.cc:
Port to apt 0.6 by handling AuthError in addition to Error
status.
* configure.ac:
Remove "he" from ALL_LINGUAS and add "sk" and "tr" so that
configure works again.
2004-12-01 Dennis Stampfer <seppy@debian.org>
* Corrected German translation de.po. Closes: #283546
2004-11-16 Christian Perrier <bubulle@debian.org>
* Added Romanian translation. Closes: #281531
2004-11-08 Christian Perrier <bubulle@debian.org>
* Update Slovak translation. Really Closes: #279559
2004-11-07 Christian Perrier <bubulle@debian.org>
* Added Turkish translation. Closes: #280009
* Update Lithuanian translation. Closes: #280049
2004-11-05 Christian Perrier <bubulle@debian.org>
* Updated Arabic translation from Arabeyes CVS
* Added Slovak translation. Closes: #279559
2004-10-12 Christian Perrier <bubulle@debian.org>
* Added french translation of the documentation
Sent directly my Olivier Trichet
2004-10-11 Christian Perrier <bubulle@debian.org>
* Update Simplified Chinese translation
* Update Finnish translation
2004-10-10 Christian Perrier <bubulle@debian.org>
* Update Norwegian Bokmal translation.
2004-10-09 Christian Perrier <bubulle@debian.org>
* Update Polish translation. Closes: #265481
* Update Spanish translation.
* Update Basque translation. Closes: #275704
2004-10-07 Christian Perrier <bubulle@debian.org>
* Added preliminary Arabic translation from Arabeyes
* Added preliminary Hebrew translation. Closes: #275266
2004-10-06 Dennis Stampfer <seppy@debian.org>
* Update Brazilian Portuguese translation by Goedson Teixeira Paixao
Closes: #275220
2004-10-05 Christian Perrier <bubulle@debian.org>
* Minor update to French translation (Y/N keys)
Closes: #274953
2004-10-03 Christian Perrier <bubulle@debian.org>
* Update Danish translation
2004-10-02 Christian Perrier <bubulle@debian.org>
* Update Czech translation and manual
2004-09-29 Christian Perrier <bubulle@debian.org>
* Update Traditional Chinese translation and help file
Closes: #274268
2004-09-28 Daniel Burrows <dburrows@debian.org>
* NEWS, configure.ac, doc/cs/aptitude.xml, doc/de/aptitude.xml, doc/en/aptitude.xml, doc/fi/aptitude.xml:
Bump version to 0.2.15.8.
* src/mine/board.cc, src/mine/board.h, src/mine/cmine.cc, src/mine/mine-help.txt:
Apply some trivial fixes (avoiding uninitialized values,
sanity-checks) to minesweeper. (Closes: #179533)
2004-09-27 Christian Perrier <bubulle@debian.org>
* Update Russian translation after IRC talk with Nikolai
2004-09-26 Daniel Burrows <dburrows@debian.org>
* src/main.cc:
Patch from Konstantinos Margaritis to revert the locale to C
if UTF-8 is detected.
2004-09-26 Christian Perrier <bubulle@debian.org>
* Re-update Japanese translation. Closes: #272454
* Fixes to French translation. Closes: #272824
2004-09-25 Daniel Burrows <dburrows@debian.org>
* src/generic/apt.cc:
Only include suggested packages in the "packages suggested by
other packages" tree. (Closes: #270667)
2004-09-20 Christian Perrier <bubulle@debian.org>
* Update Japanese translation. Closes: #272454
2004-09-18 Christian Perrier <bubulle@debian.org>
* Update Italian translation. Closes: #265243
2004-09-17 Daniel Burrows <dburrows@debian.org>
* doc/fi/Makefile.am:
Add fixmans to EXTRA_DIST.
* NEWS, configure.ac, doc/cs/aptitude.xml, doc/en/aptitude.xml:
Bump version to 0.2.15.7.
* doc/en/aptitude.xml:
Add a credit for the Norwegian translation.
* doc/en/manpage.xml:
Be a little clearer about what --visual-preview does.
(Closes: #269100)
* doc/en/aptitude.xml:
Add an example to ~A documentation.
* doc/en/manpage.xml:
Eh, mention where the package cache is by default. (Closes: #269102)
* NEWS:
Write years with 4 digits.
* Update French manpage. Closes: #270713.
2004-09-13 Christian Perrier <bubulle@debian.org>
* Update Brazilian portuguese translation. Closes: #271411
2004-09-11 Christian Perrier <bubulle@debian.org>
* Update all translations according to latest aptitude.pot
* (few hours later) Revert aptitude.pot to r2712
and update PO files accordingly
2004-09-10 Christian Perrier <bubulle@debian.org>
* po/fi.po and help-fi.txt updated. Closes: #263313
* po/ca.po updated. Closes: #270917
2004-09-05 Daniel Burrows <dburrows@debian.org>
* src/pkg_columnizer.cc:
Fix crash when viewing virtual packages while using the
reverse-depends-count. (Closes: #270057)
* src/vscreen/vs_table.cc:
Fix several places where "focus" was dereferenced without
checking whether it was valid.
2004-09-04 Christian Perrier <bubulle@debian.org>
* Finnish updates:
- PO files completed
- build the doc file in XML
- Finnish doc files
Closes: #263313
2004-09-04 Daniel Burrows <dburrows@debian.org>
* po/nn.po:
Updated Norwegian translation from
H嶡rd Korsvoll <korsvoll@skulelinux.no> (Closes: #269976).
2004-08-31 Daniel Burrows <dburrows@debian.org>
* po/es.po:
Fix Spanish l10n of yes/no shortcuts (Closes: #269311).
2004-08-27 Christian Perrier <bubulle@debian.org>
* Update all translation according to aptitude.pot
* Italian translation updated. Closes: #268263
2004-08-17 Christian Perrier <bubulle@debian.org>
* Update Russian translation. Closes: #266294
* Update Dutch translation
2004-08-15 Christian Perrier <bubulle@debian.org>
* Update French translation.
* Update Czech translation (seems that Dennis commit was wrong)
2004-08-11 Daniel Burrows <dburrows@debian.org>
* po/el.po:
Update Greek translation (Closes: #265006).
2004-08-10 Daniel Burrows <dburrows@debian.org>
* po/ja.po:
Update Japanese translation (Closes: #264867).
* src/generic/matchers.cc, doc/en/aptitude.xml:
Do priority matching by priority type (based on the input string)
rather than by string. This will make searches by priority
somewhat faster, as well as making them reliable regardless of
locale.
2004-08-09 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_action.cc (cmdline_applyaction):
Adjust which version is used to check for matches against patterns
on the command line: for "install", "hold", and "forbid-version"
actions, the candidate version is used; for "remove" and "purge"
actions, the current version is used; for other actions, the
install version is used. This fix is needed for debian-boot in
sarge.
2004-08-06 Daniel Burrows <dburrows@debian.org>
* doc/cs/Makefile.am, doc/de/Makefile.am:
Argh, really fix installation of XML manpages.
* NEWS, configure.ac, doc/cs/aptitude.xml, doc/en/aptitude.xml:
Bump version to 0.2.15.6.
* doc/en/aptitude.xml:
Add some more language credits.
* help-fi.txt, po/fi.po:
Update Finnish translation. (Debian bug #263313)
* doc/Makefile.am:
Alphabetize.
* doc/cs/Makefile.am, doc/de/Makefile.am:
Really fix the installation of manpages (tested this time!).
* Makefile.am, aptitude.de.8:
The German manpage doesn't belong here any more. Remove it.
* Makefile.am:
Make sure to actually install the non-XMLified manpages.
* doc/cs/Makefile.am, doc/de/Makefile.am:
Adjust how manpages are built and installed: the makefiles for
localized manpages are more consistent now and actually install
the manpages.
* configure.ac, doc/Makefile.am, doc/de/Makefile.am, doc/de/aptitude.xml, doc/de/manpage.xml, doc/de/fixquote, help-de.txt:
Apply the rest of the German translation from #262534.
2004-08-05 Daniel Burrows <dburrows@debian.org>
* src/pkg_ver_item.cc:
Unreverse the logic for displaying the size change due to a
particular version.
2004-08-01 Dennis Stampfer <seppy@debian.org>
* Update German translation from Debian-Bug #262534
(This does *not* close #262534)
* Update Czech translation by Miroslav Kure.
Closes Debian-Bug #262524
* Update Danish translation by Morten Bo Johansen
Closes Debian-Bug #262129
2004-07-29 Dennis Stampfer <seppy@debian.org>
* Update Dutch translation by Luk Claes
(Closes Debian Bug #262000)
2004-07-28 Dennis Stampfer <seppy@debian.org>
* Update Italian program translation by Danilo Piazzalunga
(Closes Debian Bug #261819)
2004-07-24 Christian Perrier <bubulle@debian.org>
* Update Portuguese translation.
(Closes Debian Bug #261502)
2004-07-25 Daniel Burrows <dburrows@debian.org>
* doc/en/aptitude.xml, src/ui.cc:
Added an option to disable the "nothing to be done" warning
when there are upgradable packages. (Debian bug #260590)
* do/aptitude.xml, po/pt.po:
Updated Porugtuese translation. (Debian bug #261425)
* doc/en/aptitude.xml, src/pkg_columnizer.cc, src/pkg_columnizer.h, src/pkg_ver_item.cc, src/vscreen/vscreen.cc:
Add a format code for policy information (Debian bug #240423).
2004-07-24 Dennis Stampfer <seppy@debian.org>
* Update Brazilian translation.
(Closes Debian Bug #260953)
2004-07-24 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vscreen.cc:
Use portable pthreads code. (Debian bug #260259)
* src/generic/apt.cc:
Check the whole surrounding dependency when looking at recommends
and suggests.
2004-07-21 Christian Perrier <bubulle@debian.org>
* Update Dutch translation. Antwerp dialect joke removed
(Debian bug #260632)
* Update Brazilian translation.
(Debian bug #260953)
* Update Italian translation.
(Debian bug #261017)
* Update Greek translation.
(Debian bug #261029)
* Update Catalan translation.
(Debian bug #261095)
* Update German translation.
2004-07-21 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_pager.cc:
Scroll by the screen height, not the screen width. Thanks to
Neil Moore. (Debian bug #260713)
2004-07-21 Christian Perrier <bubulle@debian.org>
* Rebuild aptitude.pot yet another time
* Update French translation " " "
* Update Spanish translation " " "
2004-07-20 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Make it possible to undo a "forget new" command again.
* src/cmdline/cmdline_changelog.cc, src/view_changelog.cc, po/:
Detect attempts at viewing changelogs for packages that trivially
have no changelogs available, and warn the user instead of blindly
trying to fetch the changelog. (Debian bug #260477)
* src/download.cc, doc/en/aptitude.xml:
Support multiple log destinations. (Debian bug #259714)
2004-07-20 Christian Perrier <bubulle@debian.org>
* Updated German translation
2004-07-19 Daniel Burrows <dburrows@debian.org>
* src/pkg_tree.cc:
Treat an empty limit string as "no limit". (Debian bug #260244)
2004-07-19 Christian Perrier <bubulle@debian.org>
* Updated French translation
* Updated Spanish translation
2004-07-18 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_moo.cc:
Don't insult the user.
2004-07-17 Daniel Burrows <dburrows@debian.org>
* doc/cs/aptitude.xml, doc/cs/images/*, help-cs.txt, po/cs.po:
Updated Czech translation from Miroslav Kure. (Debian bug #259966)
2004-07-15 Daniel Burrows <dburrows@debian.org>
* src/cmdline/cmdline_download.cc:
Make the error message when a package is not downloadable a little
clearer.
* src/cmdline/cmdline_changelog.cc, src/cmdline/cmdline_changelog.h, src/cmdline/cmdline_prompt.cc:
Support viewing changelogs from the command-line prompt.
* src/generic/matches.cc, doc/en/aptitude.xml:
Enhance the "provides" matcher to support full subterms;
extend ~D to support any dependency class; change ~R to
implicitly check predepends with depends; close some memory
leaks; document the user-visible changes.
* help.txt, src/defaults.cc, src/pkg_tree.cc, src/ui.cc, doc/en/aptitude.xml:
Bind the new command to 'b', document it, and fix some incorrect
entity references in the documentation.
* src/menu_redirect.h, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_view.cc, src/ui.cc, src/ui.h:
Add a very visible command to search for '~b' (the next broken
package). (Debian bug #162474)
* src/cmdline.cc:
Mention that a package is 'new' in "aptitude show"; don't show
information about whether it is automatically installed unless
it's installed.
* doc/en/aptitude.xml:
Document the new menu commands.
* src/vscreen/vs_menu.cc:
Don't disable bold after printing an explicitly bold character in
a menu label, in case the underlying color is also bolded.
* src/menu_redirect.h, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_view.cc, src/ui.cc, src/ui.h, src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Use bool as the return value for menu item signals, and use
OrMarshal to marshal them. This means that a menu item's
emission will, presuming all goes well, stop as soon as
something handles it. This avoids the infinite recursive
add_main_widget death that was occuring after the last commit.
2004-07-14 Daniel Burrows <dburrows@debian.org>
* src/menu_redirect.h, src/pkg_item.cc, src/pkg_item.h, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_ver_item.cc, src/pkg_ver_item.h, src/pkg_view.cc, src/ui.cc, src/ui.h:
Add items to the package menu to examine some package information.
Currently buggy, will be fixed.
* src/menu_redirect.h, src/pkg_node.h, src/pkg_tree.cc, src/pkg_view.cc, src/ui.cc, src/ui.h:
Add items to the package menu to adjust a package's state.
* src/cmdline/cmdline_show.cc:
Fix upgrade/downgrade confusion.
* src/main.cc:
Add a 'usage' string for -o.
* doc/en/manpage.xml, src/cmdline/cmdline_download.cc:
Allow the user to select which version of a package should be
downloaded; print an error message if the package can't be
downloaded.
(Debian bug #160145)
* doc/en/manpage.xml, src/main.cc, src/cmdline/Makefile.am, src/cmdline/cmdline_changelog.cc, src/cmdline/cmdline_changelog.h:
Add support for downloading changelogs from the command-line.
* src/cmdline/cmdline_util.cc:
Fix the common function to initialize all its out parameters and
to not fall off the end of the function.
* src/cmdline/cmdline_util.cc:
Complain loudly in cmdline_find_ver if there's no candidate
version available. (Closes: #213106)
* src/cmdline/cmdline_progress.cc:
Delete the progress bar when we're done with it.
* src/cmdline/cmdline_action.cc, src/cmdline/cmdline_action.h, src/cmdline/cmdline_util.cc, src/cmdline/cmdline_util.h:
Split the source/archive parsing code into a small common function;
modified applyaction and find_ver to adjust for the new interface.
* po/POTFILES.in:
Update POTFILES.in.
* src/cmdline/cmdline_show.cc:
Display information about the package's aptitude state.
* src/generic/apt.cc:
When testing if a package is suggested/recommeded, only
return true if the suggestion/recommendation is unfulfilled.
* src/generic/aptcache.cc, doc/en/aptitude.xml:
Reinstate Suggests-Important for the purpose of finding unused
packages, so people don't get rudely surprised by the new behavior.
(Debian bug #259387)
2004-07-13 Daniel Burrows <dburrows@debian.org>
* configure.ac, src/Makefile.am, src/cmdline.h, src/cmdline.cc, src/download.cc, src/main.cc, src/cmdline/*:
Finally bite the bullet and split cmdline.cc into a gajillion
tractably-sized modules.
* src/generic/infer_reason.cc:
Filter out all Conflicts in which the only *to-be-installed*
package providing the Conflicted name is the package containing
the Conflict.
* src/reason_fragment.cc:
Remove the no-longer-necessary display of the size change
due to a package.
* src/cmdline.cc, src/pkg_grouppolicy.cc:
Display recommended packages in both the command-line preview
and the visual preview.
* src/generic/apt.cc, src/generic/apt.h:
Add a "pkg_recommended" function -- similar to "pkg_suggested",
but triggers if the suggester is going to be installed OR upgraded.
* src/generic/rev_dep_iterator.h:
Make it compile *oops*.
* src/generic/rev_dep_iterator.h:
When iterating a package's reverse dependencies, include
dependencies through a virtual package.
* Makefile.am:
Add basic support for disabling compilation and/or documentation.
* src/ui.cc:
Fix stupid thinko when handling fallback for translated docs.
* doc/cs/Makefile.am:
Don't build the text version of the Czech manual, as it's
currently useless.
* doc/en/Makefile.am:
Force automake, kicking and screaming, to not dump the generated
README in the distributed tarball.
* src/cmdline.cc:
Doh, actually make sure it compiles.
* src/cmdline.cc:
Only display annoying "not doing anything because it was already
done" messages if verbose>0. (Debian bug #258913)
* README:
automake wants a README; add one that explains how to generate
the real README.
* Makefile.am, README, aptitude.8, aptitude.cs.8:
Purge autogenerated files.
* doc/Makefile.am, doc/cs/Makefile.am, doc/en/Makefile.am:
Move the distribution command for the stylesheets to doc/ from
doc/{en,cs}.
* doc/cs/Makefile.am:
Build the Czech manual page under the right name (aptitude.cs.8)
but don't install it automatically, since automake does the
Wrong Thing here.
* configure.ac, doc/en/aptitude.xml, doc/cs/aptitude.xml, NEWS:
Bump version to 0.2.15.3.
* doc/en/Makefile.am, doc/en/manpage.xml:
Fix some formatting issues, fix the dependencies for generating
the documentation (all forms should depend on manpage.xml).
* doc/en/Makefile.am, doc/en/aptitude.xml, doc/en/manpage.xml:
Split the English manpage into a separate XML file.
(Debian bug #259089)
* po/fr.po:
Correct what I believe is an accidental error in the French
translation: "yes" and "no" were being bound to upper-case
keys by default.
* po/cs.po:
Localize README in the Czech variant.
* src/ui.cc:
When documentation is translated, fall back to the
English-language version if the translated docs are missing.
* doc/en/Makefile.am, doc/cs/Makefile.am:
Install the HTML documentation in localized directories.
Install the resulting READMEs under README and README.cs.
* doc/Makefile.am:
Still build the en documentation (it was carelessly removed).
* configure.ac, doc/Makefile.am, doc/cs/Makefile.am, doc/cs/aptitude.xml, doc/cs/images:
Add Miroslav's Czech translation to the source tree.
* doc/aptitude-txt.style, doc/en/Makefile.am, doc/en/aptitude-txt.style:
Move the text stylesheet to the common directory.
* doc/en/Makefile.am:
Fix the "clean" rule.
* doc/en/Makefile.am, doc/en/, doc/:
Move the XSL and CSS stylesheets from doc/en/ to doc/.
* doc/en/*, doc/*, configure.ac:
Add the beginnings of support for localization of the full
manual.
* po/cs.po:
Translation updates from Miroslav Kure.
* doc/aptitude.xml:
Fixes from Miroslav Kure.
* README.i18n:
Describe how key translations work.
2004-07-12 Daniel Burrows <dburrows@debian.org>
* src/reason_fragment.cc:
Further adjust the display of brokenness reasons for
self-conflicts: only really pointless self-conflicts (where
the only thing providing the conflicted name is the package
itself) are dropped; when displaying provided packages,
the package which is the source of the dependency is excluded
from the list of packages providing the target.
* src/ui.cc:
Really make the menubar properly hide on startup.
* src/generic/aptcache.cc:
Make the automatic package tracking smarter about versions: if
upgrading a package causes it to become unused, it will be held
(eg, upgrading foo-data without foo); if a package will be
removed because it is unused, it will be restored to the
candidate version or the current version (whichever satisfies
the dep).
* src/generic/apt_undo_group.cc, src/generic/apt_undo_group.h, src/generic/aptcache.cc, src/generic/Makefile.am, src/pkg_item.cc, src/pkg_node.cc, src/pkg_node.h, src/pkg_tree.cc, src/pkg_ver_item.cc, src/ui.cc:
Overhaul how upgrades, garbage collection, and undos are handled.
This fixes the problems with undoing an "upgrade" command, and
probably several other unreported but obnoxious bugs.
The major change is that upgrades are handled as an action group
and that mark_and_sweep uses an internal action group (to avoid
calling cleanup_after_change too many times).
2004-07-12 Christian Perrier <bubulle@debian.org>
* Regenerate aptitude.pot and update po files
* Updated French and Brazilian translations
* Updated Greek translation. #258805
2004-07-11 Daniel Burrows <dburrows@debian.org>
* src/generic/infer_reason.cc:
Filter self-conflicts when walking in the forward direction
as well. (Debian bug #258533)
* src/ui.cc, src/vscreen/vscreen.cc:
Make the default for the Yes and No keys the first character
of the translation of "yes_key" and "no_key". This will give
more flexibility to translators (the first characters of Yes
and No are not always appropriate..)
* src/ui.cc:
Er, make it compile again by fixing the translation tweak (oops).
* src/tasks.cc:
Change the handling of keys so that tasks without keys
won't be hidden.
* src/ui.cc:
Make sure that the menu bar is properly hidden on startup if the
user requested it (Debian bug #258688).
2004-07-11 Christian Perrier <bubulle@debian.org>
* Updated Brazilian translation. #258667
* Updated Greek translation. #258805
2004-07-09 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Make another yes/no prompt (when minibuf prompting is on)
translated.
* src/vscreen/vscreen.cc, doc/aptitude.xml:
Make the Yes and No keybindings translatable, and document their
existence. (Debian bug #258409)
* src/pkg_item.cc:
Make the visible version more stable and useful (now that
packages are often not upgraded): return the candidate
version if there is one; return the current version if
possible; otherwise return the to-be-installed version.
2004-07-07 Christian Perrier <bubulle@debian.org>
* Regenerate aptitude.pot and update po files
* Updated French translation
2004-07-08 Daniel Burrows <dburrows@debian.org>
* src/dep_item.cc, src/reason_fragment.cc:
When displaying reasons, flag unavailable packages.
* po/es.po:
Spanish translation update from Ruben Porras.
(Debian bug #258243)
2004-07-07 Daniel Burrows <dburrows@debian.org>
* NEWS, configure.ac, doc/aptitude.xml:
Bump version to 0.2.15.2.
2004-07-07 Christian Perrier <bubulle@debian.org>
* Regenerate aptitude.pot and update po files
* Updated French translation
2004-07-07 Daniel Burrows <dburrows@debian.org>
* aptitude-defaults:
Hide version numbers in the Vertical-Split theme.
2004-07-06 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc, src/generic/config_signal.cc, src/generic/config_signal.h, src/load_pkgview.cc, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_view.cc, src/pkg_view.h, src/ui.cc:
Don't pass the "current value" into configuration signals. This
is somewhat less convenient...but doesn't present false information
when a value is unset (ie, it forces the user to supply a correct
default value :-/ ). Actually, more bindings were discarding
the current value than using it, so this is only a minor problem.
Among other things, this manages to fix reverting some settings,
such as menubar-autohide.
* src/generic/apt.cc, src/generic/config_signal.cc, src/generic/config_signal.h:
Make sure that reverting the options returns to the initial
options. Signal emission is still messed up.
* src/apt_config_widgets.cc, src/apt_config_widgets.h, src/cmdline.cc, src/generic/apt.cc, src/generic/config_signal.cc, src/generic/config_signal.h, src/main.cc:
First steps towards a (slightly hacky) separation between user and
system configuration. In an apparently working system, the
user's configuration is only saved to ~/.aptitude/config if
it was changed at some point from the system default. Reversion
is not handled quite right, but apparently it wasn't handled quite
right anyway. (Debian bug #175409)
* src/generic/aptcache.cc, src/generic/aptcache.h, doc/aptitude.xml:
Apparently some people were using Suggests-Important for its
side-effect of keeping automatically installed packages on the
system as long as something Suggested them. The new
configuration option Keep-Suggests does just that, without
causing Suggested packages to be installed. Also, the gc
code has been slightly optimized by lifting configuration Find
commands out of loops.
* doc/aptitude.xml:
Fix the synopsis of forbid-version (it was forbid-upgrade).
(Debian bug #257901)
2004-07-04 Christian Perrier <bubulle@debian.org>
* Updated Finnish translations. Closes: #257902
* Updated Italian translations. Closes: #257710
2004-07-04 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
Remove an accidental accent from mine-snapshot5.png.
* doc/images/Makefile.am:
Fix the list of stuff to distribute.
* NEWS, configure.ac, doc/aptitude.xml:
Bump version to 0.2.15.1.
* doc/images/Makefile.am:
Doh, actually distribute the screenshot images!
2004-07-03 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Systematically use *this to access *this, not *apt_cache_file.
One stray case of the latter was left, and that code path seems
to trigger in unknown circumstances when *apt_cache_file is
invalid. (Debian bug #257420)
2004-07-01 Daniel Burrows <dburrows@debian.org>
* NEWS:
More missing Debian bugs.
* src/main.cc, NEWS:
Make -r and -R work. (Debian bug #243289)
* NEWS:
Add missing notes about Debian bugs. (oops)
* doc/Makefile.am:
Add the documentation to EXTRA_DIST so it gets distributed too
(double oops).
* src/vscreen/Makefile.am:
Add bool_marshal.h to SOURCES so it gets distributed (oops).
* configure.ac:
Bumped the version to 0.2.15.
* doc/aptitude.xml:
Add a "see also" section.
* doc/Makefile.am:
Really install the manual page.
* Makefile.am, aptitude.1, aptitude.cs.1, aptitude.de.1, aptitude.fi.1, aptitude.fr.1, aptitude.gl.1, aptitude.it.1, aptitude.pl.1, aptitude.8, aptitude.cs.8, aptitude.de.8, aptitude.fi.8, aptitude.fr.8, aptitude.gl.8, aptitude.it.8, aptitude.pl.8:
Move the manual pages to section 8.
* src/view_changelog.cc, src/vscreen/testvscreen.cc, src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h, src/vscreen/vs_util.cc:
Fix a bug in the pager by completely rewriting it; it no longer
tries to be ridiculously efficient, which means the code is
much cleaner and less buggy. (for instance, the mmap is only
used when reading a file off the disk; once it's in memory it's
stored as a vector of strings)
* doc/aptitude.xml:
Add a missing question to the FAQ.
* Makefile.am, doc/Makefile.am:
Don't install the old README; install the new README and manpage.
* doc/aptitude.xml:
Rip an overused platitude to head up the tutorial.
* src/generic/matchers.cc:
Fix the virtual matcher: previously it matched anything that
happened to pass in an "end" version; now it matches only true
pure virtual packages.
* doc/Makefile.am, doc/aptitude-txt.xsl:
Use both hooks and crooks to eliminate entities from the
generated README.
* Makefile.am, doc/Makefile.am:
Install the README, and make sure installation succeeds even if
/var/lib doesn't exist.
* NEWS:
Update for 0.2.15.
* doc/aptitude.xml:
Document --visual-preview.
* doc/aptitude.xml:
Write the beginnings of a Credits chapter -- maybe enough for
the time being?
* doc/aptitude.xml:
Correct the documentation of #.
2004-06-30 Daniel Burrows <dburrows@debian.org>
* doc/Makefile.am, doc/aptitude.xml, doc/aptitude-man.xsl:
Finish up the reference section of the documentation, and
generate a manpage from it.
* src/cmdline.cc:
Fix the "show" command.
* src/pkg_columnizer.cc, src/pkg_columnizer.h, src/pkg_ver_item.cc, doc/aptitude.xml, doc/images/install-snapshot.png, doc/broken-snapshot.png, doc/preview-snapshot.png:
Add support for a %Z escape that shows the size change between
versions, make it part of the default theme, and update the
documentation accordingly.
* doc/aptitude.xml:
Fix the name of a Minesweeper screenshot: s/shapshot/snapshot/.
* doc/aptitude.xml:
Add a quotation for the FAQ.
* doc/aptitude.xml:
Document how to play Minesweeper.
* doc/Makefile.am:
Copy, don't link, the CSS file into place (avoids problems
caused by accidentally cloning the link).
* doc/aptitude.xml:
Eliminate dangling references and other errors by fixing element
ids, removing references to sections that won't be written before
the next release, and changing xrefs to links where appropriate.
* doc/aptitude.xml:
Document the configuration file.
* src/ui.cc:
When the user reverts their options to the defaults, save
immediately (so the reversion takes effect next time they
run aptitude).
* src/generic/aptcache.cc:
Correct a place where the value of Auto-Install was read instead
of the value of Aptitude::Auto-Install.
2004-06-29 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml, doc/images/colors-snapshot.png:
Add a slightly eye-watering display of how you can customize
aptitude's colors.
* doc/Makefile.am, doc/aptitude-txt.style, doc/aptitude-txt.xsl, doc/aptitude.xml:
Use textobjects as the primary content of screenshots when generating
text output, don't indent <PRE> tags in the text output, and
wrap at 80 columns in the text output.
* doc/aptitude.xml:
Fix a number of dangling cross-references; s/"/'/g.
* doc/aptitude.xml, doc/images/dselect-theme.png, doc/images/vertical-split-theme.png:
Document how themes work.
* doc/aptitude.xml:
Document how to customize the display layout.
2004-06-29 Christian Perrier <bubulle@debian.org>
* Updated Japanese translation
* Update Japanese help file
2004-06-29 Daniel Burrows <dburrows@debian.org>
* src/load_pkgview.cc:
Use "top" and "bottom" for vertical alignment, not "left"
and "right".
* doc/aptitude.xml, doc/images/become-root-snapshot.png, doc/images/broken-snapshot.png, doc/images/expand-once-snapshot.png, doc/images/expand-thrice-snapshot.png, doc/images/expand-twice-snapshot.png, doc/images/info-snapshot.png, doc/images/install-snapshot.png, doc/images/limit-result-snapshot.png, doc/images/limit-snapshot.png, doc/images/menu-snapshot.png, doc/images/preview-snapshot.png, doc/images/search-snapshot.png, doc/images/start-snapshot.png, doc/images/update-snapshot.png:
Update the screenshots to reflect the new appearance of aptitude;
made some minor editorial changes at the same time.
* src/pkg_columnizer.cc:
Add a space between the two versions in the package display
format.
* doc/aptitude.xml:
Quote rationalization: changed all double-quotes in the text
to <quote>...</quote>, and changed all double-quotes in tags
to single-quotes (except where doing so was impossible).
2004-06-25 Christian Perrier <bubulle@debian.org>
* Regenerate aptitude.pot and update po files
* Updated French translation
* Updated Dutch translation
* Updated Czech translation. Closes: #256326
2004-06-24 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.css:
Shade <cmdsynopsis> elements.
* doc/aptitude.xml:
Document how to customize the program's colors.
* src/mine/cmine.cc, src/vscreen/vscreen.cc, src/vscreen/vs_minibuf_win.h:
Expunge remaining references to ScreenBackgroundColor.
* doc/aptitude.xml:
Document a few more useful command-line actions in the tutorial
section.
* doc/aptitude.xml:
Make sure that all sections and chapters (that are written) have
introductory text, so we don't have bare tables of contents sitting
around. Changed the enumeration of basic aptitude command-line
actions from an ordered list to a variable list.
* doc/aptitude-html.xsl:
Chunk even more aggressively, and generate more local
tables of contents.
* doc/aptitude-common.xsl, doc/aptitude-html.xsl:
Chunk the documentation more aggressively, so the individual
pages don't get so huge.
* doc/aptitude.xml:
Add entries for a number of missing keys; editorially change
a preposition in the description of grouping policies; move
the Minesweeper seection to the toplevel and give it an ID;
add a section to document display layout customization.
* src/mine/cmine.cc:
Change the default load/save bindings to S and L (so they
don't collide with the directional bindings).
* src/download_bar.cc:
Expunge references to ExitScreen.
* src/download_screen.cc, src/vscreen/vscreen.cc:
Expunge references to AbortScreen.
2004-06-23 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
Exhaustively document menu commands.
* doc/aptitude.xml:
Add cross-references from the list of bindings to the list
of package commands. Add Purge to the list of bindings.
* doc/aptitude.xml:
Add a <thead> to the list of package commands.
* doc/aptitude.css:
Add some subtle background shading to admonitions.
* doc/aptitude.xml:
Document how to configure keybindings.
* src/vscreen/config/keybindings.cc:
Add a hack for binding to commas, since the frontend parsing
doesn't handle them cleanly and I can't easily fix it.
* src/ui.cc, src/pkg_node.cc, src/vscreen/vscreen.cc, src/vscreen/config/keybindings.h, src/vscreen/vs_text_layout.cc, src/vscreen/vs_table.cc, src/vscreen/vs_menubar.cc:
Fix a number of incorrect initializations of keybindings objects
(they were using "new keybindings(global_bindings)" instead of
"new keybindings(&global_bindings)"), make the copy constructor
of keybindings private so it doesn't accidentally get invoked,
and make sure that *all* the keybinding domains get loaded.
* src/vscreen.cc, src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Add a keybinding domain for the vs_text_layout widget.
2004-06-16 Christian Perrier <bubulle@debian.org>
* Updated Italian translation
* Updated Basque translation #244858
2004-06-21 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
Use <keycombo> for the Control-u "undo" shortcut.
* doc/aptitude.xml:
Document sorting policies.
* doc/Makefile.am, doc/aptitude-txt.sed:
sed is the wrong way to handle "bad" entities; don't use it
for now.
* doc/Makefile.am, doc/aptitude-txt.style, doc/aptitude-txt.sed:
Use html2text, not links, to generate the text output.
2004-06-16 Christian Perrier <bubulle@debian.org>
* Updated German translation. #255396
2004-06-20 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.css, doc/aptitude-html.xsl, doc/Makefile.am:
Added a basic CSS stylesheet (the initial values are partly
borrowed from Subversion). The current stylesheet just puts
borders around "tip" et al, and stripes alternate rows of
tables.
* doc/aptitude-txt.xsl, doc/Makefile.am:
Added some basic magick to output a text version of the
documentation. Unfortunately, the DocBook people seem to
believe that it should be as difficult as possible to get
a sensible text version of your document. :-(
* doc/aptitude.xsl, doc/aptitude-html.xsl, doc/Makefile.am:
Rename aptitude.xsl to aptitude-html.xsl.
* doc/aptitude.xsl, doc/aptitude-common.xsl:
Add a common stylesheet, holding variables for all stylesheets.
* doc/aptitude.xml:
Add a legalnotice with the GPL boilerplate text after
s/program/manual/.
* doc/aptitude.xml:
Clarify that %n outputs the version of the program, not just
0.2.15.
* doc/aptitude.xml:
Add a link to a tutorial on regular expressions.
* doc/aptitude.xsl:
Display segmentedlists as tables.
* doc/aptitude.xml:
Document the display formatting system, change the version
of the vprogram as given in the internal subset, add a basic
copyright notice, and move some lists of stuff into figures
for cross-referencing.
* src/pkg_columnizer.cc:
Remove an unnecessary, and probably harmful, # in the default
format string.
* src/ui.cc:
Menus in aptitude are now exactly the minimum size.
* src/vscreen/vs_menu.cc:
Really fix the calculation of minimum menu size.
* src/vscreen/testvscreen.cc:
Menus in the test program are now exactly as large as necessary.
* src/vscreen/vs_menubar.cc:
Handle placing menus in narrow screens more gracefully.
* src/vscreen/vs_menu.cc:
Make sure that menus are always wide enough to display shortcuts.
* doc/aptitude.xml:
Write the section on search patterns, start an FAQ, and add some
missing cross-references.
* po/zh_TW.po:
Fix two msgstrs that didn't match the formatting of the
corresponding msgid (Taiwanese people are probably very
confused about why their aptitudes are going to use or
free huge amounts of disk space, and why it's always
given in bytes...)
* po/fi.po:
Somehow this didn't have a Language-Team header, which caused
'make' to fail (but not until after the last commit?!).
Added one.
* doc/Makefile.am:
Fix installation of documentation.
* intl/ m4/ po/remove-potcdate.sin po/quot.sed po/Rules-quot po/insert-header.sin po/Makevars po/en@quot.header po/en@boldquot.header po/boldquot.sed src/mine/Makefile.am src/generic/Makefile.am src/vscreen/config/Makefile.am src/vscreen/Makefile.am src/Makefile.am configure.ac ABOUT-NLS:
Re-run gettextize, largely to fix the fact that 'make install'
is broken.
2004-06-19 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
First crack at documentation of how automatically installed
packages work.
2004-06-18 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
More documentation work...getting closer...
* src/reason_fragment.cc:
Be more aggressive about showing Providing packages: for a
Conflicts, show any package that is currently installed or will be
installed; for a Depends, show all packages.
2004-06-16 Christian Perrier <bubulle@debian.org>
* Re-Updated Lithuanian translation
* Updated Japanese translation
2004-06-16 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
And it's <guimenuitem>, not <menuitem> (why didn't nxml catch these?)
* doc/aptitude.xml:
Whoops, it's <replaceable>, not <replacable>.
* doc/aptitude.xml:
Document that you can create a view with the "categorical browser"
option, and only say that aptitude explains why brokenness
occurs (not that it suggests a solution).
* src/ui.cc:
Just disable use of the non-hierarchical view for now; it's too
broken. (Debian bugs #120978, #144079, #144083, #151437, #242397)
* doc/aptitude.xml:
Write more sections.
* src/cmdline.cc:
` Show ORed dependencies properly in "aptitude show"
(Debian bug #254740).
* doc/aptitude.xml:
Editing, and write another section.
2004-06-16 Christian Perrier <bubulle@debian.org>
* Updated Simplified Chinese translation
* Updated Lithuanian translation
2004-06-15 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
Write an introduction for the Reference Guide.
* doc/aptitude.xsl:
Really chunk sections separately.
* doc/Makefile.am, doc/aptitude.xsl:
Really enable the navigation images.
* doc/aptitude.xml:
Make sure that <screen> and </screen> tags are flush against
the verbatim stuff, so that stray newlines don't creep into
the documentation.
* doc/Makefile.am, doc/aptitude.xsl:
Add an XSL stylesheet for the documentation.
2004-06-15 Christian Perrier <bubulle@debian.org>
* Regenerate aptitude.pot and update po files
* Updated french translation
* Updated spanish translation
* Updated dutch translation
2004-06-14 Daniel Burrows <dburrows@debian.org>
* src/aptitude.h, src/pkg_grouppolicy.cc, src/generic/tasks.cc:
Apply (with small modifications) patch from Denis Barbier to
translate task descriptions. It doesn't seem to cause
regressions for English; I can't test the translation, but I
assume it works. (Debian bug #203725)
* configure.ac:
Tell configure about bs so aptitude compiles.
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Add a --visual-preview option, which pops into the visual
interface in the preview step. (Debian bug #253335)
* src/cmdline.cc:
Don't display the Essential warning/prompt if the user cancelled
the removal. (Debian bug #254422)
2004-06-14 Christian Perrier <bubulle@debian.org>
* Dutch translation update
* Basque translation update
2004-06-13 Christian Perrier <bubulle@debian.org>
* Polish translation update
* Brazilian Portuguese translation update
* Partial Bosnian translation added
* Updated German translation, help page and man page
* Updated Makefile to install German translations
* Italiann translation updated
2004-06-10 Christian Perrier <bubulle@debian.org>
* Czech translation update
2004-06-09 Christian Perrier <bubulle@debian.org>
* Regenerate aptitude.pot and update po files
* Updated french translation
2004-06-11 Daniel Burrows <dburrows@debian.org>
* src/cmdline.cc:
When mentioning packages that contain a string, don't show pure
virtual packages unless something Provides them.
* src/ui.cc:
Disable the Next/Previous View commands if no other views
are visible. Disable Close if no view is visible.
* src/ui.cc:
Disable the Undo command if no undos are available.
* src/ui.cc:
Move the Undo menu left several slots.
2004-06-09 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Disable the "become root" menu item if the user is already root.
* src/vscreen/vs_menu.cc:
Don't crash if the first item in the menu is disabled.
* src/ui.cc:
Disable the update/install menu items if an update or install
is already taking place.
* src/ui.cc:
Disable the "forget new packages" menu item if no packages are new.
* src/generic/aptcache.cc:
Don't count pure virtual packages as "new".
* src/generic/aptcache.cc, src/generic/aptcache.h:
Add support for counting the number of "new" packages.
* src/vscreen/vs_menu.cc:
Only respond to mouse presses when a selectable (enabled) menu
item is clicked on.
* src/pkg_tree.cc, src/pkg_tree.h:
In package lists, allow the user to limit the display.
* src/vscreen/vs_menu.cc:
Fix the movement commands in a menu to more correctly handle
menus that mix enabled and non-enabled items.
* src/menu_redirect.h, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_view.cc, src/ui.cc, src/ui.h:
Add signals, methods, and connections to make the search menu
command functional.
* src/ui.cc:
Hopefully fix compilation problems on ia64. (Debian bug #243932)
* src/ui.cc:
Add a menu that allows the user to search for a package or to
limit the displayed packages.
* src/pkg_tree.cc, src/pkg_ver_item.h:
Allow searches to match package version nodes.
* src/apt_info_tree, src/pkg_tree.cc, src/pkg_tree.h:
Move all searching functionality into the pkg_menu_tree.
* src/menu_redirect.h, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_view.cc:
Hook up the package menu items other than Install.
2004-06-09 Christian Perrier <bubulle@debian.org>
* Regenerate aptitude.pot and update po files
* Updated french and dutch translations
2004-06-08 Daniel Burrows <dburrows@debian.org>
* src/download.cc, src/ui.cc, src/ui.h, src/view_changelog.cc:
Make sure that all menu items have a description.
* src/ui.cc:
Sanitize menu item descriptions: no menu item description should
end with a period. (Debian bug #244676)
* src/Makefile.am, src/apt_info_tree.h, src/menu_redirect.h, src/pkg_node.cc, src/pkg_tree.cc, src/pkg_tree.h, src/pkg_view.cc, src/pkg_view.h, src/ui.cc, src/ui.h:
Connect the package menu to the package view; it works now!
* src/cmdline.cc:
Remove an extraneous space from the display of Essential
information (it has now migrated to the translated string
instead of the format string).
* src/vscreen/vscreen_widget.h:
Make vscreen_widget derive virtually from Object, to allow
multiple inheritance later on.
2004-06-08 Christian Perrier <bubulle@debian.org>
* Added a missing space in the former "Essential:" string
Unfuzzied translations as well
* Regenerate aptitude.pot and update po files
Complete french translation
2004-06-07 Daniel Burrows <dburrows@debian.org>
* src/ui.cc, src/ui.h:
Add hooks for a "Package" menu, currently always disabled.
* src/vscreen/vs_menu.cc:
Call the highlighted signal when the menu is first displayed.
* src/vscreen/vs_menu.cc:
Make it possible to select menu items with Enter again.
* src/vscreen/vs_menubar.cc:
Correctly determine whether the cursor should be visible.
* src/vscreen/vscreen.cc, src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Use a menu item's enabled status to control how it is drawn and
whether it is selected.
* src/vscreen/bool_marshal.h:
Make the marshallers usable by making default_value() static.
* src/vscreen/vs_menu.cc, src/vscreen/vs_menu.h:
Add support for storing information on whether a menu item is
enabled.
* src/vscreen/bool_marshal.h:
Fix the header to compile.
* src/vscreen/bool_marshal.h:
Add marshallers that are more appropriate for Boolean return values.
2004-06-07 Christian Perrier <bubulle@debian.org>
* Re-make aptitude.pot and update translations
* French translation update
2004-06-06 Daniel Burrows <dburrows@debian.org>
* src/cmdline.cc:
"aptitude show" now prints whether a package is Essential: yes.
2004-06-04 Christian Perrier <bubulle@debian.org>
* Updated Norwegian Bokmal and Nynorsk translations
Bug #252507
2004-05-30 Daniel Burrows <dburrows@debian.org>
* doc/aptitude.xml:
Use the correct screenshot to illustrate the info screen, and
slightly expand the explanation of it.
* src/generic/aptcache.cc:
Always properly undo forbidden-version setting; previously it
would only work if some other part of the package's state changed
as a result.
* doc/aptitude.xml:
Describe the action flag.
* doc/aptitude.xml:
Move the "User's Guide" quote to the "Reference" section.
* src/generic/aptcache.cc:
When cleaning up package states after a change: if a package is
being kept in its current state, only set its state to Install if
it is already installed; if it was going to be installed, set its
state to Purge or DeInstall as appropriate.
* src/generic/aptcache.cc:
When keeping a package back, only reset its installation reason
to "manual" if it was actually being removed due to being unused.
2004-05-29 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Always run a garbage collection after loading the cache.
This was done previously, but only if packages were being
upgraded on startup; now it is done consistently (this makes
the behavior more sensible).
* src/pkg_subtree.cc:
Don't hold the whole subtree, keep it back.
* help.txt, src/defaults.cc, src/pkg_item.cc, src/pkg_item.h, src/pkg_node.cc, src/pkg_node.h, src/pkg_subtree.cc, src/pkg_subtree.h, src/pkg_ver_item.cc, src/pkg_ver_item.h:
Add a command to keep a package back without holding it (':'
by default)
* src/cmdline.cc, src/generic/aptcache.cc, src/generic/aptcache.h:
Add an option to all_upgrade which can be used to enable
auto-installation of dependencies.
* doc/aptitude.xml:
- Created the structure for the rest of the documentation.
- Wrote the section on the package synopsis.
- Wrote the section on the package info screen, with a
screenshot.
2004-05-27 Christian Perrier <bubulle@debian.org>
* Updated Danish translation
Bug #244539
* Added Catalan translation
Bug #248764
* Added Traditional Chinese translation and help text
Bug #244359
* Updated Portuguese translation
Bugs #244850, #245699
2004-05-24 Christian Perrier <bubulle@debian.org>
* Added Russian and Norwegian Bokmal translations
Bug #250498 and #250500
2004-05-17 Christian Perrier <bubulle@debian.org>
* Update Japanese translation and help text
Bug #250023
2004-05-20 Daniel Burrows <daniel@jester>
* configure.ac:
Add the toplevel Makefile back to configure.ac (oops!).
2004-05-18 Daniel Burrows <daniel@jester>
* doc/aptitude.xml:
Write a somewhat shorter tutorial on the command line of
aptitude.
2004-05-17 Christian Perrier <bubulle@debian.org>
* Include Dutch translation by Dutch team
Bug #249405
* Include Basque translation and help text
Bug #244858
* Update Italian translation, man page and help text
Bug #244679
2004-05-16 Daniel Burrows <daniel@jester>
* doc/aptitude.xml:
More or less finish the section of the tutorial on how to
use aptitude interactively.
2004-05-15 Christian Perrier <bubulle@debian.org>
* Include all Czech translation updates by Miroslav Kure
Bug #243728
2004-05-14 Daniel Burrows <daniel@jester>
* src/download_screen.h, src/dep_item.h, src/dep_item.cc:
Further g++ 3.4 fixes. It now reportedly compiles with g++ 3.4.
* doc/aptitude.xml: Incorporate several suggestions from kh to
improve the already-written portion of the documentation.
2004-05-13 Daniel Burrows <daniel@jester>
* src/pkg_item_with_subtree.h:
Work around a C++ language bug that's more "correctly" implemented
in g++ 3.4.
* src/generic/matchers.cc, src/vscreen/curses++.h, src/vscreen/vs_layout_item.h:
More g++ 3.4 fixes.
* src/strhash.h:
Fix a C++ error that causes compile failures on g++ 3.4, reported
by Josep Febrer.
2004-05-09 Daniel Burrows <daniel@jester>
* doc/aptitude.xml:
Various edits, and extended the tutorial to cover the most
basic tree manipulations.
2004-05-03 Daniel Burrows <daniel@jester>
* doc/aptitude.xml:
Finish up the Introduction section, hopefully.
* doc/aptitude.xml:
Finish the basic introduction to the aptitude UI, start the
part of the tutorial that discusses the list of packages.
2004-04-28 Christian Perrier <bubulle@debian.org>
* po/*:
Updated aptitude.pot and all PO files
French translation update
2004-04-23 Daniel Burrows <daniel@jester>
* src/cmdline.cc:
Add an "i" command in the command-line mode prompt, which allows
you to show information about a package.
2004-04-22 Daniel Burrows <daniel@jester>
* src/cmdline.cc:
Require only one -v, not two.
* src/generic/infer_reason.cc, src/generic/rev_dep_iterator.h:
Correct the logic in some usages of the new rev_dep_iterator
so that, among other things, the program doesn't crash.
(hopefully)
* src/generic/infer_reason.cc, src/generic/rev_dep_iterator.cc:
Provide the right versions to rev_dep_iterator, and don't
crash in it if a NULL version is provided.
* src/cmdline.cc:
If -v is given to an installation command, display Suggested
packages in the preview.
* src/pkg_grouppolicy.cc, src/generic/apt.cc, src/generic/apt.h:
Split out the package_suggested routine into generic code.
* README, aptitude.1, src/apt_options.cc, src/main.cc, src/generic/aptcache.cc, src/generic/aptitudepolicy.cc, src/generic/infer_reason.cc:
Remove all traces of Suggests-Important. (Debian bug #245410)
* src/pkg_tree.cc, src/pkg_tree.h:
When a limit doesn't match any packages, print an explanatory
message instead of giving the user a blank screen.
* src/generic/Makefile.am, src/generic/infer_reason.cc, src/generic/rev_dep_iterator.h:
Create a class to iterate over all reverse dependencies of
a package, including those via Provided packages. Use this
in infer_reason (Debian bug #244817).
* src/generic/infer_reason.cc:
Break out some common code from several cases in the
infer_reason function.
* src/generic/matchers.cc:
Greatly improve the matchers for reverse dependencies, and add
matchers for reverse and forward provides. Too sleepy to write
documentation or to debug the problem that this was created to
help debug.
2004-04-21 Daniel Burrows <daniel@jester>
* src/generic/matchers.cc:
When using a dep_matcher, check unversioned dependencies too.
2004-04-19 Daniel Burrows <daniel@jester>
* src/ui.cc:
Fix wrapping of errors -- successive errors were running together
instead of being placed on separate lines.
2004-04-17 Daniel Burrows <daniel@jester>
* src/defaults.cc, src/pkg_item.cc, src/pkg_ver_item.cc:
Add a convenient keybinding for reporting a bug.
2004-04-09 Christian Perrier
* update po files fter typo correction
* re-created POT file
2004-04-08 Daniel Burrows <daniel@jester>
* configure.ac, doc/Makefile.am, doc/aptitude.xml, doc/images/start-snapshot.png:
More documentation updates, including a screenshot.
* doc/aptitude.xml:
Better indentation and filling of text.
* doc/aptitude.xml:
Improve some wording in the description of package managers.
* doc/aptitude.xml:
Correct invalid XML.
* doc/aptitude.xml:
docbookide is deprecated, remove the docbook-mode marking.
* po/pt.po:
Translation update from Nuno S鮩ca (Debian bug #242372)
* src/generic/infer_reason.cc:
Correctly detect the end of OR groups (oops), so they are properly
displayed. (Debian bug #242663)
* po/lt.po:
Translation update from Darius ?itkevicius. (Debian bug #242815)
2004-04-07 Christian Perrier <bubulle>
* po/fr.po:
French update by Jean-Luc Coulon
2004-04-05 Daniel Burrows <daniel@jester>
* po/pt_BR.po:
Translation updates from Andre Luis Lopes. (Debian bug #242332)
* po/pt.po:
Translation updates from Nuno S鮩ca. (Debian bug #242309)
* aptitude.de.1, help-de.txt, po/de.po, src/mine/mine-help-de.txt:
Further German translation updates. (same)
* po/de.po:
Further updates to the German translation (Debian bug #233917).
* aptitude.1:
Patch from Sebastian Kapfer (Debian bug #242304).
2004-04-04 Daniel Burrows <daniel@jester>
* doc/aptitude.xml:
Write some preliminary text.
* Makefile.am, configure.ac, doc/Makefile.am, doc/aptitude.xml:
Add skeletal support for a docbook-xsl-based user's manual.
* src/generic/aptcache.cc:
Use *this, not *apt_cache_file, in is_held, so we don't crash when
apt_cache_file hasn't been initialized yet.
* po/es.po:
Spanish update from Ruben Porras.
* src/pkg_grouppolicy.cc:
Don't talk about Perl when describing the Python section.
2004-04-03 Daniel Burrows <daniel@jester>
* NEWS, README, configure.ac:
Updates for 0.2.14.1.
* src/cmdline.cc:
When verbosity is requested, display archive information
for packages in 'aptitude show'. If extra verbosity is
requested, display every version file as a separate record.
* src/pkg_info_screen.cc:
Add a tree in the info screen for virtual packages.
(Debian bug #121979)
* src/cmdline.cc:
Display information about provided and providing packages in
"aptitude show", even for pure virtual packages.
* src/vscreen/fragment.cc:
Always initialize indentattr to 0.
* src/vscreen/fragment.cc:
Make the indentation of an indentbox obey attributes set via
set_attr(). This makes the error dialog look right.
* src/ui.cc:
Add a slightly hacky method for calculating the correct number of
lines when requesting a size for an error pager.
* src/ui.cc:
Use fragments to display apt error messages (still needs some work).
This means that error messages wrap (Debian bug #233923).
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Add a vs_text_layout method which calculates the desired height
of the widget given a width.
* src/vscreen/Makefile.am, src/vscreen/testvscreen.cc, src/vscreen/vs_bin.h, src/vscreen/vs_bin.cc, src/vscreen/vs_center.h, src/vscreen/vs_center.cc, src/vscreen/vs_size_box.h, src/vscreen/vs_size_box.cc:
Add a 'vs_size_box', a layout widget that enforces a minimum size
on its contents.
2004-04-03 Christian Perrier <bubulle@debian.org>
* Portuguese program translation. Closes: #239171
* Italian translation update. Closes: #239915
* Czech translation update. Closes: #240604
* Lituanian translation update. Closes: #240683
* Simplified Chinese translation update. Closes: #240739
* Norwegian Nynorsk translation update. Closes: #241104
* Japanese translation update. Closes: #239242
2004-04-03 Daniel Burrows <daniel@jester>
* src/ui.cc:
Un-reverse logic in the use of is_held, so the warning dialog
about "maybe you didn't select packages for upgrade" is displayed
appropriately.
2004-04-02 Daniel Burrows <daniel@jester>
* README, src/pkg_columnizer.cc, src/pkg_columnizer.h, src/pkg_ver_item.cc:
Patch from Darren Salt and David Caldwell to add support for an
Archive column (%t). (Debian bug #113354)
* README, aptitude.1, src/cmdline.cc, src/main.cc:
Add a "reinstall" command-line action. (Debian bug #240225)
* src/generic/aptcache.cc, src/generic/tasks.cc:
Make sure to call Done() on the progress object to avoid spurious
problems later.
* src/ui.cc:
Fix an overlooked build error.
* Retroactive note:
Christian fixed Debian bugs #239171, #239915, #240604, #240683,
#240739, and #241104 in the massive update below, but forgot
to include ChangeLog notes for them. Adding one so they don't
get forgotten.
* src/apt_options.cc:
Remove a pointless second line in an option description.
(Debian bug #233528)
* src/ui.cc, src/reason_fragment.cc:
Use is_held in several more appropriate places.
* src/generic/aptcache.cc:
is_held now returns true only if the package in question is
actually installed.
* src/generic/aptcache.cc:
Use is_held internally to the apt-cache; among other things,
this makes "aptitude upgrade" behave correctly around forbidden
versions.
* src/cmdline.cc:
Oops, add a missing break statement so the program doesn't abort
when given the forbid-version command.
* src/main.cc:
Teach main about forbid-version so I can actually test it.
* src/cmdline.cc, src/generic/aptcache.cc, src/generic/aptcache.h:
Added a generic way to test whether aptitude should hold packages.
* README:
Remove a comment about an apt bug that has now been fixed.
* README:
s/interactive/visual/g
* README, ChangeLog:
Document "F".
* help.txt:
Document "F".
* src/ui.cc:
Instead of displaying an unhelpful blank screen, print a very
visible warning message if the user tries to do an install run
when there's nothing to install, remove, or upgrade. An exception
is made in the case when all upgradable packages have been
explicitly held back, but maybe it shouldn't be. If it looks like
the user forgot to press "U", print a gentle reminder about the
command.
* src/pkg_columnizer, src/pkg_ver_item.cc:
Add support for the "forbidden" state in the long form of the
column output.
* README, aptitude.1, src/cmdline.cc, src/main.cc:
Create and document a "forbid-version" command-line action.
* src/ui.cc:
Most of the screen real estate on the dep and version screens is
wasted, so the information area might as well be visible in them.
* po/zh_CN.po:
Add some missing newlines that were causing "make" to bomb out.
* configure.ac:
Add "lt", "nn", and "pt" to ALL_LINGUAS so "make" works again.
* aptitude.1:
Updates and proofreading from Danilo Piazzalunga:
General review: updated Options and Interactive Usage sections,
minor cosmetic fixes here and there. Corrected section for apt-get
reference, document -t option (Debian bugs #198891, #225053).
2004-03-22 Christian Perrier <bubulle@debian.org>
* Added po/aptitude.pot generated by
"xgettext -f po/POTFILES.in -k_ -kN_ -o po/aptitude.pot"
Will make translators work easier
* Updated po/fr.po
2004-03-21 Christian Perrier <bubulle@debian.org>
* Brazilian Portuguese program translation update. Closes: #237866, #199306
* Danish program translation update. Closes: #230642, #234805
* German program translation update. Closes: #233917
* Spanish program translation update. Closes: #234537
* French program translation update. Closes: #237501
French help file updated
French minesweeper help file added
* Finnish program translation update. Closes: #238188
Finnish help file updated
Finnish man page updated
* Japanese program translation update. Closes: #235256
Japanese help file added
* Partial Traditional Chinese program translation update. Closes: #230893
* Partial Greek program translation added. Closes: #237808
ALL_LINGUAS updated accordingly in configure.ac
2004-03-18 Daniel Burrows <daniel@jester>
* src/ui.cc:
Only quit abruptly if there are 0 main widgets left, not if there's
only 1 left.
* src/main.cc, src/pkg_tree.cc, src/pkg_tree.h, src/ui.cc, src/ui.h:
Display a progress bar while building package trees.
* src/main.cc:
Remove some very obsolete code which has been #ifdef'd out for years.
* src/generic/aptcache.cc, src/generic/apt.cc, src/generic/tasks.cc, src/generic/tasks.h:
Make progress calls for more operations.
* src/vs_progress.cc:
Update progress bars more frequently (4 times a second).
* src/ui.cc:
When the last main widget is destroyed, quit immediately (without
prompting). This handles the case where the last widget is a
download widget. (Debian bug #233783)
* src/generic/aptcache.cc, src/generic/aptcache.h:
Remember whether each package was to be upgraded.
* src/pkg_grouppolicy.cc:
Place security updates in a separate top-level tree.
* README:
Replace the reference to the Sourceforge repository with a
reference to SVN on Alioth.
* src/generic/pkg_changelog.cc:
Fix viewing changelogs of contrib/non-free packages.
(Debian bug #233855)
* src/pkg_grouppolicy.cc:
Add section descriptions for embedded, gnome, kde,
libdevel, perl, and python. (Debian bug #233913)
* src/main.cc:
Add a missing \n in usage(). (Debian bug #233920)
* src/download.cc, src/ui.cc, src/ui.h, src/view_changelog.cc:
Fix the titles given to download views. (Debian bug #234041)
* src/generic/pkg_changelog.cc:
Handle epoched versions correctly (Debian bug #237340).
2004-02-24 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
When a package that is being removed due to being unused is marked,
mark it for installation.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Use the signals in the configuration to run a mark and sweep whenever
the value of Recommends-Important or Suggests-Important changes.
2004-02-21 Daniel Burrows <dburrows@debian.org>
* src/reason_fragment.cc:
Teach reason-fragments (sort of) about forbidden versions.
* src/pkg_ver_item.cc:
Display "F" as the "action" for versions that are forbidden.
* src/pkg_columnizer.cc:
Display "F" as the "action" for packages that are kept because the
upgrade is forbidden.
* src/generic/aptcache.cc:
Write out *nonempty* forbidver tags, not empty ones.
* src/generic/aptcache.cc:
Add support for reading in forbidden versions stored in the state
cache.
* src/generic/aptcache.cc:
Fix segfaults in the forbidden-version code when no candidate
version is available.
* src/generic/aptcache.h:
Decorate some classes with doccomments.
* sec/generic/aptcache.cc, src/generic/aptcache.h:
Add basic support for a "forbidden version" flag: a version that
will not be upgraded too. (inspired by the XF86 DRI breakage)
2004-02-19 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Patch from Travis Crump <pretzalz@techhouse.org> to handle
situations where there are no views available but the UI is
supposed to exit when the last view closes. (Debian bug #233783)
Note that this situation *should* never occur, and it is a bug
that it is occuring at all.
2004-02-15 Daniel Burrows <dburrows@debian.org>
* src/pkg_grouppolicy.cc, src/generic/tasks.cc, src/generic/tasks.h:
Add support for the Key attribute of tasks. (Debian bug #202871)
* NEWS, README, configure.ac:
Bump version to 0.2.14.
* src/generic/apt.cc:
Always initialize the package system, even if opening the
configuration file failed. (Debian bug #220732 again).
* src/cmdline.cc:
After every invocation of apt_init, immediately check for errors
and abort if any occured. This fixes a lot of crashes with
a missing sources.list (Debian bug #220732).
* po/cs.po:
Fix the translation of a format string, which was causing crashes
in some cases.
2004-02-14 Daniel Burrows <dburrows@debian.org>
* po/it.po:
Update the Italian translation (Danilo Piazzalunga).
* configure.ac:
Use AS_HELP_STRING to format help strings.
* Makefile.am, aptitude.it.1:
Italian translation of the manpage from Danilo Piazzalunga.
* src/generic/infer_reason.cc:
Don't follow reverse dependencies on provided packages if they
have a version component.
2004-02-13 Daniel Burrows <dburrows@debian.org>
* src/generic/infer_reason.cc:
More correct handling of conflicts: don't throw out reverse
dependencies on a package unless they are really from that
same package.
* NEWS, README, configure.ac:
Bump version to 0.2.13.9999.3.
* po/cs.po, po/da.po, po/de.po, po/es.po, po/fi.po, po/fr.po, po/gl.po, po/it.po, po/ja.po, po/pl.po, po/pt_BR.po, po/zh_CN.po:
Ran "make update-po".
* configure.ac, src/download_screen.h, src/pkg_item.cc, src/generic/config_signal.h, src/generic/pkg_hier.cc, src/generic/pkg_hier.h, src/generic/strhash.h, src/vscreen/curses++.h, src/vscreen/config/keybindings.h:
Fix things so that aptitude can be configured and compiled on
slightly older g++ versions (anything >= 3.0 should work). g++ 2.95
and below have hideously broken basic_string definitions, and
won't work.
* src/reason_fragment.cc:
Remove an unused variable declaration.
* po/es.po:
Translation update from Ruben Porras. (Debian bug #224966)
2004-02-12 Daniel Burrows <dburrows@debian.org>
* src/reason_fragment.cc:
Un-reverse the sense of the disk space usage/free message (it
was displaying used for free, and vice versa)
* aptitude.cs.1, help-cs.txt, po/cs.po:
Updated cs translation from Miroslav Kure.
2004-02-11 Daniel Burrows <dburrows@debian.org>
* po/de.po:
German update from Sebastian Kapfer.
* src/reason_fragment.cc:
Add a description in the reason fragment of how much disk space will
be used.
2004-02-10 Daniel Burrows <dburrows@debian.org>
* Makefile.am, help-it.txt, po/it.po, src/cmine/Makefile.am, src/cmine/mine-help-it.txt:
Italian translation updates from Danilo Piazzalunga.
* src/desc_parse.cc, src/reason_fragment.cc, src/ui.cc, src/ui.h:
Disable the fillboxing of description information by default,
but allow it to be re-enabled via Aptitude::UI::Fill-Text.
This option isn't accessible from the UI.
2004-02-09 Daniel Burrows <dburrows@debian.org>
* src/vscreen/vs_text_layout.cc:
Always report that a text_layout is able to be focussed
if its starting line is not 0 (meaning that it's possible
to scroll up).
* src/vscreen/vscreen.cc:
Never call dispatch_char on KEY_RESIZE.
* src/desc_parse.cc, src/reason_fragment.cc:
Experimentally eplace most flowboxes with fillboxes.
* src/vscreen/fragment.cc:
Fix an off-by-one error which moved words in a fillbox to
the next line if they would occupy the last character on a
line.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add experimental support for a "fillbox", which generates
text that is flush left and right with its edges. This
can look rather dreadful in a fixed-width font, but
I'm including it in the source tree anyway to see how
it holds up.
2004-02-08 Daniel Burrows <dburrows@debian.org>
* Makefile.am:
Oops, actually include FAQ in the distribution.
* NEWS, README, configure.ac:
Bump version to 0.2.13.9999.2.
* Makefile.am, src/ui.cc:
Add support for viewing the FAQ from within aptitude.
* src/generic/aptcache.cc:
Turn auto-install ON when marking upgradable packages.
* po/pt_BR.po:
Updated translation from Andre Luis Lopes.
* aptitude.1, README, src/cmdline.cc, src/cmdling.h, src/main.cc:
Add an "aptitude show" command. (Debian bug #226501)
* src/vscreen/fragment.cc:
Fix join_fragment (oops).
* help.txt:
Document "C" again.
* src/generic/aptcache.cc:
When a package which is to be removed is instead automatically
installed to satisfy a dependency, mark it as autoinstalled.
Similarly, if a package which is to be removed is automatically
*kept* to satisfy a dependency, mark it as autoinstalled.
In addition, make sure to update the selection state of autokept
packages to "Install".
* src/generic/aptcache.cc:
Don't mark packages which are automatically kept as *held*;
keeping packages back is simply a choice not to upgrade them,
while holding them is a user action. This fixes undoing of
"mark upgradable", and may have implications for Debian bug
#149161.
* src/reason_fragment.cc:
For dependencies involving packages not in main, print their
section next to the package. (if the package being displayed
is the one which is not in main, this is suppressed; presumably
the viewer already knows that it's not in main)
* src/apt_options.cc, src/pkg_view.cc:
Add an option to disable the autoswitchery.
* src/pkg_view.cc:
Enhance the autoswitchery support to automatically switch back
if the package is fixed, and to switch to the reason view
whenever a broken package is viewed, even if it just starts out
broken.
* src/pkg_node.cc, src/pkg_view.cc, src/ui.cc, src/ui.h:
Add a signal that can be caught to detect that the states of
packages might have changed. Use it to fix the bug which caused
the reason area to appear blank the first time it automatically
switched.
* src/pkg_view.cc:
If a change to a package causes new "interesting" breakage,
display the reason view for that package.
* src/reason_fragment.cc, src/reason_fragment.h:
Add an optional return parameter to tell whether any
"interesting" breakage is included in the reason.
* src/vscreen/vs_table.cc:
If a vs_table can't change the focus in response to a keypress,
it no longer swallows the character. (this means
tables-inside-tables where the inner table has only one
focusable widget work properly)
* src/pkg_view.cc:
Add scroll-back-to-the-top behavior for packageless descriptions
as well.
* po/POTFILES.in:
Update POTFILES.in.
* src/pkg_view.cc:
When the package being viewed in the description area changes,
scroll to the top.
* src/pkg_view.cc:
Connect the set_package and set_description signals through the
meta-info-area.
* src/view_changelog.cc:
Shrink the pager, if necessary, to fit the scrollbar in.
* src/pkg_ver_item.cc:
Add support for viewing the changelog of a particular version.
* src/pkg_item.cc, src/view_changelog.cc, src/view_changelog.h:
Add a utility routine to display the changelog of a package.
* src/pkg_item.cc:
HACK: trigger do_signal manually to force the scrollbar to
be updated.
* src/pkg_item.cc:
Add a scrollbar to the package changelog display.
The changelog display now works. (Debian bugs #103455, #208041)
* src/generic/pkg_changelog.cc:
If the source package name starts with "lib", the hash tag
should be the first 4 characters, not just the first character.
* src/generic/pkg_changelog.h:
Add missing std:: markers (not sure why this even compiled).
* src/generic/pkg_changelog.cc:
Use the source package name to fetch a changelog, not the
binary package name.
* src/generic/pkg_changelog.cc:
Fix the changelog URL. Fetching changelogs now works at a
basic level!
* src/generic/pkg_changelog.cc:
Add support for displaying an error when fetching the changelog
failed.
* README, src/pkg_item.cc, src/generic/pkg_changelog.cc, src/generic/pkg_changelog.h:
Add support for the new-style packages.debian.org changelogs.
Presently this can't be parameterized; removed the suggestion
that it can from the README.
* src/ui.cc:
When displaying apt errors, hook up the scrollbar's signal
to the pager's slot.
* src/vscreen/vs_util.cc:
In the fileview dialog, hook up the scrollbar's interaction signal
to the pager's slot.
* src/vscreen/vs_pager.cc, src/vscreen/vs_pager.h, src/vscreen/testvscreen.cc:
Do the same for the pager.
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h, src/vscreen/testvscreen.cc:
Add a utility method to vs_text_layout which makes it easy to
hook up a scrollbar's signal.
* src/vscreen/vs_scrollbar.cc, src/vscreen/vs_scrollbar.h:
Add basic mousing support for the scrollbar.
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Add support for the standard navigation commands (page
up/down; move to beginning/end)
* src/vscreen/vs_text_layout.cc:
Don't reset the starting line to the beginning of the widget
when the fragment changes. In fact, only update it in the
paint routine.
* src/cmdline.cc:
Add error checking for the return value of parse_pattern() to
avoid segmentation faults on NULL pointers. (Debian bug #214245)
* src/download.cc:
Patch from Danilo Piazzalunga to log downgrades.
(Debian bug #222583)
* aptitude.cs.1, Makefile.am:
Add Czech manpage from Miroslav.
* src/download_list.cc:
Add localization to some strings.
2004-02-07 Daniel Burrows <dburrows@debian.org>
* po/POTFILES.in:
Regenerate.
* src/pkg_view.cc:
Explicitly wrap the multiplexer with code that knows about the
three subwidgets and dispatches line_up()/line_down() appropriately.
This is a little gross but not *too* bad.
2004-02-06 Daniel Burrows <dburrows@debian.org>
* configure.ac, src/dep_item.cc, src/download.cc, src/download_manager.h, src/pkg_columnizer.cc, src/pkg_grouppolicy.cc, src/pkg_ver_item.cc, src/pkg_ver_item.h, src/generic/apt.cc, src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/aptitudepolicy.cc, src/generic/aptitudepolicy.h, src/generic/pkg_hier.cc, src/generic/tasks.cc:
Remove all references to HAVE_LIBAPT_PKG3: that's a very old
version of apt, and aptitude won't compile against it anyway
right now.
* src/generic/aptcache.cc:
If a package is deleted because it is unused AND the user tries
to install it, mark it as manually installed. Similarly, if
a package is deleted because it is unused and the user tries to
hold it, mark it as manually installed.
* src/Makefile.am, src/pkg_view.cc, src/reason_fragment.cc, src/reason_fragment.h:
Split the code for generating a text fragment from a reason
into its own file.
* src/vscreen/fragment.cc, src/vscreen/testvscreen.cc:
Fix the case where fragf is called with nothing but strings as
arguments, and actually (oops) fix the test case.
* src/vscreen/testvscreen.cc:
Add another fragment test case, for fragf("%s %s",...)
* src/pkg_view.cc:
Try to be more accurate in displaying a description about why there
are problems with a package that is being upgraded.
* src/generic/infer_reason.cc:
When detecting broken reverse deps, ignore self-conflicts, such
as lynx Conflicting with lynx-ssl (provided by lynx).
* src/cmdline.cc, src/pkg_view.cc, src/generic/infer_reason.cc, src/generic/infer_reason.h:
Changed the infer_reason code to use sets, not vectors. Changed
infer_reverse_reason to follow reverse dependencies on virtual
packages (the main reason for the sets; it makes it easy and
efficient to exclude dependencies that occur twice; eg, in
"emacs21|emacsen")
* src/pkg_view.cc:
Hopefully improved the display of Provided packages in the
"reason window".
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
Fix a fundamental flaw in join_fragment: it used the same fragment
several times in a sequence. (note to self: would it be worthwhile
to dodge this problem by using reference-counting or cloning or
somesuch?)
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
Add a utility routine to join fragments into a single fragment,
placing a fragment or string between them.
2004-02-05 Daniel Burrows <dburrows@debian.org>
* src/pkg_item.cc:
Fix coloration of version numbers to reflect reality more closely --
the old approach was broken in the presence of ORed dependencies.
* src/pkg_item.cc:
Detect and suppress multiple occurances of a single ORed dependency.
* src/pkg_item.cc:
Add support for some cases of virtual packages (but more support
is needed).
* src/pkg_item.cc:
Display virtual packages as 'to be installed' or 'to be removed'
in the appropriate cases.
* src/pkg_view.cc:
Handle ORed dependencies.
* src/generic/apt.cc:
Fix surrounding_or to correctly detect OR groups (oops).
* src/generic/apt.cc:
Fix surrounding_or to actually compile.
* Makefile.am, help-zh_CN.txt, po/zh_CN.po:
Added a translation of help.txt into zh_CN, also from Carlos.
* src/generic/apt.cc, src/generic/apt.h:
Add a utility routine to find the surrounding OR group of a
dependency (useful for finding the OR context of a reverse dep).
* src/generic/infer_reason.cc:
When checking reverse breakage, exclude dependencies whose
parent package is going to be installed at a different version.
* src/pkg_view.cc:
Display the version component of dependencies in the info display.
This is colorized, but not using the pkg_ver_item's colorization
support.
* src/pkg_ver_item.cc, src/pkg_ver_item.h:
Expose coloration of particular versions.
* src/pkg_view.cc:
Experimentally use the package's coloration to show its name in the
information display.
* src/pkg_item.cc, src/pkg_item.h:
Get the code to actually compile.
* src/pkg_item.cc, src/pkg_item.h:
Add a static method pkg_attr to pkg_item, to make it easy to reuse
the calculations that choose attributes for displaying a package.
* src/pkg_view.cc:
Rename deptype_frag to depfrag.
2004-02-04 Daniel Burrows <dburrows@debian.org>
* src/ui.cc:
Add a missing vscreen_update(), so marking upgradable packages
will behave (more) correctly.
* src/generic/infer_reason.cc, src/generic/infer_reason.h, src/pkg_view.cc:
Add support for displaying broken reverse dependencies in the
information area.
* src/vscreen/vs_util.cc:
#include <aptitude.h>, needed by the gettext markings.
* src/apt_options.cc, src/download_list.cc, src/mine/cmine.cc, src/vscreen/vs_util.cc:
Add missing gettext markings, pointed out by Miroslav Kure.
2004-02-03 Daniel Burrows <dburrows@debian.org>
* Makefile.am:
Add help-cs.txt to EXTRA_DIST and pkgdata_DATA.
* NEWS:
Update for 0.2.13.9999.
* po/*.po:
Ran "make update-po".
* ChangeLog, README:
Bump version to 0.2.13.9999.
* README.i18n
Added information for translators.
* FAQ:
Add a FAQ.
* src/pkg_grouppolicy.cc:
Use the Relevance tag to sort tasks. (Debian Bug #203726)
* src/generic/tasks.cc, src/generic/tasks.h:
Add support for the Relevance task tag.
* po/zh_CN.po, configure.ac:
Chinese translation from Carlos Z.F. Liu (Debian bug #230893).
* src/cmdline.cc:
Eliminate annoying warnings when setting a package's state if the
resulting action is "Keep" but the current action is not "Keep".
* src/cmdline.cc:
Fixed the "first" variable in the prompting code -- presently its
sole purpose in life seems to be to cause
Debian Bugs #141925, 141720, and 222907.
I think it was MEANT to say "only drop out of the repl automatically
the first time around", which means its use was reversed from the
intended meaning. Fixed by adding a bang.
* src/pkg_view.cc:
Many changes to the messages shown in the package information area:
make more extensive use of fragf, make the formatting and wording more
consistent, fix some corner cases.
* src/generic/apt.cc:
Flag any package with the InstBroken property as broken,
and only those packages. (this should encompass NowBroken&&!Install()
packages, though, since those will also be InstBroken)
* ChangeLog:
Retroactively create an entry for the upgrading packages keybinding.
* src/pkg_view.cc, src/generic/infer_reason.cc, src/generic/infer_reason.h:
Add support for inferring why a package is broken.
In addition, adjusted the display of brokenness to handle conflicts
properly (so we don't see things like "foo conflicts with foo").
* README, help.txt, src/defaults.cc, src/ui.cc:
Add a keybinding for upgrading packages.
* src/apt_options.cc:
Sync the value of Auto-Upgrade with aptcache.cc
* ChangeLog:
Retroactively added a Debian bug markup.
* src/generic/aptcache.cc:
Don't upgrade packages by default.
* README, ChangeLog:
Update the documentation to describe the package information area,
at least a little bit.
* README:
I give in; use "command-line interface" instead of "non-interactive"
and "visual" instead of "interactive".
* src/apt_options.cc:
Add padding between the columns of option dialogs.
* src/vscreen/vs_table.cc:
Swap nrows/ncols so that they appear in the correct calculations
of column separation; this gets the colsep stuff working.
* src/vscreen/testvscreen.cc:
Add reverse-cycling support in addition to forward-cycling.
* src/vscreen/vs_table.cc, src/vscreen/vs_table.h, src/vscreen/testvscreen.cc:
Add rudimentary support for padding between rows and columns of tables.
* src/vscreen/testvscreen.cc:
Correct the same misuse of vs_table (add_widget instead of
add_widget_opts) in the table test in testvscreen.
* src/pkg_view.cc:
Correct a more egregious misuse of vs_table.
* src/pkg_view.cc, src/vscreen/testvscreen.cc:
Correct a slight misuse of vs_table (which shouldn't have affected
the output, though)
* src/pkg_view.cc:
Actually hook up the scrollbar to the description area.
* src/pkg_view.cc:
Add a scrollbar to the package description/reason areas.
* Changelog:
The following entry is for src/pkg_item.*, not src/vscreen/pkg_item.*
* src/pkg_item.cc, src/pkg_item.h:
Undo an error that slipped in between yesterday and today:
I accidentally (how??) deleted the initializer for info_signal,
causing the long descriptions of packages to not be displayed (and
probably eventually leading to a crash)
In the process, moved the implementation of pkg_item from its .h
file to its .cc file.
* src/vscreen/vs_text_layout.cc:
Reset the layout position to the beginning when a new fragment is
loaded.
* src/vscreen/vs_text_layout.cc:
Fix the scrollbar position in some corner cases.
* src/vscreen/vs_scrollbar.cc:
Fix the scrollbar to display the thumb correctly when val==max.
* src/vscreen/testvscreen.cc:
Test the scrollbarification of the text layout.
* src/vscreen/vs_text_layout.cc:
Actually write the do_signal method (oops).
* src/vscreen/vs_text_layout.cc:
Added preliminary support for a signal that tracks the current
location of the view within the text (eg, for a scrollbar).
Also added a call to freshen_contents() in line_up (oops!).
2004-02-02 Daniel Burrows <dburrows@debian.org>
* src/Makefile.am, src/pkg_description_treeitem.cc, src/pkg_description_treeitem.h, src/pkg_info_screen.cc, src/pkg_item.cc, src/ver_item.cc, po/POTFILES.in:
Eliminate pkg_description_treeitem. Deleted the mostly-useless
"description" action from pkg_items and ver_items at the same time.
* src/vscreen/fragment.cc:
Preserve blank lines in a flowbox.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add a formatting code to insert newline fragments.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add a formatting code to insert character strings directly.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add formatting codes to control some aspects of the character
attributes; optimize text fragment generation.
* src/vscreen/vs_layout_item.cc, src/vsceen/vs_layout_item.h, src/vscreen/testvscreen.cc:
Clean up the pkg_description_treeitem code, and push it down into
the generic vscreen stuff as a general way of embedding fragments
in trees.
* src/desc_parse.cc, src/desc_parse.h, src/pkg_view.cc, src/pkg_description_treeitem.h, src/pkg_description_treeitem.cc:
Use the next layout code to correctly display and wrap descriptions
in info screens.
2004-02-01 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Always use Last-Change to store whether a package was
automatically installed; the problem is that otherwise,
running an older version of aptitude can irretreivably
wipe out your automaticity selections.
However, a new name is supported for input; a future version will
use Install-Reason in output as well as input of state files.
* src/pkg_grouppolicy.cc:
Create a tree in previews for uninstalled packages which are
suggested by other packages which are being installed.
* src/generic/infer_reason.cc:
Fix a crash introduced by the previous change.
* src/pkg_view.cc, src/generic/infer_reason.cc, src/generic/infer_reason.cc:
Add code to display packages which are being installed and which
suggest a package that isn't being installed in the latter
package's "state info screen".
* src/pkg_view.cc:
For groups with built-in descriptions, display their description
instead of a generic comment.
* src/pkg_view.h, src/pkg_view.cc, src/ui.cc:
Display the informational display on the reasons that a package's
state is being modified by default in the preview tree.
* src/generic/infer_reason.cc:
Fix the logic of opertor< to make it actually be an ordering.
This means that reasons will now be displayed ina more sensible
order.
* src/pkg_view.cc:
If a package isn't initially selected, display the
"no package selected" note.
* src/pkg_view.cc:
Use fragf to generate information about a package's state,
which will make life easier for translators (I hope).
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add a printf-alike for fragments.
* src/vscreen/fragment.cc:
Fix reversed logic which prevented the indentbox from working in
the first place.
* src/vscreen/testvscreen.cc:
Add a test for the indentbox.
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
Give indentbox two arguments, to allow the indentation of the
first line to be separate fromt he indentation of the remaining
lines. (so that, eg, bulletted lists work properly)
* src/default.cc, src/pkg_view.cc:
Use the layout code to display reasons about why a package is
being upgraded. Adds colors "ToDep", "FromDep", and "Bullet".
* src/vscreen/fragment.h, src/vscreen/fragment.cc:
Reverse the order of arguments for indentbox.
* src/vscreen/fragment.h:
Add a variant of text_fragment for const char *.
* src/pkg_view.cc:
Use the text-layout code to show descriptions.
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Implement the default constructor and add a method to change the
active fragment.
* src/vscreen/testvscreen.cc:
Test embedding a sequence in a flowbox.
* src/vscreen/fragment.cc, src/vscreen/fragment.h:
Add a varargs overloading for sequence_fragment.
* src/vscreen/vs_text_layout.cc:
Hook up the line_down/line_up signals and get them working.
* src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/testvscreen.cc:
Add a "newline_fragment", which just produces a newline wherever it
occurs.
* src/vscreen/fragment.cc:
Fix a silly thinko in the sequence fragment: of course rval.back()
aborts when rval is empty!
* src/vscreen/fragment.cc:
Fix the flowbox to not put whitespace at the beginning of a line,
and to not chop off the last word of its argument.
* src/vscreen/vs_text_layout.cc:
Apparently addchnstr will run off the end of a string if you ask
it to, but not the end of the window; adjust how I call it to take
this into account.
* src/vscreen/testvscreen.cc:
Use a more minimal test case.
* src/vscreen/vs_text_layout.cc:
Initialize lastw.
* src/vscreen/fragment_contents.h:
Add operator= to the iterators.
* src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Actually catch resizes of the layout widget.
* curses++.cc, curses++.h, fragment.cc:
Changed textfragment and sequencefragment to have the correct
signatures, and added a constructor for chstring that sets an
attribute for the whole string. It now links but is untested.
* src/vscreen/Makefile.am, src/vscreen/curses++.h, src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/fragment_contents.h, src/vscreen/testvscreen, src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Add the layout code to the sources-which-shohuld-be-compiled,
and add a simple test of it to the test program. It compiles but
doesn't link.
* po/POTFILES.in, src/vscreen/fragment.cc, src/vscreen/fragment.h, src/vscreen/fragment_contents.h, src/vscreen/vs_text_layout.cc, src/vscreen/vs_text_layout.h:
Add basic infrastructure for a much more intelligent
text-layout widget.
* src/vscreen/curses++.h, src/vscreen/curses++.cc:
Add an operator= which can convert from a std::string to a chstring.
* src/mine/cmine.cc:
Mark more strings for i18n.
* configure.ac:
Add cs to ALL_LINGUAS, and move ja to be in its proper
alphabetical place.
* po/cs.po, help-cs.txt, src/mine/help-mine-cs.txt:
Czech translation from Miroslav Kure.
* po/da.po:
Updates to da.po from Morten Bo Johansen.
* src/vscreen/curses++.h, src/vscreen/curses++.cc:
Add a parameterization of basic_string on chtype, and some methods
which support writing such a string to a cwindow. (this ended up
being nastier than expected, because it involves specializing
char_traits and all sorts of grossness)
* src/pkg_view.cc:
Remove some code that is old, buggy, obsoleted, and has been commented
out for ages.
2004-01-31 Daniel Burrows <dburrows@debian.org>
* src/pkg_view.cc:
Add a view to the "description" area which shows an explanation
of the current package's state.
* src/vscreen/vs_pager.h:
Initialize the superclass with the correct values (use the
argument, which is valid, rather than the not-yet-initialized
field of *this)
* src/vscreen/vs_pager.h:
Add a missing "public:". (oops)
* src/vscreen/vs_pager.h:
Right, add a set_text based on a std::string to that class.
* src/vscreen/vs_pager.h:
Add support for a pager based on a std::string (basically to
handle memory more sanely).
* src/defaults.cc, src/pkg_view.cc:
Change "i" so that it cycles the multiplexer for the
"description area".
* src/ui.cc:
Use PACKAGE as the base config directory, not Aptitude, in several
places (comes to the same thing usually, this is for consistency).
* src/cmdline.cc, src/generic/infer_reason.cc, src/generic/infer_reason.h:
Split the code to infer *why* a package changed state into a
separate file, the better to invoke it from more places than
just cmdline.cc.
* src/cmdline.cc:
Cut out some unnecessary arguments to cmdline_show_instreason.
* src/pkg_columnizer.cc, src/generic/apt.cc, src/generic/aptcache.h, src/generic/aptcache.cc, src/generic/matchers.cc:
Split "auto" information into information about installations
and information about removals. Changed logic in setting
install/remove reasons so that only the initial installation of
a package causes it to be marked "auto" (meaning that you can now
easily unhold a package without clearing its auto flag).
Debian bug #159582.
* src/generic/matchers.cc:
Fix a call to pkg_name_matcher::init, which was left wrong by the
removal of ~e (oops, why didn't I catch this?).
2004-01-30 Daniel Burrows <dburrows@debian.org>
* src/generic/matchers.cc, README:
Excise the exact_match code; it is buggy, inelegant, and
superseded by regexps.
You can get the effect of ~epattern with ^pattern$.
(Debian bug #196447)
* src/ui.cc:
Fix several untranslatable strings pointed out by Jean-Luc Coulon.
(Debian bug #230060)
2004-01-29 Daniel Burrows <dburrows@debian.org>
* src/cmdline.cc:
Only test the candidate version when searching, and don't go
through the time-consuming process of reading the dselect selections.
* src/download.cc:
Fix a typo that was introduced in translation updates.
* src/vscreen/vscreen.cc:
Include aptitude.h to pick up the definition of _() (oops).
* src/pkg_item.cc, src/cmdline.cc, src/download.cc, src/mine/cmine.cc, src/vscreen/vscreen.cc, src/vscreen/curses++.cc:
Miroslav Kure pointed out that many more strings were not marked for
i18n; trawled through the source to try to find and mark them.
In the process, killed a useless printf in resize().
2004-01-26 Daniel Burrows <dburrows@debian.org>
* src/download.cc, src/vscreen/vscreen.h, src/vscreen/vscreen.cc:
Fix issue brought up by Cristoph Heine: libapt clobbers some
signals when running dpkg, and so the aptitude handlers need
to be restored after dpkg is run.
* src/download.cc, src/load_grouppolicy.cc, src/main.cc, src/pkg_grouppolicy.cc:
Several typo fixes and editorial corrections from Miroslav Kure.
* src/ui.cc:
Apply i18n to the "Become Root" and "Don't Become Root" dialog
buttons so that people can translate them. (thanks to Miroslav
Kure for pointing this out)
* src/apt_options.cc:
Remove the idempotency option from the UI options dialog -- its
description is obscure and it can be set from the config file for
the few people who care.
2004-01-22 Daniel Burrows <dburrows@debian.org>
* po/POTFILES.in:
Update the list of source files to generate .pos from, thanks
to a nudge from Danilo Piazzalunga.
* po/it.po:
Add an Italian translation, thanks to
Danilo Piazzalunga <danilopiazza@libero.it>.
2004-01-21 Daniel Burrows <dburrows@debian.org>
* configure.in, configure.ac, acconfig.h:
Update configure script for 2.5. This resulted in a much less
readable script, since newlines are more significant than they
used to be :-(
2004-01-10 Daniel Burrows <dburrows@debian.org>
* src/apt_options.cc:
When saving options, don't rely on the order in which libsigc++
happens to call slots. This fixes the problem where the
configuration was saved before it was updated with changes,
leading to the appearence that it wasn't being saved at all.
(Debian bug #216268)
* src/cmdline.cc:
Only return one match for each package (Debian bug #221289).
* po/pt_BR.po:
Translation updates from Gustavo Silva (Debian bug #214116 again).
2003-10-24 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc, src/cmdline.cc, src/cmdline_parse.cc:
Check for errors with _error->PendingError(), not
_error->empty(). Among other things, this means we no
longer terminate abruptly if an entry is added to sources.list.
(Debian bug #143732, among others)
* Makefile.am:
Actually distribute help-pt_BR.txt in source distributions, and
install it from install-data.
2003-10-05 Daniel Burrows <dburrows@debian.org>
* po/pt_BR.po, help-pt_BR.txt:
Add pt_BR translation of help.txt, from
Andre Luis Lopes <andrelop@debian.org>. (Debian bug #214116)
2003-10-04 Daniel Burrows <dburrows@debian.org>
* po/de.po:
Apply patch from Sebastian Kapfe to fix the German translation
of the "limit" command's dialog box. (Debian bug #214021)
2003-10-02 Daniel Burrows <dburrows@debian.org>
* src/apt_options.cc:
Fix the bug where entering the Preferences dialog for the first time
caused Suggested packages to be installed automatically.
2003-06-09 Daniel Burrows <dburrows@debian.org>
* configure.in, NEWS, README:
Bump version to 0.2.13
2003-06-02 Daniel Burrows <dburrows@debian.org>
* configure.in:
Add an option --disable-werror, and build with sigc++-1.2 instead
of sigc++-1.0.
* src/Makefile.am, src/generic/Makefile.am, src/mine/Makefile.am, src/vscreen/Makefile.am, src/vscreen/config/Makefile.am:
Use the WERROR variable to decide whether to use -Werror.
* src/apt_config_widgets.h, src/apt_info_tree.cc, src/apt_options.cc, src/cmdline.cc, src/cmdline_parse.h, src/download.cc, src/download_list.cc, src/download_manager.h, src/edit_pkg_hier.cc, src/main.cc, src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h, src/pkg_item.cc, src/pkg_item.h, src/pkg_subtree.cc, src/pkg_tree.cc, src/pkg_view.cc, src/ui.cc, src/ui.h, src/generic/aptcache.h, src/generic/config_signal.cc, src/generic/config_signal.h, src/mine/cmine.cc, src/vscreen/testvscreen.cc, src/vscreen/vs_bin.cc, src/vscreen/vs_button.cc, src/vscreen/vs_center.cc, src/vscreen/vs_editline.cc, src/vscreen/vs_frame.cc, src/vscreen/vs_menu.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_multiplex.cc, src/vscreen/vs_passthrough.cc, src/vscreen/vs_radiogroup.cc, src/vscreen/vs_radiogroup.h, src/vscreen/vs_stacked.cc, src/vscreen/vs_table.cc, src/vscreen/vs_togglebutton.h, src/vscreen/vs_util.cc, src/vscreen/vscreen.h, src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
Port to sigc++-1.2. Many changes, mostly minor. A partial summary:
- Fix include file names.
- Object slots now need a reference as the first argument, not
a pointer.
- Emitting a signal now passes the arguments by reference, which
is significant if the argument could be modified during the
execution of the signal. Fixed some possible occurances of
this (there are probably more)
- Slots have to be passed by value, not argument, now.
- Calling a slot is done by operation(), not ::call().
2003-06-01 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc, src/generic/matchers.cc, src/generic/tasks.cc, src/vscreen/curses++.h, src/vscreen/config/column_definition.h, src/vscreen/columnify.h:
Add missing #includes for assert.h (Debian bugs #195514, #194424)
* po/pt_BR.po:
Merge updates from Andre Luis Lopes. (Debian bug #195755)
2003-05-11 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Don't memcpy() structures containing std::strings (oops!)
Thanks to Peter Lundkvist and Sami Liedes for pointing this out.
(Debian bug #192073, and maybe 109420)
* src/pkg_grouppolicy.cc:
Fix a memory leak in pkg_grouppolicy_status.
* src/vscreen/vs_menu.cc:
Always initialize cursorloc to 0.
* src/apt_info_screen.cc:
Don't exit abruptly if the user reloads the cache while an info
widget is active, and the version of the package that was being viewed
is no longer in the archive. (I don't think this has broader
implications) Peter Lundkvist gets credit for this and the above two
fixes.
2003-03-05 Daniel Burrows <dburrows@debian.org>
* src/pkg_columnizer.cc, src/pkg_ver_item.cc:
Finally fix the problem that caused the first letter of the
description to sometimes appear as a flag character. Evidently I
overlooked an accidental fall-through in a switch statement. Kudos
to Seneca <seneca-cunningham@rogers.com> for finding this nasty.
(Debian bug #183462)
All cases in the switch statements in the columnizer should now
have a terminal break (except for a few which are completely
trivial; ie, the only thing in the case is a "return"), which will
make this bug trigger an error if it occurs again.
2003-02-10 Daniel Burrows <dburrows@debian.org>
* NEWS, README, configure.in:
version bumped to 0.2.12
* src/vscreen.cc:
Re-enabled asynchronous resizing.
* src/main.cc:
Add a -t argument, like apt's. (Debian bug #151583)
* src/cmdline.cc:
"aptitude install task-name" does what you might think.
(Debian bug #165624)
* src/cmdline.cc:
Signal an error if any of a group of packages fails.
* src/vscreen/vs_table.cc:
Re-apply the fix for the vs_table memory leak, which was wiped
out in the massive reversion below.
* src/cmdline.cc, src/main.cc:
Finish the work on customized sorting of search output.
* README:
Document (maybe not very clearly -- rewrite this section?)
that regular expressions are valid in search terms.
* src/generic/aptcache.cc:
If, in GainLock(), we fail and have to delete Lock, make sure
to NULL it out for safety's sake.
2003-02-09 Daniel Burrows <dburrows@debian.org>
* po/fr.po:
Set Content-Type=iso-8859-1 (Debian bug #156616)
* src/dep_item.cc:
Implement Clifton Wood's suggestion to indicate that
dependencies don't even have an available version.
(Debian bug #157950)
* src/ui.cc:
Display "Download/Install/Remove" packages for "g" in the
quick-help bar. (Debian bug #158966)
* README:
Correctly state that logging is on by default.
* help.txt:
Document M/m. (Debian bug #160936, #154000)
* po/pt_BR.po:
Updates from Andre Luis Lopes <andrelop@ig.com.br>.
(Debian bug #162512)
* src/generic/aptcache.cc:
Don't save or load reinstall state. Better than having it
stick around ad nauseum.
(Debian bugs #167237, 121346)
* src/load_config.cc, src/vscreen/config/colors.cc:
Properly support bold colors in the configuration file.
(Debian bug #168287)
Note that bold colors may not actually WORK, but that's
a separate problem.
* po/da.po:
Updates from Morten Bo Johansen <mojo@image.dk>.
(Debian bug #171903)
* src/download_list.cc:
Fix integer overflow problem (Debian bug #175123)
* src/generic/config_signal.h, src/generic/pkg_hier.cc, src/generic/pkg_hier.h, src/generic/strhash.h, src/mine/cmine.cc, src/vscreen/config/colors.cc, src/vscreen/config/keybindings.h, src/vscreen/config/keybindings.cc, src/vscreen/curses++.h, src/vscreen/curses++.cc, src/vscreen/curses++.h, src/vscreen/testvscreen.cc, src/vscreen/vs_multiplex.h, src/vscreen/vs_subtree.h, src/vscreen/vs_table.cc, src/vscreen/vs_treeitem.cc, src/vscreen/vs_util.cc, src/vscreen/vscreen.cc, src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h, src/dep_item.cc, src/download_screen.h, src/edit_pkg_hier.cc, src/pkg_grouppolicy.cc, src/ui.cc, po/es.po, po/fr.po, po/gl.po, po/ja.po, po/pt_BR.po:
Back out the WINDOW * workaround -- libncurses is fixed now, and my
window emulation was buggy.
Update to g++-3.2.
2002-10-27 Daniel Burrows <dburrows@debian.org>
* help.txt, help-fi.txt, help-fr.txt, help-gl.txt, help-pl.txt:
Remove reference to "x" keystroke (Debian bug #166571)
2002-09-09 Daniel Burrows <dburrows@brown.edu>
* src/generic/matchers.cc:
Update the matcher parsing code to allow ()|!|~ to be tilde-escaped
within a word. Without this, entering complex regular expressions is
well-nigh impossible.
Remaining issue: if your expression has (eg) a trailing hyphen,
the command-line mode will treat it as a command to REMOVE all
the packages matched, even if you're trying to (eg) mark them as
having been automatically installed.
2002-07-31 Daniel Burrows <dburrows@brown.edu>
* src/download.cc:
Redid the outputting of size changes in the log file, negative
sizes are now shown correctly and sizes are converted to a
human-readable format. (Debian bug #154924)
* README, src/main.cc, src/cmdline.cc:
-Z command-line option to show size deltas when performing actions
from the command-line.
2002-07-12 Daniel Burrows <dburrows@brown.edu>
* src/generic/aptcache.cc:
Fix the aptitude-wants-to-remove-dpkg problem (Debian bug #151701)
Essentially, aptitude was ignoring pre-depends when marking packages
in the garbage-collector, resulting in conflicting information (it
wanted to automatically install dselect to satisfy the pre-depends,
but then wanted to automatically remove it because nothing depended
on it)
2002-05-09 Daniel Burrows <dburrows@debian.org>
* src/generic/aptcache.cc:
Wrapped the initial marking of packages in an action group
declaration. When there were a lot of packages to be marked, the
mark_and_sweep code was getting called for *every single package*,
with disastrous results as you can no doubt imagine.
2002-05-09 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc, src/cmdling.h, src/main.cc:
Added hooks to allow sorting from the command line (not yet used)
2002-05-05 Daniel Burrows <dburrows@brown.edu>
* src/vscreen/curses++.h:
Remember to initialize the background settings of cwindows.
* src/vscreen/vscreen.cc:
Use refresh() instead of wnoutrefresh(); [set cursor]; doupdate() --
this eliminates the problem where the cursor randomly jumps to the edge
of the screen.
* src/vscreen/vs_table.cc:
Delete row_expandable and col_expandable at the end of vs_table.cc.
(this was leaking memory)
* po/de.po:
Fix README/LIESMICH problem. (Debian bug #145897)
* src/ui.cc:
Really make aptitude compile.
* src/vscreen/vscreen.cc:
Make resizing work asynchronously again.
* src/mine/cmine.cc:
Removed an if(get_win()) test to make things compile again.
* src/vscreen/vscreen.cc:
Hide the cursor as appropriate again.
* src/vscreen/vscreen.cc:
Partly fix cursor-location-display (it still doesn't hide
correctly, though)
* src/vscreen/vscreen_widget.cc:
Allow setting the owner window to NULL.
* src/vscreen/curses++.cc:
Call ::bkgdset *before* ::attrset since the former seems to
"override" the latter (yay undocumented behavior!)
2002-05-04 Daniel Burrows <dburrows@brown.edu>
* curses++.h:
Don't call ::move from move -- update our internal data structures
instead (doh!)
* src/vscreen/curses++.h, src/vscreen/curses++.cc, src/vscreen/vscreen.cc, src/vscreen/vscreen_widget.h, src/vscreen/vscreen_width.cc, src/vscreen/vs_multiplex.h, src/vscreen/vs_table.cc:
The vscreen code no longer creates a curses WINDOW * for each
widget. I hope to eventually fix all the crashes on resize (and some
other weird behavior) by doing this; for now, though, everything is
broken.
2002-04-27 Daniel Burrows <dburrows@brown.edu>
* src/pkg_view.cc:
Fix the parsing of paragraphs so that multi-line paragraphs are
really merged after all.
2002-04-24 Daniel Burrows <dburrows@brown.edu>
* src/generic/matchers.cc:
Use POSIX regular expressions to match (instead of pure strings)
(Debian bug #142450)
2002-04-22 Daniel Burrows <dburrows@brown.edu>
* src/ui.cc, src/vscreen/vs_util.cc, src/vscreen/vs_util.h:
Minimal support for searching in text pagers (finally)
* function_pkgs:
Merge changes from Nov. 22 (oops)
* src/cmdline.h, src/cmdline.cc, main.cc:
Honor -S foo on the command-line.
2002-04-21 Daniel Burrows <dburrows@brown.edu>
* configure.in, NEWS, README:
Version bumped to 0.2.11.1.
* po/fi.po:
Finnish updates from Jaakko Kangasharju <ashar@iki.fi>
* aptitude.1.pl, help-pl.txt, po/pl.po:
Polish updates from Michal Politowski <mpol@charybda.icm.edu.pl>
(Debian bug #143051)
* aptitude.1:
Fix the reference to SEARCHING from the manpage. (Debian bug #142651)
* README:
Include information on where to get CVS (Debian bug #141371)
* src/cmdline.cc:
Comment out the above code -- it doesn't work and while it seems
to be harmless, I want to put another minor release out for woody.
2002-04-18 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Show why BROKEN packages are BROKEN.
2002-04-07 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Fixed compilation errors that only showed up when optimization
was enabled. (oops)
* NEWS:
A few more updates and tweaks: added a Debian bug number, named
the release.
* src/pkg_view.cc:
Only allow the description widget to be focussed if it is scrollable.
2002-04-06 Daniel Burrows <dburrows@brown.edu>
* src/pkg_view.cc:
Fixed two minor formatting bugs: bulleted lists no longer
have an extraneous space in front of them, and the first item
of a bulleted list is no longer indented one square too few (when
it follows a wrapped paragraph, that is)
* src/pkg_view.cc:
Rewrote the description formatting code completely. It is no
longer a hairball, and is much more simpler and more understandable.
This should clear up current bugs and avoid future ones.
(Debian bug #137783)
* README, configure.in, NEWS:
Update for version 0.2.11.
* README:
Document the Reinstall keybinding, and correct the documentation
of Install, Remove, and Hold.
* src/pkg_columnizer.cc:
Give the "Tasks" tree a description.
* src/cmdline.cc:
Correct some bad logic in the prompting code which suppressed many
prompts, and handle essential prompting better.
* src/pkg_columnizer.cc:
Add a %H display escape, which expands to the current
computer's hostname. (Debian bug #137754)
* src/pkg_grouppolicy.cc:
The same, for preview screens.
* src/pkg_grouppolicy.cc:
Add description functionality to the "main" grouping level.
* src/pkg_view.cc:
Don't allow the user to focus the "description" area unless there's
an actual description there.
* src/pkg_columnizer.cc:
Don't show an "available" version for obsolete/local packages.
(Debian bug #120872)
* src/pkg_grouppolicy.cc, src/generic/apt.h, src/generic/apt.cc:
Moved the obsolete test into shared generic code.
* README, aptitude.1, src/main.cc:
You can now set command-line parameters in the config file.
This might be useful for, eg, -V.
* aptitude.1:
Document -P
* README, src/apt_options.cc, src/pkg_item.cc:
Aptitude::UI::New-Package-Commands now defaults to true.
* src/pkg_grouppolicy.cc:
Display the section short description next to the section again.
* src/pkg_grouppolicy.cc:
For sections like "contrib/admin", show the description of the last
element.
* src/pkg_grouppolicy.cc:
Write descriptions (however stupid) for all sections.
* src/cmdline.cc:
Don't suppress the preview when using always-prompt.
* src/main.cc, src/cmdline.cc:
Added a -P option which forces the display of a prompt.
* src/main.cc:
Add support for --version (Debian bug #141296)
* src/vscreen/vs_table.cc:
Call get_focus() in layout_me() -- layout_me() is called when
widgets change their focussability, and so we may need to update
our focus location.
* src/vscreen/vs_table.cc:
When changing the focus in get_focus(), notify the child widgets.
2002-04-03 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Don't interpret trailing +/-/_/= characters if keeping that
character in the string gives us the name of an existing package.
(Debian bug #140933)
2002-03-28 Daniel Burrows <dburrows@brown.edu>
* src/pkg_view.cc:
Don't crash if pkg_description_widget::get_lines(false) is called
while the widget is hidden (getmaxy()==0)
In particular, don't crash when the user tries to press a or z
while the description is popped down. (Debian bug #140361)
* src/cmdline.cc:
Don't crash when displaying why a package was removed if another
package conflicted with it. We now check conflicts against the
currently installed version (which IMO makes the most sense)
* src/cmdline.cc:
instreason-display now works for auto-held packages. However (oops)
auto-held packages aren't found properly. Needs to be fixed:)
2002-03-24 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Onve we've entered an interactive repl, don't abort even if we
reach a state in which the prompt would have been skipped originally.
* src/cmdline.cc:
Wrote some code to try to figure out why auto_held packages were
held. More work here as well.
* src/pkg_grouppolicy.cc:
Wrote more long descriptions. There's still work to do here.
* src/pkg_grouppolicy.cc:
Use the task long descriptions.
* src/apt_info_tree.cc, src/apt_info_tree.h, src/pkg_view.cc, src/pkg_view.h, src/ui.cc:
Activate the code to show long descriptions for subtrees.
Currently this only affects the "long description area" -- it
should work for short descriptions in the future!
* src/pkg_grouppolicy.cc, src/pkg_subtree.cc, src/pkg_subtree.h, src/pkg_tree.cc, src/pkg_tree.h:
More work to implement this feature. Trees now have a signal for
this, and pkg_subtrees can call on it.
* src/dep_item.cc, src/dep_item.h, src/pkg_info_screen.cc, src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h, src/pkg_ver_item.cc, src/pkg_ver_item.h:
Preliminary support for overloading the description field for
non-packages.
* src/cmdline.cc, src/main.cc:
Add support for an "unhold" command-line option.
(Debian bug #137770)
* src/cmdline.cc:
Show x -> y version numbers for downgraded packages as well.
* src/cmdline.cc:
Package entry in command-line mode now supports versions
and archives.
* src/cmdline.cc:
You can now toggle display of version info, toggle display of
dependency info, and get help from the installation prompt.
* src/cmdline.cc:
'e' at the prompt now enters the full UI. I'm not sure whether
the fact that this was a 10-line hack is wonderful or frightening.
* src/cmdline.cc:
Only show "reasons" when showing a group of packages which was
automatically selected/deselected/held.
* src/cmdline.cc:
Detects "reasons" for packages removed due to unusedness.
2002-03-23 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
You can now give additional commands at the prompt.
Eg, after "aptitude install xemacs21" selects xemacs21-mule,
do "- xemacs21-mule + xemacs21-nomule" to fix it.
* src/cmdline.cc:
Fix the cmdline stuff so it actually works again.
* src/cmdline.cc:
Split cmdline_pkgaction in preparation for future enhancements.
* src/cmdline.cc, src/download.cc, src/download.h:
Report exit status according to success/failure. (Debian bug #139615)
Needs testing.
* src/cmdline.cc:
Use action_states to decide whether to show dependency
information. This makes it work properly with dist-upgrades.
* src/cmdline.cc:
Filter duplicates when printing dependencies.
* src/cmdline.cc, src/cmdline.h, main.cc:
-D for showing dependencies, -V for showing versions, only
show the extra simulation stuff with -v.
* src/cmdline.cc:
Do something sane when the user tries to install a virtual package.
* src/cmdline.cc:
Fix the dependency-checking code -- it was checking versioned
dependencies using the version of the package declaring them (oops)
2002-03-21 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Extend the dependency checking to removed packages. (need
to test this more)
* src/cmdline.cc, src/cmdline.h:
Use verbosity for something. With -v, display version numbers of
intended installations; with -vv, also display dependency information.
(should these be orthoganol?)
* src/cmdline.cc, src/cmdline.h:
Moo.
* src/main.cc:
Introduce support for verbosity.
2002-03-20 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Don't segfault in some cases when displaying dependencies,
and suppress unnecessary dependency indications when upgrading.
("install" with no arguments still displays too much stuff)
* src/cmdline.cc:
The start of better previewing (showing information about why
packages were installed/removed/etc)
* src/main.cc:
Document "download" in the --help output. (Debian bug #138150)
* README, help.txt, src/apt_options.cc:
Remove references to allow-reinstall, and document the "L" key (bad
keybinding)
* src/dep_item.cc, src/dep_item.h, src/pkg_item.cc, src/pkg_item.h, src/pkg_node.cc, src/pkg_node.h, src/pkg_subtree.cc, src/pkg_subtree.h, src/pkg_ver_item.cc, src/pkg_ver_item.h:
Separate reinstallation from +/-/_/=. (Debian bug #138122)
* src/generic/apt.cc:
Reinstate the stuff necessary to detect reinstalled packages.
It was accidently removed in the last version.
(Debian bug #138120)
* src/download.cc:
Reload the cache if an update is aborted. (Debian bug #138070)
2002-03-19 Daniel Burrows <dburrows@brown.edu>
* src/vscreen/vs_bin.cc, src/vscreen/vs_menubar.cc, src/vscreen/vs_minibuf_win.cc, src/vscreen/vs_passthrough.cc, src/vscreen/vs_passthrough.h, src/vscreen/vs_stacked.cc, src/vscreen/vscreen.cc:
Many updates to the way focus is handled. It should be more
"correct" now. Probably this should be tested quite a bit.
2002-03-17 Daniel Burrows <dburrows@brown.edu>
* src/generic/tasks.cc:
#include <ctype.h> explicitly before any STL stuff. g++-3 didn't
like compiling the new code without this change (stupid)
* src/download.cc, src/apt_options.cc:
Fine, fine, autoclean defaults to false. (Debian bug #138685)
2002-03-15 Daniel Burrows <dburrows@brown.edu>
* src/vscreen/vscreen.cc:
Focus the toplevel widget when it is assigned.
* src/vscreen/vs_stacked.cc:
Similarly, give focus to newly added widgets.
* src/vscreen/vs_menubar.cc:
Give focus to the subwidget as necessary.
* src/vscreen/vs_bin.cc:
Focus widgets added to the bin.
* src/vscreen/vs_multiplex.cc:
Correctly delegate "focused" state to subwidgets.
* src/vscreen/vs_table.cc:
Only give or remove focus from the current subwidget if we
have focus ourselves.
* src/vscreen/vs_tree.cc:
Hide the highlight if the tree is not focussed.
* src/vscreen/vs_table.cc:
Call vscreen_update() after focussing a table's subwidget so that
cursor locations are adjusted.
* src/vscreen/vs_tree.cc:
Don't run off the end of the list and blow up when the user starts
a search from the last item in a list. (Debian bug #136967)
* src/vscreen/vs_subtree.h:
Use ++realitem and --realitem rather than the post-versions.
Guard dereferencing of list items with an assertion.
* src/pkg_tree.cc:
Set doing_incsearch to false when rebuilding the tree.
2002-03-13 Daniel Burrows <dburrows@brown.edu>
* src/pkg_grouppolicy.cc:
s/Adminitrative/Administrative/
2002-03-11 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Don't print the "Reading ..." messages from the "search" command
(Debian bug #136873)
* src/download_list.cc:
Print "stalled" when the download is stalled. (Debian bug #136520)
* src/cmdline.cc:
Don't prompt on upgrade when nothing is to be done.
(Debian bug #137302)
* src/cmdline.cc:
Basic support for SIGWINCH (Debian bug #137945)
2002-03-08 Daniel Burrows <dburrows@brown.edu>
* po/de.po:
Massive update to the German translation by
Erich Schubert <erich@debian.org>
2002-03-03 Daniel Burrows <dburrows@brown.edu>
* src/pkg_grouppolicy.cc:
Added a description for "alien" (Debian bug #136684)
* src/generic/tasks.cc:
aptitude got confused by Tasks lines like "Tasks: a, b" and
started looking for a task named " b". Fixed. (Debian bug #136684)
2002-03-02 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Fix some more "argh g++ screws up on return tracing" bugs.
Note to self: remember to send a bug report!
* src/download.cc:
The "deleting obsolete downloaded files" thing was missing a \n;
fixed.
* NEWS, README, configure.in:
Version bumped to 0.2.10
* README:
Update the documentation about ~r and ~g.
* src/main.cc, aptitude.1:
Document -f.
* src/download_list.cc:
Don't add "s" after the time units. (Debian bug #135567)
* README:
Minor formatting fixes.
* src/generic/matchers.cc:
Resurrect the old revdep matcher (Debian bug #135571) and make a
'garbage matcher' (~g) which matches stuff that would be garbage
collected.
* src/generic/aptcache.cc:
Set the "garbage" flag on anything unmarked to "true" -- not just
on installed packages.
* src/generic/aptcache.cc:
Handle the "never remove these" matchers by adding such packages
to the rootset, not by hacking them into not being removed.
(otherwise, their dependants would be marked for removal as well)
* aptitude.1:
Update the email address to dburrows@debian.org
* src/cmdline.cc, src/cmdline.h, src/main.cc:
None of your business. :)
* src/main.cc:
Update the usage documentation and link it to the "help" command.
* aptitude.1:
Document -w/--width.
* README, aptitude.1:
Added a large quantity of documentation on the new command-line
actions. Also, removed the INSTALLATION section that Joey objected
to from the manual. (Debian bug #136478, sort of)
* src/main.cc:
Make the long option --display-format synonymous to -F, not -f.
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added a "download" command which downloads deb files.
* src/generic/pkg_acqfile.h, src/generic/pkg_acqfile.cc, src/generic/pkg_changelog.cc:
Tweaked the changelog downloader to be generic, and added a
hacked routine to download a .deb file quickly. All workarounds
for apt-pkg's limitations :(
* src/generic/aptcache.cc:
Don't mark things as having changed automatically if they changed
automatically to a state that matches their aptitude state.
After much intrepid hacking, I found the reason for the
"aptitude sometimes ignores actions from the command-line" to be
the following:
(A) If a package was already marked for installation, the
change from "keep" to "install" was being flagged as automatic.
(B) This caused the package and all its dependencies to be marked
as auto-installed;
(C) Therefore, aptitude helpfully cancelled their selected status.
(thanks, aptitude)
* src/cmdline.cc:
Added a missing '\n' to the "you must provide at least one
search term" error message.
* src/generic/aptcache.cc, src/generic/aptcache.h, src/cmdline.cc:
try_fix_broken can now accept a problem-resolver; if one is passed,
it is used instead of the "resolve everything at once" -- this lets
the aptitude state keep track of what a customized resolver did.
* src/cmdline.cc:
If the user requested actions on particular packages, use a problem
resolver which is geared towards making those actions happen, rather
than the global optimization done by try_fix_broken. Among other
things, this means that "remove" now does the Right Thing[tm].
* src/cmdline.cc:
Better error message for unmet dependencies.
* src/cmdline.cc:
Added basic support for being obnoxious about removing essential
packages.
2002-03-01 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc, src/cmdline.h, src/download.cc, src/download.h, src/main.cc, src/ui.cc:
Implemented -d and -y.
2002-02-28 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
If the user enters a non-existant package, show a list of possible
choices for it.
2002-02-27 Daniel Burrows <dburrows@brown.edu>
* src/generic/aptcache.cc:
Only follow Recommends and Suggests if the appropriate
configuration option is set. (Debian bug #135956)
2002-02-26 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Fix the broken package displayer to be somewhat sensible.
* src/cmdline.cc, src/main.cc:
Added "markauto" and "unmarkauto" package actions. These are
handled in cmdline_pkgaction, so they will automatically remove
suddenly removable packages, and you can select packages to
be installed if you for some reason want to.
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added a "forget new packages" command.
* src/generic/matchers.cc, README:
Add matchers for upgradable and new packages.
* src/cmdline.cc:
If packages are broken, the error display is now more helpful.
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added a parameter to cmdline_pkgaction indicating whether to fix
broken packages (off by default!)
2002-02-25 Daniel Burrows <dburrows@brown.edu>
* src/cmdline.cc:
Added a missing \n in the -s message for clean.
* src/cmdline.cc:
Fix a typo in the preview messages (folowing..upgraded -> following)
* src/cmdline.cc:
Don't use sticky states for dist-upgrade.
* src/main.cc:
The default display format for "search" now includes state
information.
* src/generic/aptcache.cc:
Only call mark_all_upgradable from aptitudeDepCache::Init if
do_initselections is set.
* src/generic/aptcache.cc:
Even if do_initselections is false, set the selections of
unknown packages appropriately. This helps mark_all_upgradable
do something sensible.
2002-02-24 Daniel Burrows <dburrows@brown.edu>
* src/generic/matchers.cc:
~M now marks to-be-installed automatically installed packages
as well as currently installed automatically installed packages.
* src/generic/aptcache.cc:
mark_all_upgradable now calls mark_and_sweep and duplicate_cache.
* src/main.cc:
Added --with[out]-{recommends,suggests} to toggle the handling
of these from the command-line.
* src/generic/aptcache.cc:
Use mark_all_install to set install states (a bit wasteful of CPU
cycles, but it "should" be "fairly" cheap)
Rationale: we need to tell when stuff is dragged in because of
dependencies of upgraded packages.
* src/cmdline.cc:
Fix the "dangling newline" input bug with the Y/n prompts.
* src/generic/aptcache.cc, src/generic/aptcache.h, cmdline.cc, ui.cc:
Kill the extra argument to try_fix_broken -- it's not really needed
now, and it makes things hairier.
* src/cmdline.cc:
Use mark_all_upgradable in dist-upgrade rather than hacking
auto-upgrade.
* src/cmdline.cc:
Renamed cmdline_preview_show_pkglist to cmdline_show_pkglist.
* src/generic/aptcache.cc, src/cmdline.cc:
Broke down yet again; this time, I rewrote all_upgrade to
just reimplement pkgAllUpgrade in my own code. How annoying.
(on the other hand....it works! yay! I don't understand WHY
it works, but never mind that..)
* src/cmdline.cc:
When doing searches, open the cache with sticky states enabled.
* src/cmdline.cc:
Allow non-root users to run simulations of upgrades/installs.
* src/generic/aptcache.cc:
Don't condition on Auto-Upgrade in mark_all_install.
* src/generic/aptcache.cc, src/generic/aptcache.h, src/cmdline.cc, src/ui.cc:
Don't use auto-install when marking upgradable packages.
* src/cmdline.cc:
ok, don't do that, Daniel; use mark_all_upgradable and then
try_fix_broken. (I'll get there eventually)
* src/generic/aptcache.h, src/generic/aptcache.cc, src/cmdline.cc:
Added an "all_upgrade" method to the cache; it's just
a wrapper for pkgAllUpgrade. (gave up trying to emulate
pkgAllUpgrade -- even when I make exactly the same calls as
it, stuff doesn't work right)
* src/cmdline.cc:
Always prompt on upgrades.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Changed try_fix_broken so that it behaves more like
pkgAllUpgrade when without_extra is true.
* src/cmdline.cc:
Abort if the fixer fails.
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added support for -s as "simulate".
* src/cmdline.cc:
Doh! strcmp doesn't return -1 if a<b, it returns some random
value smaller than 0.
Corrected code that made the above assumption; previews are
now displayed in sorted order for real.
* src/cmdline.cc:
Added a hack -- dist-upgrade is no longer quite a synonym for
"install". If auto-upgrade is not normally true, only
dist-upgrade will mark things for upgrade by default.
* src/cmdline.cc:
upgrade no longer tries to mark every single package for
installation. (oops!)
* src/cmdline.cc:
Use action groups around the loops that set package states, so
that the various long-running algorithms in aptitude's cache
logic aren't run on every single package.
* src/cmdline.cc:
Added an "X packages upgraded, X packages installed,..."
message in the preview. (copied pretty much directly from apt-get)
* src/cmdline.cc:
"upgrade" honors holds.
* src/cmdline.cc, src/main.cc:
"dist-upgrade" is now a synonym for "install".
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added an "upgrade" command (like apt-get upgrade)
* src/generic/aptcache.cc, src/generic/aptcache.h, src/cmdline.cc, src/ui.cc:
aptitudeDepCache::try_fix_broken now takes an argument indicating
whether to behave like dist-upgrade (use removals) or like upgrade
(don't use removals)
* src/main.cc, src/cmdline.h, src/cmdline.cc:
Added support for arbitrary widths in the output of "search".
* src/main.cc:
Fix option parsing. Don't add "--" in front of long options in
the opts structure; check optind to find the first non-option.
* src/cmdline_parse.cc, src/cmdline_parse.h:
Added skeletal code for a super-duper option parser to work
around limitations in getopt -- then read the getopt info page
and realized that the limitations didn't exist! Adding the code
anyway, in case it turns out to be useful; it's not compiled.
* src/main.cc, src/cmdline.h, src/cmdline.cc:
Added preliminary support for redefined output columnification.
Still TODO: (a) fix the option parsing with this (oops);
(b) deal with the fact that it should allow running off the edge of
the screen; (c) handle the visible-version stuff more cleanly.
2002-02-23 Daniel Burrows <dburrows@brown.edu>
* src/apt_options.cc, src/download.cc:
aptitude now defaults to logging in /var/log/aptitude, and
has a configuration option for it.
* src/cmdline.cc:
The preview now displays the download size and the expected amount
of disk usage.
* src/cmdline.cc:
Added a proper preview and pause before downloading (like apt-get)
* src/generic/apt.cc, src/generic/apt.h, src/pkg_grouppolicy.cc:
Added support for listing DOWNGRADED packages in the preview.
* src/download.cc:
Kill the "press return to continue" prompt when downloading
packages in text mode.
* src/cmdline.cc:
Unreverse tests so that actions are parsed properly (oops)
* ChangeLog: add a bunch of missing "src/"s to filenames
* src/cmdline.cc, src/cmdline.h, src/download.cc, src/download.h, src/main.cc, src/ui.cc:
Added very crude support for "apt-get install"-style stuff.
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added a "search" command (like apt-cache, more or less)
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added an "autoclean" command.
* src/main.cc:
Added a \n to the end of the "unknown command" message.
* src/cmdline.cc, src/cmdline.h, src/main.cc:
Added a "clean" command.
* src/generic/acqprogress.cc:
Replace the commented-out settings of Update with manager.set_update.
* src/download_manager.h:
Support setting the Update field.
* src/cmdline.cc:
So, here's the deal. AcqTextStatus stores ScreenWidth as a
**reference** to an integer. Although this is disgusting at first
glance, there's a sticky problem of what to do on window resizes.
I may handle this in a better place eventually, but for now I'm
going to make it a global (ick) variable in cmdline.cc.
2002-02-22 Daniel Burrows <dburrows@brown.edu>
* src/Makefile.am, src/cmdline.h, src/cmdline.cc, src/download.cc, src/download.h, src/generic/acqprogress.cc, src/generic/acqprogress.h:
Added a command-line-based "update" routine, like apt-get's only
with aptitude's logic. Tweaked the download stuff to work with
text-mode download. Added the apt-get acqprogress thingy to the
source tree. (acqprogress is now a descendent of SigC::Object, so
connecting signals to it works)
* src/ui.cc:
Add a menu item to mark all upgradable and not manually held
packages for upgrade.
* src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/apt.cc, src/generic/apt.h, src/ui.cc, src/main.cc, src/download.cc, src/pkg_item.cc:
Add code to not automatically do all sorts of marking of packages
on startup, and to mark the upgradable packages later.
* help-fi.txt, aptitude.fi.1, src/mine/mine-help-fi.txt, po/fi.po:
Updated Finnish translations from Jaakko Kangasharju <ashar@iki.fi>
* src/pkg_item.cc, src/pkg_columnizer.cc, src/pkg_ver_item.cc:
Only show packages as held if they are actually held. That is,
upgradable packages which are NOT going to be upgraded because (eg)
auto-upgrades are off will be displayed as "ii".
2002-02-21 Daniel Burrows <dburrows@brown.edu>
* aptitude.1, aptitude.fr.1, aptitude.fi.1, aptitude.pl.1, aptitude.gl.1:
s/README.gz/README
* README:
Document the "p" state flag.
(Debian bug #135112)
2002-02-17 Daniel Burrows <dburrows@brown.edu>
* Makefile.am:
Distribute .todo in tarballs.
* src/download_list.cc:
Kill the evil floating-point exception on alpha. This deserves
a new "real" release. (Debian bug #122064)
* src/download.cc:
Make forget-new-on-update actually do that. (Debian bug #134226)
2002-02-10 Daniel Burrows <dburrows@brown.edu>
* README, NEWS, configure.in:
Version bumped to 0.2.9.3.
* po/pl.po:
Updates from Michal Politowski.
* src/main.cc, src/vscreen/vscreen.cc:
Guard the _GNU_SOURCE definitions with #ifndef _GNU_SOURCE, just
in case. (evidently g++-3 automatically #defines this)
2002-02-09 Daniel Burrows <dburrows@brown.edu>
* Makefile.am:
Really distribute aptitude.pl.1.
* src/generic/matchers.cc:
Really fix ~ahold.
* NEWS, README, configure.in:
Version bumped to 0.2.9.2.
* NEWS, README, configure.in:
Version bumped to 0.2.9.1.
* src/generic/aptcache.cc (mark_auto_installed):
D'oh, since we're marking and sweeping when the user sets a
package to "auto-installed", we have to cleanup_after_change as
well. Same goes for mark_keep.
This merits a quick new release.
* NEWS, README, configure.in:
Version bumped to 0.2.9.
* README:
Major adjustments to the README, incorporating some user
feedback. (Debian bug #126492)
* src/generic/aptcache.cc:
You can now set a match expression which will limit which packages
are automatically removed. eg, if it is "~slibs", only packages
in the "libs" section will be automatically removed.
The option is PACKAGE::Delete-Unused-Pattern.
* src/generic/aptcache.cc, src/generic/aptcache.h, src/generic/matchers.cc:
The garbage collector now records which packages it would delete
automatically, and you can search/limit on that value via ~r.
(FIXME: use this to store unused-deletion information?)
2002-02-08 Daniel Burrows <dburrows@brown.edu>
* src/vscreen/vs_subtree.h:
Fix a minor bug: the vs_subtree tried to use addch(' ') to clear
the remainder of the line after it finished -- but if it had just
filled a line completely, the "y" position would have been advanced,
and it would end up painting over the whole next line (oops)
(Debian bug #123652)
* src/generic/aptcache.cc:
Caught an insidious bug: changes to the automatically-installed
status of a package would only be saved in the undo stack when they
were accompanied by another change (eg, removal of the package)
This was due to the fact that rather then testing the current
state against the backed-up state, I was testing it against itself.
D'oh!
* src/apt_options.cc:
Add an option to disable auto-removal of unused packages.
* src/generic/aptcache.cc:
It is necessary for internal_mark_delete to call
cleanup_after_change now (since it might trigger additional actions)
* src/generic/aptcache.h, src/generic/aptcache.cc:
So there was a problem due to the fact that mark_install,
mark_delete, etc, were triggering a mark and sweep all the time.
Normally this would be right, but when undoing a group of
actions, a mark_and_sweep would be performed in the middle of the
group -- at which point the cache was in an indeterminate state
and weird stuff happened.
Instead of fixing this the right way (whatever that is), I
have created internal_mark_*, which take a boolean parameter
specifying whether a mark_and_sweep operation is desired. The
standard functions are just wrappers that hardcode that to true.
* src/generic/aptcache.cc:
Added a hack to make it obvious that undoing a forget-new command
actually works. (rebuild package trees when this is done)
* src/defaults.cc:
Oops, lower-case a conflicts with other things. Use
lower-case m instead.
* src/generic/aptcache.h, src/generic/aptcache.cc, src/pkg_item.cc, src/pkg_item.h, src/pkg_ver_item.h, src/pkg_ver_item.cc, src/pkg_subtree.h, src/pkg_subtree.cc, src/defaults.cc:
Renamed lastchange to installremove_reason to make it clear
that it doesn't apply to holds. Added and removed code to really
prevent it from applying to holds (sane transient holds would be
nice, but that's for the future)
Added code to allow packages to be quickly marked as
manually installed (keybinding: lower-case a)
mark_and_sweep is no longer called in the middle of an action
group -- it's always called at the end, now. Should speed some
operations up.
* src/pkg_item.cc:
NowBroken is a bad reason to visually flag things as broken.
2002-02-04 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/pkg_columnizer.cc:
Add %M to the default package display.
* src/generic/apt.cc:
Hmm. Packages which were automatically installed, and are
now being upgraded, are no longer shown as "packages
automatically installed". This is unfortunate in the sense
that packages which *were* automatically upgraded are lost.
Future versions should fix this, but I don't expect it to be
a major issue *crosses fingers*.
* src/pkg_item.cc:
The su-to-root logic in pkg_item.cc is more robust now.
(Debian bug #130423)
* src/generic/matchers.cc:
~ahold matches any held package, I think. (Debian bug #126800)
2002-02-03 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/ui.cc:
Call pkg_columnizer::setup_columns() in ui_init() -- why wasn't I
doing this before? Doh indeed.
(Debian bug #114401, and I tested it for real this time!)
* src/download.cc:
Change [NOT USED] to [REMOVE, NOT USED] in the log
output.
* src/pkg_columnizer.cc:
Fixed the translated widths so they work properly again with
the new column types (hm, this is a good debugging device for
the translated-widths problem :) )
* src/generic/matchers.cc:
Added a matcher for automatically-installed packages.
* src/pkg_item_with_subtree.h:
Un-reverse the new expanded/collapsed display so it's right.
* src/pkg_ver_item.cc:
Oops. The fallback rule in pkg_ver_columnizer::setup_columns
was calling pkg_ver_columnizer::setup_columns again => infinite
recursion => crash.
It now correctly calls pkg_columnizer::setup_columns when it
needs to punt.
* src/generic/aptcache.cc:
Call mark_and_sweep after setting a package's "auto" flag.
* src/generic/aptcache.cc:
Don't use apt_cache_file to get a reference to our package
cache -- use GetCache(). (apt_cache_file could be uninitialized)
* src/generic/apt.cc
Don't classify not-installed and not to-be-installed packages
as having been held back. (check state.Status==1 rather than
state.Status>0)
* src/generic/aptcache.cc:
Don't mark packages which aren't installed as having been
automatically deleted, even if nothing depends on them.
2002-02-02 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/generic/aptcache.cc:
Add Essential packages to the root-set. (this is important :) )
* src/pkg_grouppolicy.cc:
Oops, added a missing "," which was causing two entries in the
child_names table to be collapsed into a single entry.
* src/generic/aptcache.cc:
Don't auto-delete packages which are already being deleted (thus
changing their "auto" flag)
* src/generic/apt.cc:
find_pkg_state: Report unchanged packages as being unchanged, not as
being reinstalled.
* src/download.cc:
Store the time of the package run in the log file.
(Debian bug #120874)
* src/generic/aptcache.cc:
Do mark_and_sweep inside an action group.
* src/generic/aptcache.cc:
Don't go into an infinite loop when the user does anything.
(mark_and_sweep was calling mark_delete, which was calling
mark_and_sweep..... -- solution: only call mark_and_sweep
if it's a manual deletion rather than a mark_and_sweep one.
yes, it's a hack)
* src/pkg_node.cc, src/defaults.cc:
Add a keybinding for setting a package as auto-installed ('A')
* src/generic/aptcache.h, src/generic/aptcache.cc, src/pkg_item.cc, src/pkg_ver_item.cc, src/download.cc:
Actually write code to find automatically installed and not
depended on packages. Currently this uses a mark-and-sweep algorithm;
this is not as efficient as it could be, but it is correct.
(refcounting would be faster in this case, but when Recommends
are taken into account, the dependency graph tends to have cycles)
* src/generic/apt.cc, src/generic/apt.h, src/pkg_grouppolicy.cc:
Updated the "find out why a package changed" code to make use
of the lastchange field.
2002-02-01 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/pkg_columnizer.h, src/pkg_columnizer.cc, src/generic/aptcache.h:
Added stubs for flagging and tagging.
* src/pkg_ver_item.cc, src/pkg_ver_item.h, src/pkg_item.cc, src/pkg_item.h, src/pkg_subtree.cc, src/pkg_subtree.h, src/pkg_node.h, src/pkg_columnizer.h, src/pkg_columnizer.cc:
Added preliminary support for viewing auto-install states.
* src/generic/aptcache.cc, src/generic/aptcache.h:
Added basic support for tracking whether a package's last
selection was automagic.
2002-01-23 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/vscreen/vs_editline.cc:
Start the cursor at the beginning of a line to be edited rather
than the end (I'm not sure if this is an improvement :P )
(Debian bug #120890)
* src/apt_options.cc:
Corrected a misspelling (Debian bug #120887)
2002-01-10 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/pkg_item.cc:
Added "idempotent" alternatives for some package manipulation
commands. The idea is to make the behavior of '+','-', etc more
predictable, so that operations on large numbers of packages behave
sensibly. This is currently off by default while I test it.
* src/pkg_item.cc:
The source was unnecessarily setting the package state to
Install in pkg_item::remove when the package was to be reinstalled.
It no longer does.
* README: Many edits and rewordings, inspired by Rainer Dorsch.
- Rewrote bits of the intro.
- Explained much more about trees and opening/closing.
Consistently refer to trees as "items"/"subitems" and
Hopefully experienced users are not insulted.
2002-01-06 Daniel Burrows <dburrows@brown.edu>
* src/generic/aptcache.cc:
When setting up the initial states, iterate over the package list
twice, only setting AutoInstall the second time. This decreases
startup time, but allows more sane initial selections of packages.
The following explanation is given in the source:
// A reason for this is the following scenario:
//
// Packages A and B are installed at 1.0. Package C is not installed.
// Version 2.0 of each package is available.
//
// Version 2.0 of A depends on "C (= 2.0) | B (= 2.0)".
//
// Upgrading A if B is not upgraded will cause this dependency to
// break. Auto-install will then cheerfully fulfill it by installing
// C.
//
// A real-life example of this is xemacs21, xemacs21-mule, and
// xemacs21-nomule; aptitude would keep trying to install the mule
// version on upgrades.
(Debian bug #108379)
* Experimentally changed the display of closed/opened
trees.
* Corrected a missing \n in da.po.
2001-12-12 Daniel Burrows <dburrows@brown.edu>
* po/da.po
Updates from Morten Brix Pedersen <morten@wtf.dk>
* src/ui.cc
Made the top information bar translatable, patch from Morten.
2001-12-10 Daniel Burrows <dburrows@brown.edu>
* README, Makefile.am:
Correct several stale references to /var/state. Oops.
Re-releasing 0.2.8.1, which never made it off my machine yesterday.
2001-12-09 Daniel Burrows <dburrows@brown.edu>
* NEWS, README, configure.in:
Version bumped to 0.2.8.1
* src/generic/aptcache.cc, configure.in, acconfig.h:
The location used for the state information now depends on
$sharedstatedir. (Debian bug #122334)
* po/pt_BR.po:
Updated pofile with data from Andre Luis Lopes <andrelop@ig.com.br>.
This appears to add %s escapes to a number of places they were
missing, and fix some untranslated messages. (Debian bug #122251)
* help.txt, help-fi.txt, help-pl.txt, help-fr.txt
"j" and "k" were reversed in the help text when I initially
wrote in. (oops) Fixed. (Debian bug #122061)
* src/pkg_grouppolicy.cc:
Rewrote the description of the "comm" section to make it clear
that it includes things other than faxmodems. (Debian bug #121951)
* configure.in, po/da.po:
Added Danish translation from Morten Brix Pedersen <morten@wtf.dk>
* src/load_config.cc, src/pkg_description_treeitem.cc, src/vscreen/vs_statuschoice.cc:
Applied Falk Hueffner's patch for not crashing on alpha.
* src/apt_options.cc, src/download_list.cc, README:
Added an option which determines whether to display the
continue/cancel dialog after downloading. (Debian bug #120873)
2001-12-06 Daniel Burrows <dburrows@brown.edu>
* README:
Document the new matcher.
* src/generic/matchers.cc:
Added a matcher for reverse dependencies (Debian bug #122726)
This doesn't fully solve the 'need debfoster capability' wishlist,
but is easy to implement than the full solution, and helps out.
2001-11-25 Daniel Burrows <dburrows@brown.edu>
* po/es_ES.po, po/es.po, configure.in:
Renamed es_ES.po to es.po, at the suggestion of Jordi Malloch.
He speaks Spanish, so I presume he knows what he is talking
about :-)
2001-11-23 Daniel Burrows <dburrows@brown.edu>
* src/pkg_item.cc:
Add a separate case for not-installed packages in visible_version(),
so that it, well, works. (InstVerIter may be an end-iterator
for these)
* src/pkg_item.cc, src/pkg_item.h, src/pkg_columnizer.cc:
Make the display behavior of package items more logical:
held packages are flagged as "broken" if they will be broken
after the proposed install run.
This involved changing NowBroken to InstBroken in the code that
decided whether to display a package as "held".
In addition, querying a displayed package for information will
display information about the current version if it is held. This
makes it easier (hopefully) to get information about what dependency
broke for a held package.
2001-11-22 Daniel Burrows <dburrows@brown.edu>
* src/pkg_tree.cc:
Tweak the incsearch behavior: if it has an invalid (eg, null)
match string, it now returns to the starting location. I find this to
be more logical.
* README, NEWS, configure.in:
Version bumped to 0.2.8
* README:
Document ~C.
* src/generic/matchers.cc:
Add an additional match type for conflicts.
* src/pkg_tree.cc, src/pkg_tree.h, src/apt_options.cc:
Incremental search is now an option, defaulting to ON.
* src/generic/config_signal.h:
Add a std:: that should've been there anyway.
* src/generic/matchers.cc:
The dep-matcher doesn't crash on virtual packages any more.
* README:
Documented the dependency-matcher, and alphabetized the
documentation of match types.
* src/generic/matchers.cc:
Added a package matcher for dependencies. This matcher
takes *another matcher* as an argument..have fun :)
* src/vscreen/vs_util.cc, src/ui.cc:
Check slots before connecting to them, to avoid segfaults.
2001-11-21 Daniel Burrows <dburrows@brown.edu>
* help.txt, README:
Document the default behavior of '/'-searching better. (it
was actually sort of documented in the README, but not very
clearly) (Debian bug #120592)
Attn translators:
* NEWS, README, configure.in:
Version number bumped to 0.2.7.999
* src/pkg_ver_item.cc:
Package views now setup the column information before calling
columnify, which (among other things) should make translations
behave properly. (Debian bug #114401)
* src/pkg_grouppolicy.cc, src/generic/tasks.cc:
Gracefully handle failure to parse the task descriptions.
(can be due to, eg, tasksel not being present) (Debian bug #120578)
* src/generic/matchers.cc, src/generic/matchers.h, src/pkg_tree.cc:
Make the reporting of errors in match strings optional. Needed
for incsearch because some partially typed strings will be invalid
and we don't want to report spurious errors on them.
* src/pkg_tree.cc:
Don't crash if the user reloads during an incsearch.
* src/pkg_tree.cc:
Incsearch now does not interfere with normal search. (ie, pressing
"return" after incsearch does the Right Thing[tm])
* src/pkg_tree.cc:
Killed off a small memory leak.
* src/pkg_tree.cc:
Added an (experimental) incremental search function.
* src/mine/cmine.cc, src/pkg_tree.cc, src/vscreen/vs_editline.cc, src/vscreen/vs_editline.h, src/vscreen/vs_util.cc, src/vscreen/vs_util.h, src/pkg_item.cc, src/ui.cc:
Added a hook to accept a slot to be called when the prompt is cancelled.
* src/mine/cmine.cc, src/pkg_tree.cc, src/vscreen/vs_editline.cc, src/vscreen/vs_editline.h, src/vscreen/vs_util.cc, src/vscreen/vs_util.h, src/pkg_item.cc, src/ui.cc:
Added a hook in the prompting routines to accept a slot to
be called when the text is edited. (will be used for incsearch)
2001-11-20 Daniel Burrows <dburrows@brown.edu>
* README, NEWS, configure.in:
Version number bumped to 0.2.7.3
* po/pl.po, help-pl.txt, aptitude.1.pl:
(finally) merged Mikhal's new pl translation. (Debian bug #114396)
* function_pkgs:
Many updates for new packages in the archive.
* README:
Fix ~a vs ~A confusion. (Debian bug #116695)
* README, NEWS, configure.in:
Version number bumped to 0.2.7.2.
* src/ui.cc, configure.in:
The menu command to reload the cache is now a compile-time
option, defaulting to off.
* src/generic/tasks.cc, src/generic/tasks.h, src/generic/matchers.cc, src/pkg_grouppolicy.cc:
Redid the task code again, this time to (hopefully) make it more
efficient. Specifically, it now precalculates a list of tasks for
each package, and accesses version files in disk order when doing
so (this will hopefully improve speed greatly on slow systems; eg,
bug #116750)
* src/ui.cc:
Added a menu item to reload the cache on demand (useful for
debugging)
Note: make this a configure option defaulting to off before
release!
2001-11-19 Daniel Burrows <dburrows@brown.edu>
* src/mine/mine-help.txt:
Mention the "f" key. (Debian Bug #120251)
2001-11-14 Daniel Burrows <dburrows@brown.edu>
* src/vscreen/vs_tree.cc:
Fix the problem where pageup doesn't unhighlight/highlight the
new item.
2001-10-01 Daniel Burrows <Daniel_Burrows@brown.edu>
* configure.in, README, NEWS:
Version number bumped to 0.2.7.1
* src/generic/matchers.cc, src/generic/tasks.cc:
Fixes for g++-3. (oops)
* configure.in, README, NEWS:
Version number bumped to 0.2.7
* Makefile.am:
Moved some comments out of rules; I was getting complaints from
automake about them.
2001-09-29 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/ui.cc:
The default grouping policy now includes a task component.
* README:
Documented the task grouping policy.
* src/pkg_grouppolicy.cc:
Task groupings now have a passthrough behavior. Tasks are placed
under the "tasks" subtree, and other stuff is put in the root.
(this is a hack)
* src/pkg_view.cc:
Prepared for the ability to sec the description area to some
text directly (rather than via set_package)
* src/generic/tasks.cc:
No longer track a list of all packages in a given task; it's
counter to how aptitude builds its trees. (the new pkg_grouppolicy
is the Right Way to do this)
* src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h, src/load_grouppolicy.cc:
Added a "task" grouping policy.
* src/generic/tasks.h, src/generic/tasks.cc, src/generic/apt.cc:
Added code to load the task descriptions/sections. This will
shortly be used to add a list of tasks to the UI.
* src/pkg_columnizer.cc, src/generic/matchers.cc, src/generic/tasks.cc, src/generic/tasks.h:
Renamed get_task to get_tasks; it now returns a list of tasks.
Other code adjusted accordingly; "task" column type removed because
it's stoopid.
* src/gneric/matchers.cc:
Added a match type for tasks.
* src/generic/Makefile.am, src/generic/tasks.h, src/generic/tasks.cc:
Added the beginnings of support for tasks 'n stuff.
2001-09-22 Daniel Burrows <Daniel_Burrows@brown.edu>
* NEWS, README, configure.in:
Bumped the version to 0.2.6.4
* src/edit_pkg_hier.h, src/load_grouppolicy.cc:
Work around a g++ bug on arm by #including pkg_hier.h before
certain other files. (yes, I should find the actual bug, but I
need aptitude to compile *now*)
2001-09-15 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/generic/config_signal.cc:
Fixed the "revert options" command to handle not-yet-set-at-all
options correctly. (FIXME: what about options that were set but
aren't now?)
* configure.in, README, NEWS:
Bumped the version to 0.2.6.4
* src/ui.cc:
Really fixed the loading of keybindings from the theme.
* README:
Edited the list of available keybindings to bring it into line with
reality.
* src/load_config.h, src/load_config.cc, src/ui.cc, src/generic/config_signal.h:
Fix the problems which were breaking keybindings. (incorrectly
generated config strings, and problems with themes versus actual
configurations) -- Debian bug #112306
* src/ui.cc:
Fix the location from which the 'theme bindings' are loaded.
2001-09-14 Daniel Burrows <Daniel_Burrows@brown.edu>
* configure.in, README, NEWS:
Bumped version to 0.2.6.3
* src/vscreen/vs_tree.cc:
Added a hack to avoid the "hall of mirrors"-like effect with the
non-hierarchical tree mode.
* src/vscreen/vs_treeitem.h:
move_forward_level now correctly refuses to fall over the edge
of the world. This fixes the segfault reported in #112267.
* src/edit_pkg_hier.cc:
Fix a nasty segfault with the edit-hier code -- I was dereferencing
packages for which pkg.end() was true to get their names to save
for later. Why this didn't crash with -O2, I don't know.
2001-09-13 Daniel Burrows <Daniel_Burrows@brown.edu>
* configure.in, README, NEWS:
Bumped version to 0.2.6.2.
* function_hier:
Updated for new packages.
* src/edit_pkg_hier.h, src/edit_pkg_hier.cc:
When postponing the loading of the hierarchy, use strings instead
of pointers to potentially-not-available-later packages.
* src/vscreen/vs_editline.cc:
Fixed a silly crashing bug in the new editline stuff.
* configure.in, README, NEWS:
Bumped version to 0.2.6.1.
* configure.in:
Moved ALL_LINGUAS to before AM_GNU_GETTEXT (Debian bug #111904)
* src/vscreen/vs_editline.cc, src/vscreen_vseditline.h:
Made the scrolling behavior of edit-lines more friendly (they
scroll by single characters with padding at the edge, instead of
scrolling with huge blind jumps)
* src/ui.h, src/ui.cc, src/apt_options.cc:
Added an options-dialog slot for the default grouping string.
* src/generic/config_signal.h, src/generic/config_signal.cc, src/generic/apt.cc:
Killed the Bug of Doom by using two configuration classes as
per Jason's suggestion. (the "system" configuration shadows the
"theme" configuration)
* src/ui.cc:
Uncomment one of the static items that had been commented out for
debugging purposes. (oops)
2001-09-08 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/pkg_view.h:
Remember to really initialize all the important fields in
pkg_view's constructor. (in particular, name and popupdownlinked
were not being initialized at all, which was causing strange problems
with g++-3)
* src/load_pkgview.cc:
Fall back to the default values for static items using the
STATUS or HEADER fields.
* NEWS:
Added a note that this won't compile on potato anymore.
* configure.in:
Moved AM_GNU_GETTEXT to before AM_PATH_SIGC; the gettext
macro tries to compile some code that breaks on g++-3 if sigc
was already called. (why did this work before??)
* src/edit_pkg_hier.cc, src/edit_pkg_hier.h:
Don't update the hierarchy editor from the underlying hierarchy
unless and until it's visible. This is necessary for the
"lazy loading" of the hierarchy to work.
* README, AUTHORS:
Changed the email address to @debian.org
* README:
Added a cursory (could-be-improved) description of the hierarchy
and categorization.
* src/pkg_view.cc:
Make the popdownlinked stuff implemented below actually work.
* src/vscreen/vs_tree.cc:
Fixed the bug that caused highlight/unhighlight notifications
to not be properly sent out when dealing with non-hierarchical
trees (hitting "back" would not send an 'unhighlighted' notification)
* src/vscreen/vs_subtree.h:
Fixed a bug that caused subtree names to be clipped one character
away from the edge of the window.
* src/load_grouppolicy.cc, src/pkg_hier_editor, src/generic/apt.h, src/generic/apt.cc:
Load the package hierarchy lazily, so the user doesn't have
to wait for it if he/she isn't using it.
* src/load_pkgview.cc, src/pkg_view.h, src/pkg_view.cc, aptitude-defaults:
Allow the shown/hidden status of an interface element to be linked
to that of another interface element, which allows me to fix the
inconsistencies with the vertical-split layout.
2001-09-07 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/pkg_grouppolicy.cc, src/pkg_grouppolicy.h:
Started adding a "task" grouping policy (to replace tasksel ;-) )
but quit when it became obvious that apt-pkg doesn't have the
necessary functionality. Filed bug #111654.
* function_pkgs:
Classified a number of new packages.
* aptitude-defaults:
Added a "dselect" theme.
* src/pkg_columnizer.h, src/pkg_columnizer.cc, src/pkg_ver_item.cc, README:
Added a "short priority" column type (needed for dselect-like
mode)
* README: Document Aptitude::UI::Package-Header-Format.
2001-09-06 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/generic/matchers.cc (parse_atom): When handling action-based
matchers, don't require reinstalled and held packages to be purged.
(d'oh!) Note: there are still some subtleties with broken packages..
2001-09-01 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/vscreen/vs_tree.cc:
In non-hierarchical mode, display paths as
"First::Second::Third" instead of "/First/Second/Third".
* src/vscreen/vs_tree.cc:
In non-hierarchical mode, the various page up/down and scrolling
functions work properly (rather than being off-by-one)
2001-08-31 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/generic/apt.cc:
Be more careful when saving a new configuration (save to config.new
and use rename(2) )
* src/generic/apt.cc:
Don't save anything under "PACKAGE::Themes" (this avoids saving lots
of global theme configuration stuff)
* src/generic/apt.cc, aptitude-defaults:
Added a file which stores default configuration data for aptitude
(eg, themes)
* src/generic/aptcfg.h, src/generic/aptcfg.cc, src/ui.cc, src/load_config.cc, README:
Implemented basic theme support. Before shipping the new aptitude,
I'll make some sample themes (eg, vertical-split for my
cute "vertical-split" configuration; dselect for the Face of Evil,
etc)
* README:
Brought the COLORS section up-to-date. Also, renamed the
colors in cmine.cc to be more consistent with the rest of the
program (they use WordsSeparatedByCaps instead of
words_separated_by_underscores now)
* src/vscreen/config/colors.cc AND MANY OTHERS:
If colors are defined in apt.conf with a "bold" tag at the front
of their specification, they will be boldface wherever they are
used. Many manual usages of A_BOLD were dropped to support
this new convention, and several colors (screen_status_color,
screen_header_color, etc) were made boldface by default. (there
are still a few explicit uses of A_BOLD; eg, for hotkeys in menus)
* src/vscreen/vs_tree.cc:
Finally added support for diplaying the current location in the
hierarchy at the top of a tree in "flat" mode.
* src/vscreen/vs_tree.cc:
Backed out support for changing hierarchical mode without the
root selected. This code really needs a redesign to support
that, and aptitude doesn't need it. (ie: I couldn't get it to
stop crashing, and I don't care about this feature that much.
* src/vscreen/vs_tree.cc:
vs_tree now does the "right thing" in the following situations
when non-hierarchical mode is turned on:
- If non-hierarchical mode is activated while something other than
the root is selected, the Right Thing[tm] is done.
- Line-numbers are calculated correctly.
- Searches don't leave the current screen. I'm not sure about
this, but I think the alternative is too confusing.
* src/edit_pkg_hier.cc:
The package-hierarchy editor behaves better when no package is
available to edit: it hides the cursor and handles "Q" and "N"
appropriately. (should I perhaps just move the cursor to (1,1)
instead?)
2001-08-30 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/download.cc:
Fixed the autoclean-on-update bug.
* src/vscreen/vscreen_widget.cc:
Removed the code that guards against multiply deleted widgets; it's
a hack and was breaking on ia64.
2001-08-27 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/vscreen/vscreen.cc
When a deadly signal (TERM/ABRT/SIGV/QUIT) is caught,
the program will catch and report it, shut curses down cleanly,
and then re-raise it to trigger a core dump and/or set the exit
status properly.
2001-08-26 Daniel Burrows <Daniel_Burrows@brown.edu>
* function_pkgs:
Finally finished classifying all packages from 'a' to 'z'.
(the "BWAHAHAHAHA!! I AM ALL POWERFUL!!" CVS commit)
All packages which fall relatively neatly into one of my categories
(and some that don't) have now been assigned a package. Now I have
to edit and rationalize the categories, as well as classifying the
remaining packages. However, I will do this later, when my brain
is not fried from reading several hundred package descriptions
in the space of an hour.
* README:
Corrected the comment about the old "Save Options" menu command
to describe the new auto-save-options behavior. (thanks to
Steve Greenland for pointing this out)
2001-08-25 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/vscreen/vscreen.cc:
Added a handler for TERM, SEGV, ABRT, and QUIT which
shuts curses down before quitting (so the terminal doesn't get
all screwy)
* function_pkgs, function_groups, Makefile.am, src/generic/apt.cc:
Added my current "package class" state to CVS for safekeeping
and renamed hier_groups to function_groups. Also
renamed ~/.aptitude/pkgclass to ~/.aptitude/function_pkgs.
* src/edit_pkg_hier.cc:
Saved package class information is now sorted. This should make it
possible to meaningfully use diff and patch on these files (and to
keep them in CVS without too much trouble)
* src/generic/pkg_hier_dump.cc:
Several useful improvements to the test hierarchy program.
* src/pkg_grouppolicy.cc:
pkg_grouppolicy_hier_factory will only delete its hierarchy if
it is told to (so we can use a global hierarchy without too much
fuss)
* src/generic/pkg_hier.cc (clear):
When clearing a pkg_hier's information, don't forget to reset the
max_group_id!
* src/pkg_grouppolicy.cc, src/generic/pkg_hier.h:
Clear all node data when the cache is reloaded (some stale pointers
to subtrees and so on were causing problems)
* src/vscreen/vs_tree.cc:
When the root of a tree is swapped, delete its "history stack".
* src/generic/apt.cc, src/generic/apt.h, src/pkg_grouppolicy.cc, src/edit_pkg_hier.cc:
Added a hier_reloaded signal that gets called before cache_reloaded.
Hopefully this will kill some of the ultra-repeatable segfaults I've
been seeing.
2001-08-24 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/vscreen/vs_table.cc (find_best_focus):
Never focus an invisible widget!
* src/ui.cc:
Added a menu item to create "categorical" trees: trees that view
the "by function" hierarchy I'm building.
* src/pkg_item_with_subtree.h and many others:
Fixed the signatures of the various classes to conform to the newly
required stuff. (how vague can you get?)
* src/vscreen/vs_tree.cc, src/vscreen/vs_tree.h, src/vscreen/testvscreen.cc:
Added the code necessary to support a "flat" view mode for trees.
(it probably could be better, but it'll do for a start)
2001-08-19 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/vscreen/vs_label.cc: Queue a layout when a label's text
changes, since it might very well have altered its size. (maybe
only queue a layout if its requested size has changed?)
* src/pkg_view.cc: pkg_handling_labels request a size of (1,1).
Since they are columnified, they can adapt to any size they want,
and reporting the dynamically-calculated size of the vs_label was
causing problems. Specifically, the label kept reporting that its
minimum desired size was as large as possible. (oops!)
* src/vscreen/vs_table.cc: When expanding widgets, the vs_table now
gives priority to columns/rows which already contain an expandable
widget which is smaller in the given direction. This makes it DTRT
in many more cases.
2001-08-17 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/pkg_view.cc (make_package_view):
I was initializing the column-span of widgets with their height and
the row-span with their width. D'oh! Fixed.
2001-08-16 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/load_pkgview.cc src/load_pkgview.h src/ui.cc:
Added code to allow a fairly crude customization of the display
layout.
* src/pkg_view.h (struct package_view_item):
Deleted the "src" member from package_view_item, it's not
necessary and not even used.
2001-08-14 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/edit_pkg_hier.cc:
Handle reloads correctly in the edit_pkg_hier class.
2001-08-12 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/edit_pkg_hier.cc (save_hier):
Only save items with at least one parent. (saving other items
is pointless atm -- note: it will become non-pointless if these
settings override system settings...)
* src/edit_pkg_hier.h:
Don't reset the editable list to the top when the user moves to
another item, and allow the user to commit changes and advance to
the next package without leaving the editor.
* src/edit_pkg_hier.cc (set_package):
Only rebuild the editable list if the package is different from the
current package.
* src/vscreen/vs_tree.cc (paint):
Explained why there's an apparently gratuitous invocation of
selected->highlighted in vs_tree::paint.
* Makefile.am:
Install the "groups" part of function_hier in pkgdatadir.
* src/edit_pkg_hier.cc, src/edit_pkg_hier.h, src/pkg_view.cc:
Wrote a simple hierarchy editor, which should be easier to use
than the "edit it by hand" method I've been using until now.
It hooks into the "description window"; press E to activate it.
2001-08-11 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/generic/pkg_hier.cc (realize):
Don't complain about multiple occurances of a package or group;
just use them to further populate the graph.
* src/generic/pkg_hier.h, src/generic/pkg_hier.cc, src/generic/pkg_hier_dump.cc:
Auxilliary information about nodes is now stored in the
realizer. This allows the pkg_hier class to be static and
reusable, rather than crashing if it is used to instantiate two
different hierarchies. It also should fix the problems with the
hierarchy grouping policy.
* src/ui.cc (do_show_preview):
Never use Aptitude::UI::Default-Grouping to set the grouping of
a preview screen.
2001-08-10 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/generic/pkg_hier.cc:
Fixed the use of FindFlag (pass 1 as the flag argument) so that
global settings work.
* README (Aptitude):
Document Aptitude::UI::Default-Grouping with the other
configuration options.
* src/pkg_grouppolicy.h, src/pkg_grouppolicy.cc, src/load_grouppolicy.cc:
Added theoretical support for a hier-based grouping policy. It
is not yes tested!
* src/generic/pkg_hier.h, src/generic/pkg_hier.cc (class pkg_hier):
The package hierarchies can now be generated iteratively and
bottom-up, by specifying a series of packages; each package will
cause the tree structure necessary for that particular leaf to be
generated.
2001-08-09 Daniel Burrows <Daniel_Burrows@brown.edu>
* src/generic/pkg_hier.cc, src/generic/pkg_hier.h, src/generic/README.hier:
Added the basic code needed to support external package hierarchy
descriptions.
2001-08-06 Daniel Burrows <daniel@torrent>
* configure.in, README, NEWS
Bumped version number to 0.2.5.3.
* Makefile.am, ChangeLog
The source ChangeLog is now maintained by hand. All entries
beginning with this one are lovingly hand-crafted by yours truly.
* /cvsroot/aptitude/aptitude/src/mine/board.h:
difftime and time are in time.h, especially on the Hurd
* /cvsroot/aptitude/aptitude/src/main.cc:
getopt_long returns an int, not a char. Fixed main to compile on ppc
2001-07-27 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump version number to 0.2.5.2
* /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/src/vscreen/config/column_definition.cc:
Fix a nasty endianness issue for alpha
2001-07-26 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc:
Instead of detecting virtual packages by checking that they have
zero-length section names in the section grouper, just check
whether they have no versions (the correct thing to do) I don't
know why I did it the other way (or why that worked), but this
fixes a bizarre bug that caused '1-1' to be used as the section
for virtual packages on this computer.
2001-07-24 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump the version number to 0.2.5.1
* /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.cc:
Oops -- the code to check for duplicated history entries was causing
the program to segfault if the history was empty! Fixed.
2001-07-23 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.cc:
Bump version number to 0.2.5
* /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/POTFILES.in:
Remove the action_tree stuff from POTFILES.in
* /cvsroot/aptitude/aptitude/src/download.cc:
Include init.h in download.cc so we have the apt library version available
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc:
Fix the binding of Escape to Cancel, hackily (use ^[ as a synonym for it)
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
Making state_restorer inline confuses some older g++'s and isn't really
that important, so don't do it.
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
Fix the GainLock routine for the old apt code so it
compiles (there was an argumentless return where it didn't
belong)
* /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_item.h, /cvsroot/aptitude/aptitude/src/pkg_item_with_subtree.h:
Add basic mouse support in pkg_item: double-clicking a package displays its
info screen.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_subtree.h:
Subtrees now can be expanded by double-clicking on them.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.h:
vs_tree::move_selection was an obsolete NOP, removed it.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.h:
Trees now handle mouse events by highlighting the clicked item and
sending it a mouse event. This adds a new overridable method in
vs_treeitem, dispatch_mouse.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.h:
Added simple mousing support to the edit-line.
2001-07-22 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/vscreen/vs_button.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_table.cc:
Buttons now respond to release events /or/ click events, and tables give
the focus to clicked-upon widgets.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.cc:
The menu bar now responds to press, release, and click events instead
of just clicks
* /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.cc:
Menus now handle button presses and releases more elegantly: pressing
the mouse highlights the item under the cursor; releasing it selects
the item.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.cc:
The button masking was using && instead of &; fixed
* /cvsroot/aptitude/aptitude/src/vscreen/vs_button.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_button.h:
Buttons now accept mouse presses
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.h:
vscreen_widget::enclose now uses its own calculation with window-relative
coordinates rather than calling wenclose.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.h:
Menus now accept mouse clicks
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_multiplex.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_multiplex.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_passthrough.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_passthrough.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_stacked.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_stacked.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_table.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_table.h:
Added basic support for mousing to the codebase. Currently only vs_menubar
supports it (even the menus don't!), but expect that to change soon.
* /cvsroot/aptitude/aptitude/src/download_list.cc:
Moving left and right in the download display now works when the
'download completed' dialog is displayed. Note that this is
potentially problematic, since those keys previously could be
used to cancel a download..
* /cvsroot/aptitude/aptitude/src/download_list.cc, /cvsroot/aptitude/aptitude/src/download_list.h:
Don't let the download screen be scrolled farther than
the end of the longest line
* /cvsroot/aptitude/aptitude/src/download_list.cc, /cvsroot/aptitude/aptitude/src/download_list.h:
Added preliminary support for scrolling the download screen to the right
* /cvsroot/aptitude/aptitude/src/download_list.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen.h, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.h:
While a download is in progress, all keys pressed between UI updates are
processed in a given UI update.
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.h:
The "help bar" can now be switched on and off.
* /cvsroot/aptitude/aptitude/src/mine/cmine.cc, /cvsroot/aptitude/aptitude/src/mine/cmine.h, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_tree.cc, /cvsroot/aptitude/aptitude/src/pkg_tree.h, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_util.h:
The history stuff has been hooked into all string prompts in the program
(with the exception of the "do you understand that you are doing something
very dangerous?" prompt for removing Essential packages)
* /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.cc:
add_to_history is now a NOP on editlines that do not have a history
* /cvsroot/aptitude/aptitude/src/vscreen/vs_util.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_util.h:
Update the utility string dialogs to allow history lists
* /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.h:
Many tweaks to the edit-line history: the current edit is preserved while
searching the history, the history keys are always eaten if a history
is being used (even if it is empty), and kill the signedness issues.
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc:
Make C-u the primary keybinding for Undo (the one that gets displayed
in the menu)
* /cvsroot/aptitude/aptitude/src/vscreen/testvscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.h:
Added preliminary support for edit-line histories. This has some problems
still, most notably bindings and signedness issues.
2001-07-21 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/aptitude.1, /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Killed the welcome dialog and related stuff (-w, etc)
* /cvsroot/aptitude/aptitude/src/ui.cc:
Added a bar at the top of the screen with short descriptions
of the most useful keybindings, especially the menu and help.
Hopefully this will remove the need for the welcome dialog.
* /cvsroot/aptitude/aptitude/src/ui.cc:
If the user selects the "Install/Remove packages" menu item while a preview
is visible, the installation will begin. (previously, there was a weird
discrepency where pressing "g" and selecting the menu item would do different
things)
* /cvsroot/aptitude/aptitude/src/download.cc, /cvsroot/aptitude/aptitude/src/mine/cmine.cc:
Hopefully fix the Minesweeper help for real (needs testing)
* /cvsroot/aptitude/aptitude/src/download.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.h:
Made the minor modification that made multi-CD installs actually work (yay!) --
it seems I had to shut down the fetcher, re-get the archives, and reacquire
the lock. This commit also adds a mechanism for reacquiring the lock without
restarting the program.
* /cvsroot/aptitude/aptitude/src/download_list.cc:
Clear the list of messages when starting a new download
* /cvsroot/aptitude/aptitude/src/download.cc, /cvsroot/aptitude/aptitude/src/download_list.cc, /cvsroot/aptitude/aptitude/src/download_list.h, /cvsroot/aptitude/aptitude/src/download_manager.cc, /cvsroot/aptitude/aptitude/src/download_manager.h, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
Implemented the (tortuous!) logic necessary to allow installs spread across
more than one CD to work. I almost feel like I understand the Acquire system
now!
The general idea is that we do one package-manager invocation per CD. No,
this isn't documented anywhere. (well, I guess now it is) So the main
fetch is run from a big loop, which I slant-copied from apt-get (slant-copied:
a copy of the basic framework but with modifications) The main internal API
change is that we now call Complete on the download_manager when /everything/
is done (because Stop can be called multiple times)
* /cvsroot/aptitude/aptitude/src/download_list.cc:
Experimentally copy some code from the apt-get downloader to see if it
helps the situation with multiple CD-ROMs
2001-07-20 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/defaults.cc, /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/Makefile.am, /cvsroot/aptitude/aptitude/src/pkg_action_tree.cc, /cvsroot/aptitude/aptitude/src/pkg_action_tree.h, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_tree.cc, /cvsroot/aptitude/aptitude/src/pkg_tree.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Setting the group now provides the previous setting as a default. (this
isn't done Right[tm], but I'm tired)
Also, pkg_action_tree has been removed. It was obsolete and
didn't need to be there.
2001-07-19 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump version number to 0.2.4
* /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/pl.po:
Ran update-po
* /cvsroot/aptitude/aptitude/src/generic/apt.cc:
Remove an unneeded comment
* /cvsroot/aptitude/aptitude/src/download_screen.h, /cvsroot/aptitude/aptitude/src/generic/config_signal.h, /cvsroot/aptitude/aptitude/src/generic/strhash.h, /cvsroot/aptitude/aptitude/src/strhash.h, /cvsroot/aptitude/aptitude/src/vscreen/config/keybindings.cc:
Conditionalization in the header requires that config.h be included, or
really bad[tm] stuff happens. In this case, different versions of
the hash map were being used in some files from in others. Not
good!
* /cvsroot/aptitude/aptitude/src/download.cc:
Fixed some thinkos in the conditionalization for pkgAcquire::Item*, so
download.cc compiles against earlier apts again.
* /cvsroot/aptitude/aptitude/acconfig.h, /cvsroot/aptitude/aptitude/src/apt_config_widgets.h, /cvsroot/aptitude/aptitude/src/apt_info_tree.h, /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/dep_item.cc, /cvsroot/aptitude/aptitude/src/download_bar.h, /cvsroot/aptitude/aptitude/src/download.cc, /cvsroot/aptitude/aptitude/src/download_list.cc, /cvsroot/aptitude/aptitude/src/download_list.h, /cvsroot/aptitude/aptitude/src/download_manager.h, /cvsroot/aptitude/aptitude/src/download_screen.h, /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/generic/config_signal.h, /cvsroot/aptitude/aptitude/src/generic/strhash.h, /cvsroot/aptitude/aptitude/src/generic/undo.cc, /cvsroot/aptitude/aptitude/src/generic/undo.h, /cvsroot/aptitude/aptitude/src/load_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/load_grouppolicy.h, /cvsroot/aptitude/aptitude/src/load_sortpolicy.cc, /cvsroot/aptitude/aptitude/src/load_sortpolicy.h, /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/mine/board.cc, /cvsroot/aptitude/aptitude/src/mine/board.h, /cvsroot/aptitude/aptitude/src/mine/cmine.cc, /cvsroot/aptitude/aptitude/src/pkg_columnizer.h, /cvsroot/aptitude/aptitude/src/pkg_description_treeitem.h, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_item.h, /cvsroot/aptitude/aptitude/src/pkg_item_with_subtree.h, /cvsroot/aptitude/aptitude/src/pkg_subtree.h, /cvsroot/aptitude/aptitude/src/pkg_ver_item.h, /cvsroot/aptitude/aptitude/src/pkg_view.cc, /cvsroot/aptitude/aptitude/src/pkg_view.h, /cvsroot/aptitude/aptitude/src/strhash.h, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.h:
Everything now compiles and -- almost -- works with g++ 3.0. Still some
problems, partly due (I think) to hashtable incompatibilities
* /cvsroot/aptitude/aptitude/help-fi.txt: New file.
* /cvsroot/aptitude/aptitude/help-fi.txt:
Oops, help-fi.txt got left out of CVS. d'oh!
* /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.h:
It seems the inline constructors for vs_menu_info were also causing
confusion. They were moved in the cc file, and aptitude now (DRUM ROLL)
compiles with g++-3.0!
2001-07-18 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/vscreen/testvscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.h:
The menu/slotarg stuff sort of works, if optimization is off.
This is done by using the constructor to initialize static arrays
including slotargs, rather than simply listing initializers for
the members.
2001-07-11 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/NEWS: Oops. Fixed NEWS
* /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/pl.po:
Ran update-po
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/README:
Bumped version to 0.2.3
* /cvsroot/aptitude/aptitude/NEWS: Updated the NEWS file for 0.2.3
* /cvsroot/aptitude/aptitude/aptitude.1: Also document -w
* /cvsroot/aptitude/aptitude/aptitude.1:
Document the available options in aptitude's manpage
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
Don't mark every package as 'new' when starting for the first time
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
Make the program compile again on potato (I had to conditionalize the
restoration of the candidate version in the cache-loading routine)
2001-07-10 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc:
Use J and K for level-up and level-down -- C-j is taken for other keybindings.
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/defaults.cc, /cvsroot/aptitude/aptitude/src/pkg_item.cc:
It's now possible to run dpkg-reconfigure from within aptitude (hokey, I
know, but it's only a few lines of code..)
* /cvsroot/aptitude/aptitude/src/mine/cmine.cc:
Made the Minesweeper help screen actually work (woops!)
* /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
Ok, I'm chickening out: the auto-su-to-root on install now just
shows a preview screen; it doesn't actually start the install.
This is because I still don't totally trust the transfer of
the current selections, and want to allow people to avoid
nasty accidents.
* /cvsroot/aptitude/aptitude/README:
Documented the whitespace-sensitive nature of limits
* /cvsroot/aptitude/aptitude/README: Document the ~a matcher
* /cvsroot/aptitude/aptitude/README: Document UI::Advance-On-Action
* /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.h:
Moving forward or backward in a level will no longer ever move 'up' out of
that level.
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/pkg_node.cc:
Added code to make all package-nodes follow Steve Greenland's suggested
dselect-like behavior. (is this the RTTD? dunno..)
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.h:
Broke the level-movement commands into separate methods, and exposed
them to the outside world.
* /cvsroot/aptitude/aptitude/README: Documented LevelUp and LevelDown
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.h:
Added another vs_tree function, which will advance to the next
item on the current level. The keybindings are LevelUp and LevelDown,
and they default to C-k and C-j, respectively.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
Broke the commands to move up, move down, page up/down, etc out of
the vs_tree's main keystroke handler and into separate PUBLIC
functions. This is just the Right Thing To Do, and also lets me
easily implement Steve Greenland's suggestion.
* /cvsroot/aptitude/aptitude/src/generic/matchers.cc:
It should now be possible to limit based on the action that will be
taken with it (install/uprgade/remove/purge/reinstall/hold).
Also, some strings that weren't previously marked for translation are.
* /cvsroot/aptitude/aptitude/src/generic/apt.cc:
If the cachefile open fails, fall back to opening read-only.
* /cvsroot/aptitude/aptitude/src/ui.cc:
After trying to start a subprocess, clean up errors before reloading the
cache (if errors were hanging around, the cache would fail to load.
Probably I should be using something more fine-grained (what?) instead
of checking _error->PendingError()
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
Finally get passing of candidate-version info to the subprocess to
work correctly. (it seems I have to mark the package for installation
after I set the candidate version. Oops)
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
Fix some stuff that meant that the version-selection stuff would never have
worked properly. (it's still doesn't, but at least it tries) Specifically,
don't increment i for a loop on ver (d'oh)
2001-07-09 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Keep the description widget from causing a crash when a non-wrappable word
(one longer than the widget's width) is included in the description.
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
Added some code to try to save versions in the state file (hacky, just for
su-to-root), but it doesn't work and I'm too tired to fix it.
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
When a vs_tree is resized, the selection will no longer be modified.
Instead, the screen scrolls until it is once again visible.
2001-07-08 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.cc, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.h:
Make it compile on woody/sid, too
* /cvsroot/aptitude/aptitude/src/generic/aptcache.h, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.cc, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.h, /cvsroot/aptitude/aptitude/src/load_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/load_sortpolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc:
Modified aptitude to once again compile against the potato version of libapt
2001-07-04 uid35045 <uid35045@torrent>
* /cvsroot/aptitude/aptitude/src/ui.cc:
Don't let the user clean the package cache (even just obsolete files)
while a download is proceeding. That's just a weird thing to do.
* /cvsroot/aptitude/aptitude/src/download_list.cc, /cvsroot/aptitude/aptitude/src/download_list.h, /cvsroot/aptitude/aptitude/src/download_manager.cc, /cvsroot/aptitude/aptitude/src/download_manager.h, /cvsroot/aptitude/aptitude/src/Makefile.am, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.h:
Hacked around a nasty crashing bug. The problem was that I was using
destroy() to signal the cancellation of a download -- yes, it's evil, but it
worked because of the deletion queue..at least, until I tried to start
installation at the beginning of the program, before the main main loop.
Boom!
The hack solution is to override destroy() to call cancel() instead. The
real solution is probably never to call destroy() at all, but I'm not sure I
understand how that would work, and I want to eliminate this crash NOW.
This commit also decouples the download status from the widget via
download_manager -- I thought (wrongly) that it would help the crash, but
this is useful for other reasons, so I'm leaving it in.
* /cvsroot/aptitude/aptitude/src/download_manager.cc, /cvsroot/aptitude/aptitude/src/download_manager.h:
New file.
2001-07-02 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/download_bar.cc, /cvsroot/aptitude/aptitude/src/download_list.cc:
Ok, it compiles again
* /cvsroot/aptitude/aptitude/src/download_list.cc:
The media-change message should now be split up so that it hopefully fits
onto enough lines. (addresses a Debian bug report)
* /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
aptitude now accepts -w to suppress the startup welcome message, and the
su_to_root code will pass it to avoid a redundant message
* /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
The auto-become-root behavior now works for installation as well
* /cvsroot/aptitude/aptitude/src/ui.cc:
Make the auto-su from update_package_lists() pass -u into the subaptitude
* /cvsroot/aptitude/aptitude/src/ui.cc:
Don't suddenly exit if the user mistypes a password (or, I suppose, something
else bad happens) -- maybe I should eventually use a second fifo (eek) to
distinguish between bad passwords and other problems.
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
have_system_lock wasn't being initialized to false, which caused some pretty
broken behavior in some situations. Fixed.
* /cvsroot/aptitude/aptitude/src/ui.cc:
D'oh, some partial changes slipped into that last commit and kept it from
compiling. Fix them (make the popup message always a popup;
the status-line stuff can't deal with it properly)
* /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
Added command-line options to update the lists on startup and to start a
package run on startup. (it might be better if you could
do this and end immediately, but I think that'll be trickier
to implement)
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Added the ability to automatically become root when performing a privileged
action.
* /cvsroot/aptitude/aptitude/src/ui.cc: IT WORKS!!!!!
Redid the su-to-root stuff (again) to avoid using a FIFO to read the status
information (the tagfile code barfs on FIFOs, grrr) And..it works!! Ok, you
lose undo history, version selections go out the window, but hey..it works!
It works! It works! (Daniel is a happy Daniel)
* /cvsroot/aptitude/aptitude/src/aptitude.h, /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.h, /cvsroot/aptitude/aptitude/src/generic/apt.cc, /cvsroot/aptitude/aptitude/src/generic/apt.h, /cvsroot/aptitude/aptitude/src/main.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Added the very beginning of the stuff necessary to have a "su to root" option
integrated into aptitude. The idea is that it'll be able to send the current
package state through a FIFO to a subprocess. Right now it, uh, doesn't work
at all, but it's stopped screwing up the rest of the program, so I'm
committing.
2001-07-01 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/main.cc:
Add skeletal code for option-parsing
* /cvsroot/aptitude/aptitude/src/ui.cc:
Now set active_status_download to NULL whenever the status-download
emits a destroyed() signal. This fixes a segfault the
last commit introduced.
* /cvsroot/aptitude/aptitude/src/ui.cc:
Status-area downloads can now be cancelled with 'q' (hmm, not so great,
but that whole status-area download thing is a hack anyway)
* /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc:
Added a description for the hamradio section
* /cvsroot/aptitude/aptitude/src/ui.cc:
Implemented Zach Weinberg's suggestion: if the menubar is set to autohide
and it's possible to close all screens without exiting the program, make
the menubar visible anyway if the last screen is closed. (avoids a certain
amount of user confusion)
2001-06-30 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/download_bar.cc, /cvsroot/aptitude/aptitude/src/download_list.cc, /cvsroot/aptitude/aptitude/src/download_list.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Experimentally use an altered download_list to do 'status bvar' downloads.
Probably I should rename the option, or at least change its
description..
* /cvsroot/aptitude/aptitude/src/download_bar.cc, /cvsroot/aptitude/aptitude/src/download_bar.h, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_subtree.cc:
Fix the section-name table -- the section name is 'utils', not 'util'
* /cvsroot/aptitude/aptitude/src/dep_item.cc:
Broken dependencies are now displayed with a textual tag next to the item.
(this should help colorblind people and people on B&W displays)
* /cvsroot/aptitude/aptitude/src/generic/matchers.cc, /cvsroot/aptitude/aptitude/README:
Added a general mechanism for matching packages with broken dependencies
of a particular type (eg, Recommends or Suggests)
2001-06-29 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/NEWS: Tweak news
* /cvsroot/aptitude/aptitude/Makefile.am:
Oops, the makefile listed help-fi.1 instead of help-fi.txt
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bumped version number to 0.2.2, updated NEWS
* /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/pl.po:
Ran make update-po
* /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc:
Added (somewhat experimental) code to display descriptions of package
sections, similar to what capt does. This clutters the display up a bit, so
it may be modified or removed in the future.
* /cvsroot/aptitude/aptitude/src/pkg_columnizer.cc, /cvsroot/aptitude/aptitude/src/pkg_columnizer.h:
The default widths for descriptions can now vary with the locale.
Sorry Michal, I decided not to translate the default
format string; I think that would be too confusing.
* /cvsroot/aptitude/aptitude/src/mine/Makefile.am:
Fix the name of the Finnish Minesweeper help file
* /cvsroot/aptitude/aptitude/aptitude.fi.1, /cvsroot/aptitude/aptitude/Makefile.am, /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/src/mine/Makefile.am, /cvsroot/aptitude/aptitude/src/mine/mine-help-fi.txt:
Added the new and updated Finnish translation.
* /cvsroot/aptitude/aptitude/aptitude.fi.1, /cvsroot/aptitude/aptitude/src/mine/mine-help-fi.txt:
New file.
2001-06-28 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump the version number to 0.2.1
* /cvsroot/aptitude/aptitude/src/ui.cc:
Kill the explicit 'save options' command, it's not necessary anymore
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.h:
Fix a nasty crash due to hairiness surrounding vs_treeiterator
(and wrote a big NOTE about it in vs_tree.cc)
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.h:
Finally found that strange bug about "I pressed the end key and now I can't
find the root of the tree" -- levelrefs need a parent chain extending as far
up as they'll be able to move, and the end-iterator for the vs_tree was being
set to a levelref that didn't go all the way to its root.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
vs_trees now honor the showroot option when they are first created
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
Fixed an off-by-one error in the handling of the move-up command (it would
cause the selection to vanish if it was one line away from having to disappear)
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
Fix the move-down code to also move one line at a time
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
Hide the cursor when a non-selectable item is 'selected'
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
Rewrote the 'move up' command to be much less jarring.
* /cvsroot/aptitude/aptitude/src/mine/cmine.cc:
The 'custom board' dialog in Minesweeper no longer displays its
title in inverse video from the rest of the dialog
* /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
popup_widget now takes an optional parameter which can prevent
show_all from being called on the widget. (since most widgets do need
show_all, it's a nuisance to have to explicitly instantiate them and call
show_all before calling popup_widget)
This fixes the problem with Minesweeper not displaying its popup dialogs.
(and, hey, maybe some more problems I don't know about) Also, all those
places where I explicitly show_all() a popup widget are now redundant.
* /cvsroot/aptitude/aptitude/src/download_list.cc:
Be sure to display the confirmation CD-ROM dialog (amazingly, this is the
only change needed to get the CD stuff working, and it was
only necessary because of changes in 0.2.0)
* /cvsroot/aptitude/aptitude/po/pl.po:
A bunch of po files need to have their line number references updated
* /cvsroot/aptitude/aptitude/src/vscreen/vs_label.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.cc:
Fix more signedness issues with addch
* /cvsroot/aptitude/aptitude/src/ui.cc:
Change a reference to the configuration group 'aptitude' to PACKAGE
* /cvsroot/aptitude/aptitude/src/apt_options.cc:
Ok, ok, ok, autosave options. Don't say I didn't warn ya..
2001-06-26 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/src/ui.cc:
D'oh, I accidentally made all the help dialogs useless. I guess I have
to redo the 0.2.0 release (luckily, it wasn't uploaded yet)
2001-06-25 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/help-pl.txt, /cvsroot/aptitude/aptitude/po/pl.po:
Merge Michal's Polish translation updates
* /cvsroot/aptitude/aptitude/configure.in: Bump version number to 0.2.0
* /cvsroot/aptitude/aptitude/NEWS: Update NEWS for 0.2.0
* /cvsroot/aptitude/aptitude/TODO:
Brought the TODO a little more into line with reality
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Package-description items now don't allow you to scroll down forever.
This is done by using the display routine to calculate the number of lines
in the description; a parameter determines whether it will actually draw
the widget.
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Fix the commenting in the package-description wordwrap stuff
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/README:
Added an option to control whether the extended description is shown by
default.
* /cvsroot/aptitude/aptitude/src/ui.cc:
Changed {add,insert}_main_widget to no longer use show_all (explicitly or
implicitly) This means that the info area will never be on by default in
info screens. Yay!
* /cvsroot/aptitude/aptitude/src/pkg_item.cc:
Make the 'essential package removal' warning box
work again -- it was assuming that popup_widget used show_all
* /cvsroot/aptitude/aptitude/README: Bring README up to date for 0.2.0
* /cvsroot/aptitude/aptitude/aptitude-hackers-guide.txt:
Update the hacker's guide for the new version
* /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
pkg_ver_item now also uses the make_foo_screen routines. This should fix some
of the "I can't get the description area when I look at a package's
information" bugs that have appeared..
* /cvsroot/aptitude/aptitude/src/pkg_tree.cc:
Fix a small typo that snuck in with all that sort-policy fixing stuff
* /cvsroot/aptitude/aptitude/src/download_list.cc:
Use show_all() on the download summary since popup_widget no longer uses it.
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc:
Use recursive mutexes to avoid deadlocks (I suspect I will never understand
why the deadlocks only started appearing in the last commit or so)
* /cvsroot/aptitude/aptitude/src/pkg_item_with_subtree.h, /cvsroot/aptitude/aptitude/src/pkg_sortpolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_sortpolicy.h, /cvsroot/aptitude/aptitude/src/pkg_subtree.cc, /cvsroot/aptitude/aptitude/src/pkg_subtree.h, /cvsroot/aptitude/aptitude/src/pkg_tree.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_subtree.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.h:
Really fixed sorting. The sorting wasn't working properly since the sort
policy was only passed to the top-level of the tree, causing the rest of the
tree to be unsorted. (Doh!) So I modified things once again, this time
reverting back to having a 'sort policy class' with a virtual method to
compare two items; to get around the pass-by-value in the STL's sort(), I
use a wrapper class. It is all quite ugly and nasty and probably also
way too slow.
* /cvsroot/aptitude/aptitude/src/vscreen/Makefile.am:
Distribute README.layout in the package
* /cvsroot/aptitude/aptitude/src/ui.cc:
Kill the Test Error with extreme prejudice. (if people complain, I'll
put it back in ;-) )
* /cvsroot/aptitude/aptitude/src/ui.cc:
Made the highlighted letter in "obsolete" the "o", and added a highlight
on the "C" of ChangeLog.
2001-06-24 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/acconfig.h, /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/src/vscreen/config/colors.cc, /cvsroot/aptitude/aptitude/src/vscreen/config/keybindings.h, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.cc:
- Eliminated the state where the menubar is selected but no menu is active;
it has no particular purpose aside from wasting keystrokes and confusing
people.
- Added configure tests for hash_map and ext/hash_map (and hash_set
and ext/hash_set). Fall back to the standard map and set if no
implementation of the hashed version is available. (this allows it to
compile with both g++-2.95 and g++-3.0)
* /cvsroot/aptitude/aptitude/Makefile.am, /cvsroot/aptitude/aptitude/src/ui.cc:
- I hope that autoclean will now actually autoclean, rather than just
saying that it did. (untested)
- Added the NEWS file to the help menu.
2001-06-22 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/pkg_view.cc, /cvsroot/aptitude/aptitude/src/pkg_view.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Add the groundwork for hiding the description by default, but
it's still visible, presumably because something is calling show_all
on the view.
* /cvsroot/aptitude/aptitude/src/pkg_description_treeitem.cc, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
Changed some title strings which were still using string concatenation
to use snprintf (for translators)
* /cvsroot/aptitude/aptitude/NEWS:
Ok, the NEWS file now properly reports changes in 0.0.8.7.1
2001-06-19 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/vscreen/config/colors.cc, /cvsroot/aptitude/aptitude/src/vscreen/config/colors.h, /cvsroot/aptitude/aptitude/src/vscreen/config/column_definition.cc, /cvsroot/aptitude/aptitude/src/vscreen/config/column_definition.h, /cvsroot/aptitude/aptitude/src/vscreen/config/keybindings.cc, /cvsroot/aptitude/aptitude/src/vscreen/config/keybindings.h, /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.cc, /cvsroot/aptitude/aptitude/src/vscreen/vscreen_widget.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_pager.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_pager.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_radiogroup.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_stacked.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_staticitem.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_statuschoice.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_subtree.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_table.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_table.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_treeitem.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_util.cc, /cvsroot/aptitude/aptitude/src/vscreen/columnify.cc, /cvsroot/aptitude/aptitude/src/vscreen/columnify.h, /cvsroot/aptitude/aptitude/src/vscreen/curses++.cc, /cvsroot/aptitude/aptitude/src/vscreen/curses++.h, /cvsroot/aptitude/aptitude/src/vscreen/testvscreen.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_editline.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_label.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_label.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menubar.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_menu.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_minibuf_win.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_minibuf_win.h, /cvsroot/aptitude/aptitude/src/vscreen/vs_multiplex.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_multiplex.h:
Got all the stuff in vscreen/ compiling with gcc-3.0..now it crashes on
startup. Ouch. Anyway, the rules for this are: headers explicitly
use std::class; .cc files declare 'using namespace std'.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_pager.cc:
Another Michal fix: somehow vs_pager started screwing up characters with
the high bit set again. Added the requisite cast to unsigned (ick)..
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Made Aptitude::UI::Prompt-On-Exit work again, and added it to the options
dialog. (oops)
2001-06-18 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/NEWS:
Add a note about this being a pre-0.2 to NEWS
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Version number bumped to 0.1.9
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
Added some missing options to the options dialog, and really
made Aptitude::UI::Welcome-Dialog control whether the
welcome dialog was displayed.
* /cvsroot/aptitude/aptitude/src/generic/apt.cc, /cvsroot/aptitude/aptitude/src/pkg_columnizer.cc, /cvsroot/aptitude/aptitude/src/pkg_view.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Fixed a bunch of crashes and potential crashes in the package-columnization
stuff when the package-cache is in a weird state. There's still something
bizarre going on with the static items, where iterators I initialize after
reloading the cache suddenly point to bad memory.
Also fixed a crash due to deleting the preview tree and not the preview
view (connected the tree's destroyed signal to the view's destroy method)
2001-06-17 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/generic/matchers.cc:
Fix the Origin and Archive stuff to be at least semi-useful
* /cvsroot/aptitude/aptitude/src/ui.cc:
Only connect signals in show_message if we got a valid slot, so it doesn't
immediately crash when displaying in the minibuffer.
* /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
Add a generic popup-message facility. Currently segfaults in some cases..
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Edited the 'this is a hack' comment
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Fixed several unpleasant crashes resulting from pkgCache::VerIterator::end()
crashing if the version-iterator has a NULL cache reference. Oops. The
static items were generating a dummy iterator to start with, and then passing
that to the columnizer when they were redrawn, causing it to crash. The
program now checks the validity of the iterator first, and tries to make it
valid if possible (this shouldn't be noticable to the user, since the only
time it's invalid is at the moment the cache is being loaded)
* /cvsroot/aptitude/aptitude/src/pkg_tree.cc, /cvsroot/aptitude/aptitude/src/pkg_tree.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Ok, ok; if Aptitude::UI::Preview-Limit is set, preview screens will start with
a different limit from normal package trees. Addresses another Michael bug.
* /cvsroot/aptitude/aptitude/src/pkg_view.h, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Package-view items can now listen for changes to a particular configuration
option; in particular, static items are modified when the configuration option
they were derived from is modified. (fixes the "I changed the column layout
and nothing happened!" syndrome)
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Static info widgets now re-columnify themselves whenever they are painted.
Should fix a lot of weird display quirks.
* /cvsroot/aptitude/aptitude/src/ui.cc:
Added support for a "header line". Default is to display program name,
broken package count, download size, and disk usage.
* /cvsroot/aptitude/aptitude/src/pkg_columnizer.cc, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
The status line now does something more sensible when no package is selected
and the columnizers now do something more sensible when passed a NULL iterator.
* /cvsroot/aptitude/aptitude/src/vscreen/config/column_definition.cc:
The column-parsing code can now sort of recognize \n..but use it at your own
risk as the columnifier doesn't recognize it (so odd effects will probably
happen)
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/pkg_columnizer.cc, /cvsroot/aptitude/aptitude/src/pkg_columnizer.h, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
Fixed the status-line stuff so it actually honors the configuration option.
The status_columns stuff in pkg_columnizer.{cc,h} has been removed.
* /cvsroot/aptitude/aptitude/src/pkg_columnizer.cc, /cvsroot/aptitude/aptitude/src/pkg_columnizer.h:
Added the new column types which will be used for the screen header.
* /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
pkg_ver_columnizer is now a subclass of pkg_columnizer. This should make it
possible to make pkg_columnizer accept some extra format types for stuff that
can go in the "header" (like broken package count, etc) without needing to
duplicate code. (in fact, I bet some duplicated code can be removed now, but
I'll need to think about that)
* /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
The dependency screen is now also a pkg_view.
* /cvsroot/aptitude/aptitude/src/apt_info_tree.h, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
The info screen and dependency screen are now generated as pkg_views with
the description area and stuff.
* /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_view.cc, /cvsroot/aptitude/aptitude/src/pkg_view.h, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
The Grand View Unification begins:
pkg_views now, instead of specifically having trees placed, can have any
widget plugged into their "main widget" slot. This means that the same
configuration will work for multiple screens, and I don't have to write in
stuff for ("info screen", "dep screen", ...) and make that work with the
signal stuff.
2001-06-16 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/ui.cc:
The preview is now generated as a package view, so it has a description area
and stuff. (hacky, yuck)
* /cvsroot/aptitude/aptitude/src/generic/matchers.cc:
Preliminary support for matching on origin and archive. This is a little
dicey and should be fixed (eg, it does the Wrong Thing if a version is
available from multiple origins and archives)
2001-06-15 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump version numbers to 0.1.8
* /cvsroot/aptitude/aptitude/src/dep_item.cc, /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
Auto-Install is now on by default
* /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc:
Swapped the top-level labels for obsolete and virtual packages, since they
somehow ended up being reversed.
2001-06-14 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.h, /cvsroot/aptitude/aptitude/src/generic/apt.cc, /cvsroot/aptitude/aptitude/src/generic/apt.h, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.cc, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.h:
Copyright notices (bleah)
* /cvsroot/aptitude/aptitude/src/load_grouppolicy.cc:
Priority grouping policies no longer crash if they are at the end of a stack
* /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc:
Priority groups are now displayed as "Priority (whatever)", and they are
sorted so that Required priority comes before Important.
* /cvsroot/aptitude/aptitude/src/generic/apt.h, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_sortpolicy.cc:
Added a quite nasty hack to force certain trees (eg,
priorities and installation modes) to be sorted in a particular
non-alphabetial order.
* /cvsroot/aptitude/aptitude/src/download.cc:
The log is now sorted (yay!)
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/apt_options.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Added Recommends and Suggests handling to the in-program options, and split
dependency-handling into a separate options dialog.
* /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.cc, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.h:
New file.
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/dep_item.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.cc, /cvsroot/aptitude/aptitude/src/generic/aptitudepolicy.h, /cvsroot/aptitude/aptitude/src/generic/Makefile.am:
Recommends and Suggests can now be like dependencies, at least for an
initial package installation. (although libapt seems to be broken wrt ORs)
Also, exactly the following dependencies will be colored red if they are
not met: critical dependencies, recommends, and suggests. (previously only
important ones were)
2001-06-13 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/download.cc:
aptitude can now do an autoclean operation after updating its package lists..
in fact, this is now the default behavior.
* /cvsroot/aptitude/aptitude/src/ui.cc:
Added autoclean capabilities and made both clean and autoclean display
a message during and after the process.
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/load_sortpolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_sortpolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_sortpolicy.h:
Packages can now be sorted by priority
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/load_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.h:
It is now possible to group packages by priority
* /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Make it painful to mark an essential package for removal. There should still
be a pre-install-run check as well.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_util.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_util.h:
Added a stock string dialog
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/generic/matchers.cc, /cvsroot/aptitude/aptitude/src/pkg_info_screen.cc:
Added a matcher for essential packages and a line in the info screen for
them; also fixed a nasty little crash in the matching code (I wasn't checking
the return value of parse_atom). This ought to be backported to the stable
tree if I release anything more from that branch..
* /cvsroot/aptitude/aptitude/README:
It's not the most brilliant piece of documentation, but there is now
a note about Aptitude::Log in the README.
* /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
Fixed colorization of reinstalled packages/versions
* /cvsroot/aptitude/aptitude/src/generic/apt.cc:
Don't list reinstalled packages as broken (reinstalled upgradable packages are
still screwy)
* /cvsroot/aptitude/aptitude/autogen.sh:
Don't use the 2.50 autoconf, it breaks gettext
* /cvsroot/aptitude/aptitude/autogen.sh, /cvsroot/aptitude/aptitude/src/ui.cc:
[unstable] Added code to prevent the user from doing something
inconsistent
* /cvsroot/aptitude/aptitude/src/dep_item.cc:
Oops, I forgot that GlobOr needs to modify the DepIterator (d'oh) -- fix things
so we don't go into an infinite loop when generating a dependency
tree.
2001-06-08 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump version to 0.0.8.7.1
* /cvsroot/aptitude/aptitude/po/es_ES.po, /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/fr.po, /cvsroot/aptitude/aptitude/po/gl.po, /cvsroot/aptitude/aptitude/po/ja.po, /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/po/pt_BR.po, /cvsroot/aptitude/aptitude/src/pkg_action_tree.cc, /cvsroot/aptitude/aptitude/po/de.po:
Oops, pkg_action_tree should be calling up to pkg_tree,
not apt_tree. Fixed, thanks again to Michal Politowski.
* /cvsroot/aptitude/aptitude/src/generic/apt.cc:
Try to do something slightly more sensible in the preview screen
when auto-upgrade is off: packages are displayed as held instead
of broken-and-held.
2001-06-07 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/apt_info_tree.h, /cvsroot/aptitude/aptitude/src/dep_item.cc, /cvsroot/aptitude/aptitude/src/dep_item.h, /cvsroot/aptitude/aptitude/src/pkg_columnizer.h, /cvsroot/aptitude/aptitude/src/pkg_description_treeitem.cc, /cvsroot/aptitude/aptitude/src/pkg_description_treeitem.h, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.cc, /cvsroot/aptitude/aptitude/src/pkg_grouppolicy.h, /cvsroot/aptitude/aptitude/src/pkg_info_screen.cc, /cvsroot/aptitude/aptitude/src/pkg_info_screen.h, /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_item.h, /cvsroot/aptitude/aptitude/src/pkg_item_with_subtree.h, /cvsroot/aptitude/aptitude/src/pkg_tree.h, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.h, /cvsroot/aptitude/aptitude/src/pkg_view.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Package and version iterators are now consistently passed by reference
rather than by value.
2001-06-05 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/mine/Makefile.am:
Oops, make sure mine.txt is distributed..
* /cvsroot/aptitude/aptitude/NEWS: Doh, the NEWS file was messed up
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump version to 0.1.7
* /cvsroot/aptitude/aptitude/po/POTFILES.in:
Remove references to the now-removed apt_tree file
* /cvsroot/aptitude/aptitude/src/apt_options.cc:
Add an end-marker to the table for package selection options,
so we don't crash. (oops)
* /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/apt_tree.cc, /cvsroot/aptitude/aptitude/src/apt_tree.h, /cvsroot/aptitude/aptitude/src/pkg_action_tree.cc, /cvsroot/aptitude/aptitude/src/pkg_action_tree.h, /cvsroot/aptitude/aptitude/src/pkg_info_screen.cc:
Merged with stable branch through 0.0.8.7
* /cvsroot/aptitude/aptitude/help.txt:
Added information about scrolling the extended description (with a/z)
and a preamble about navigating the help screen to help.txt
2001-06-04 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bumped the version number to 0.0.8.7
* /cvsroot/aptitude/aptitude/src/pkg_action_tree.cc:
Fixed up the check-for-broken-packages code. I *think* it works now.
* /cvsroot/aptitude/aptitude/src/apt_tree.cc, /cvsroot/aptitude/aptitude/src/apt_tree.h, /cvsroot/aptitude/aptitude/src/pkg_action_tree.cc, /cvsroot/aptitude/aptitude/src/pkg_action_tree.h:
Added some hacks to try to warn the user if some packages were
automatically modified before doing an install run
2001-05-25 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/autogen.sh:
Run aclocal before doing anything else, so autoheader doesn't bomb (ew)
2001-05-18 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/ui.cc:
Added a little popup message that appears while the cache is being reloaded
and the package tree is being build.
The reason is simple: there is a delay after all operations with a progress
bar end, due probably to the time spent building the tree (yes, I need to
optimize this, but this hack will keep people from thinking things aren't
working for now. I hope)
* /cvsroot/aptitude/aptitude/src/generic/apt.cc, /cvsroot/aptitude/aptitude/src/generic/apt.h:
Added another signal, cache_reload_failed, so that users of apt.cc can
hook into all exits from apt_reload_cache().
2001-05-16 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/po/POTFILES.in: Updated POTFILES.in
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc:
Edit-lines are now white-on-black by default. (makes the dialogs look more
logical IMO)
2001-05-15 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/mine/cmine.cc:
The mine-board no longer explicitly destroys itself (this lets the
kill-a-widget logic work right.)
FIXME: shouldn't we handle destroyed widgets properly anyway?
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Fix things so that modifying the package display format actually works:
fixed the name of the config options, and connected signals for
when they got modified
* /cvsroot/aptitude/aptitude/src/apt_config_widgets.cc:
Oops. When making an apt_string_widget, the default value should be used
as the default value, not as the prompt.
* /cvsroot/aptitude/aptitude/src/apt_options.cc, /cvsroot/aptitude/aptitude/src/apt_options.h, /cvsroot/aptitude/aptitude/src/pkg_columnizer.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Added a bunch more options and stuff to the options dialogs. (this will
probably make several deficiencies much more obvious; need to work on them..)
* /cvsroot/aptitude/aptitude/README, /cvsroot/aptitude/aptitude/src/apt_options.cc:
Don't document Fix-Broken, it doesn't have any effect in the beta version
* /cvsroot/aptitude/aptitude/README:
Correct the documented default value of Auto-Fix-Broken
* /cvsroot/aptitude/aptitude/src/apt_options.cc:
Restructured options around static tables. I hope this makes it easier to
add new options to the dialog and make completely new options dialogs.
(crosses fingers)
* /cvsroot/aptitude/aptitude/src/pkg_tree.cc:
Don't crash when the user tries to repeat a search before doing an initial
search
* /cvsroot/aptitude/aptitude/src/pkg_info_screen.cc:
Fix a bug that's been around for ages, where the description of the most
recent package version was used, even if you were viewing an older
version.
2001-05-14 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/pkg_item.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc, /cvsroot/aptitude/aptitude/src/ui.cc, /cvsroot/aptitude/aptitude/src/ui.h:
Actually make use of the aforementioned ability. This means, in practical
terms, that if you start playing minesweeper, switch back to the package view,
pop up a package-info screen, and press "q", you'll go back where you came from
instead of seeing Minesweeper again.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_multiplex.cc, /cvsroot/aptitude/aptitude/src/vscreen/vs_multiplex.h:
Added the ability for multiplexes to add widgets after particular other
widgets.
* /cvsroot/aptitude/aptitude/src/mine/cmine.cc:
Fixed a bunch of little bugs:
- The "new custom game" dialog now goes away when you tell it to
- "height" -> "width" in entry-error message
- Enter (well, Confirm) now works as a binding for Ok in new-game dialogs
- Default to easy in the new-game dialog
* /cvsroot/aptitude/aptitude/src/mine/cmine.cc:
Oops, actually display the new-game and custom-difficulty
dialogs (this is waaayy too hard, need to make it easier someday)
* /cvsroot/aptitude/aptitude/src/mine/cmine.cc, /cvsroot/aptitude/aptitude/src/mine/cmine.h:
Fix some small bugs: use the lower-left corner in the lower-left, and
actually ask for focus. (both Minesweeper-related) Also purged
the cruft with non-Minesweeper bindings being defined in the
Minesweeper code.
* /cvsroot/aptitude/aptitude/src/vscreen/vscreen.cc:
The timeout-checking routine now calls vscreen_tryupdate
* /cvsroot/aptitude/aptitude/src/Makefile.am, /cvsroot/aptitude/aptitude/src/mine/cmine.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Minesweeper compiles and links now, and has its own menu option.
Be afraid. Be very afraid.
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/src/defaults.cc, /cvsroot/aptitude/aptitude/src/Makefile.am, /cvsroot/aptitude/aptitude/src/mine/board.cc, /cvsroot/aptitude/aptitude/src/mine/board.h, /cvsroot/aptitude/aptitude/src/mine/cmine.cc, /cvsroot/aptitude/aptitude/src/mine/cmine.h, /cvsroot/aptitude/aptitude/src/mine/Makefile.am, /cvsroot/aptitude/aptitude/src/mine/mine-help.txt, /cvsroot/aptitude/aptitude/src/ui.cc:
Merged the Minesweeper code. Doesn't quite compile+link and isn't very
pretty, but it should work soon.
* /cvsroot/aptitude/aptitude/src/mine/board.cc, /cvsroot/aptitude/aptitude/src/mine/board.h, /cvsroot/aptitude/aptitude/src/mine/cmine.cc, /cvsroot/aptitude/aptitude/src/mine/cmine.h, /cvsroot/aptitude/aptitude/src/mine/Makefile.am, /cvsroot/aptitude/aptitude/src/mine/mine-help.txt:
New file.
2001-05-06 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/vscreen/vs_table.cc:
Added a FIXME in vs_table for the Incredible Non-Shrinking Widget problem,
just above vs_table::layout_me.
* /cvsroot/aptitude/aptitude/src/vscreen/vs_util.cc:
Work around problems with the table code, so the help dialog
has a visible scrollbar.
2001-05-04 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump version to 0.1.6
* /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/src/apt_tree.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.h, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
Merged with stable through 0.0.8.6.
* /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/po/de.po, /cvsroot/aptitude/aptitude/po/es_ES.po, /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/fr.po, /cvsroot/aptitude/aptitude/po/gl.po, /cvsroot/aptitude/aptitude/po/ja.po, /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/po/pt_BR.po:
Fixed a typo in NEWS
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/po/de.po, /cvsroot/aptitude/aptitude/po/es_ES.po, /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/fr.po, /cvsroot/aptitude/aptitude/po/gl.po, /cvsroot/aptitude/aptitude/po/ja.po, /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/po/pt_BR.po, /cvsroot/aptitude/aptitude/README:
Bump the version to 0.0.8.6
* /cvsroot/aptitude/aptitude/src/apt_tree.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.cc, /cvsroot/aptitude/aptitude/src/generic/aptcache.h:
I forgot to backport the fixes to aptcache.cc (oops); this does that, and
also disentangles a hairy ?: construct in apt_tree.cc.
* /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
Version-items now behave correctly if purged (bug #96228)
2001-05-03 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/download_list.cc:
The off-by-one fix had its own problems, caused by trying to figure out the
best location for the top of the screen when the screen size was "zero" (ie,
before the widget was realized) This doesn't make any sense anyway, so
download_list::sync_top now returns immediately if this is the case.
2001-05-02 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/ui.cc:
Tagged a whole bunch more strings as translatable. Also, the last commit
included a lot of changes which should have been listed "merge with the
stable branch through 0.0.8.5", but weren't. (oops)
* /cvsroot/aptitude/aptitude/ABOUT-NLS, /cvsroot/aptitude/aptitude/intl/bindtextdom.c, /cvsroot/aptitude/aptitude/intl/cat-compat.c, /cvsroot/aptitude/aptitude/intl/ChangeLog, /cvsroot/aptitude/aptitude/intl/config.charset, /cvsroot/aptitude/aptitude/intl/dcgettext.c, /cvsroot/aptitude/aptitude/intl/dcigettext.c, /cvsroot/aptitude/aptitude/intl/dcngettext.c, /cvsroot/aptitude/aptitude/intl/dgettext.c, /cvsroot/aptitude/aptitude/intl/dngettext.c, /cvsroot/aptitude/aptitude/intl/explodename.c, /cvsroot/aptitude/aptitude/intl/finddomain.c, /cvsroot/aptitude/aptitude/intl/gettext.c, /cvsroot/aptitude/aptitude/intl/gettext.h, /cvsroot/aptitude/aptitude/intl/gettextP.h, /cvsroot/aptitude/aptitude/intl/hash-string.h, /cvsroot/aptitude/aptitude/intl/intl-compat.c, /cvsroot/aptitude/aptitude/intl/l10nflist.c, /cvsroot/aptitude/aptitude/intl/libgettext.h, /cvsroot/aptitude/aptitude/intl/libgnuintl.h, /cvsroot/aptitude/aptitude/intl/loadinfo.h, /cvsroot/aptitude/aptitude/intl/loadmsgcat.c, /cvsroot/aptitude/aptitude/intl/localcharset.c, /cvsroot/aptitude/aptitude/intl/localealias.c, /cvsroot/aptitude/aptitude/intl/Makefile.in, /cvsroot/aptitude/aptitude/intl/ngettext.c, /cvsroot/aptitude/aptitude/intl/plural.y, /cvsroot/aptitude/aptitude/intl/po2tbl.sed.in, /cvsroot/aptitude/aptitude/intl/ref-add.sin, /cvsroot/aptitude/aptitude/intl/ref-del.sin, /cvsroot/aptitude/aptitude/intl/textdomain.c, /cvsroot/aptitude/aptitude/intl/VERSION, /cvsroot/aptitude/aptitude/intl/xopen-msg.sed, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/po/ChangeLog, /cvsroot/aptitude/aptitude/po/Makefile.in.in, /cvsroot/aptitude/aptitude/src/generic/apt.cc, /cvsroot/aptitude/aptitude/src/pkg_columnizer.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
Create ~/.aptitude if it doesn't exist when saving options
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Bump version to 0.0.8.5
* /cvsroot/aptitude/aptitude/intl/cat-compat.c:
Oops, one removed file missed me..
* /cvsroot/aptitude/aptitude/src/pkg_columnizer.cc, /cvsroot/aptitude/aptitude/src/pkg_ver_item.cc:
Changed "purge" to "purged" when describing a package's current state; this
is probably more correct, and makes life better for translators.
* /cvsroot/aptitude/aptitude/ABOUT-NLS, /cvsroot/aptitude/aptitude/intl/bindtextdom.c, /cvsroot/aptitude/aptitude/intl/ChangeLog, /cvsroot/aptitude/aptitude/intl/config.charset, /cvsroot/aptitude/aptitude/intl/dcgettext.c, /cvsroot/aptitude/aptitude/intl/dcigettext.c, /cvsroot/aptitude/aptitude/intl/dcngettext.c, /cvsroot/aptitude/aptitude/intl/dgettext.c, /cvsroot/aptitude/aptitude/intl/dngettext.c, /cvsroot/aptitude/aptitude/intl/explodename.c, /cvsroot/aptitude/aptitude/intl/finddomain.c, /cvsroot/aptitude/aptitude/intl/gettext.c, /cvsroot/aptitude/aptitude/intl/gettext.h, /cvsroot/aptitude/aptitude/intl/gettextP.h, /cvsroot/aptitude/aptitude/intl/hash-string.h, /cvsroot/aptitude/aptitude/intl/intl-compat.c, /cvsroot/aptitude/aptitude/intl/l10nflist.c, /cvsroot/aptitude/aptitude/intl/libgettext.h, /cvsroot/aptitude/aptitude/intl/libgnuintl.h, /cvsroot/aptitude/aptitude/intl/loadinfo.h, /cvsroot/aptitude/aptitude/intl/loadmsgcat.c, /cvsroot/aptitude/aptitude/intl/localcharset.c, /cvsroot/aptitude/aptitude/intl/localealias.c, /cvsroot/aptitude/aptitude/intl/Makefile.in, /cvsroot/aptitude/aptitude/intl/ngettext.c, /cvsroot/aptitude/aptitude/intl/plural.y, /cvsroot/aptitude/aptitude/intl/po2tbl.sed.in, /cvsroot/aptitude/aptitude/intl/ref-add.sin, /cvsroot/aptitude/aptitude/intl/ref-del.sin, /cvsroot/aptitude/aptitude/intl/textdomain.c, /cvsroot/aptitude/aptitude/intl/VERSION, /cvsroot/aptitude/aptitude/intl/xopen-msg.sed, /cvsroot/aptitude/aptitude/po/ChangeLog, /cvsroot/aptitude/aptitude/po/Makefile.in.in:
Re-ran gettext and merged the results into CVS. This should clear up
bug #95749, or your money back. (I was using an old Makefile.in.in with a new
gettext, not cool..I'm just lucky nothing broke in a worse way. Or maybe not,
then I would have noticed..)
* /cvsroot/aptitude/aptitude/src/ui.cc:
This one's for the translators..
The menus are now fully marked for translation, and translations should take
effect unless I screwed up. And it only took a huge gross hack to do it :)
* /cvsroot/aptitude/aptitude/Makefile.am, /cvsroot/aptitude/aptitude/src/ui.cc:
Allow the README to be viewed from the program. (Help/User's Manual)
Also, COPYING is now installed into HELPDIR. (why this wasn't true before
I don't know)
2001-05-01 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/ui.cc: Put the Help keybinding back
* /cvsroot/aptitude/aptitude/src/vscreen/config/keybindings.cc:
Correctly display C-_ as C-_, not C-^?. (more special casing, ewwwww)
* /cvsroot/aptitude/aptitude/src/vscreen/vs_pager.cc:
Remove some spurious cruft in the file-pager
* /cvsroot/aptitude/aptitude/src/download_list.cc:
Fix a off-by-one error that caused the current download to be displayed off
the bottom of the screen. (this will sometimes cause a break at
the bottom of the display, but that's better than not being able
to see that line at all)
* /cvsroot/aptitude/aptitude/src/ui.cc:
Display the menu descriptions with a bold version of the status color
2001-04-30 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/generic/aptcache.cc:
In addition to a first backup of the cache, I now back it up AFTER doing
any pre-marking of upgradable packages and so on. I think this fixes the
"I hit undo and all my packages went into the HOLD state" bug. (silly me,
I upgraded and lost my reproducible test case..)
* /cvsroot/aptitude/aptitude/src/ui.cc:
Re-enable undo, although it unfortunately doesn't have the mark/revert behavior
any more.
* /cvsroot/aptitude/aptitude/src/ui.cc:
File menu is now named Actions -- it's more logical.
2001-04-28 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Moved to version 0.1.5
* /cvsroot/aptitude/aptitude/help.txt, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Sync up with the stable branch through 0.0.8.4
* /cvsroot/aptitude/aptitude/src/defaults.cc, /cvsroot/aptitude/aptitude/src/pkg_view.cc:
You can now, with one easy keystroke, scroll any description items downwards
from a tree. Defaults are "a" for up and "z" for down (yes, this sucks)
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Added (very slightly hacky) code to allow the description-widget to be
focussed and to be scrolled using that focus. Obviously keybindings for this
in the tree are eventually preferable, but having this available allows other
ideas as well..
* /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/po/de.po, /cvsroot/aptitude/aptitude/po/es_ES.po, /cvsroot/aptitude/aptitude/po/fi.po, /cvsroot/aptitude/aptitude/po/fr.po, /cvsroot/aptitude/aptitude/po/gl.po, /cvsroot/aptitude/aptitude/po/ja.po, /cvsroot/aptitude/aptitude/po/pl.po, /cvsroot/aptitude/aptitude/po/pt_BR.po:
Oops, added an item I forgot to the changelog
* /cvsroot/aptitude/aptitude/configure.in, /cvsroot/aptitude/aptitude/help.txt, /cvsroot/aptitude/aptitude/NEWS, /cvsroot/aptitude/aptitude/README:
Prepare to release 0.0.8.4
* /cvsroot/aptitude/aptitude/help.txt, /cvsroot/aptitude/aptitude/README:
Add badly-written explanations of the state/action flags (bug #93216)
* /cvsroot/aptitude/aptitude/src/pkg_tree.cc:
Use the compiled matcher to do searches. (this should have been happening all
along, oops) This means that (a) searches ought to be faster, and (b) we can
handle bad search patterns gracefully. (bug #95455)
* /cvsroot/aptitude/aptitude/src/vscreen/vs_tree.cc:
Don't crash when the user tries to search beginning at the end of the list.
2001-04-20 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Ok, make the word-wrapping stuff not prepend gratuitous spaces to preformatted
lines. I think it's working correctly now. (crosses fingers)
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Don't runtogether words which are around linebreaks in the Description
2001-04-19 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/pkg_view.cc:
Ok, rewrite the wordwrapper so that it, well, works. Or at least sort
of works. (still needs a little work; eg, see what happens to the at
description)
2001-04-16 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/src/pkg_view.cc, /cvsroot/aptitude/aptitude/src/pkg_view.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Add the ability for package views to have different backgrounds,
and make the default description-view thingy have a status-line style
2001-04-15 Daniel Burrows <daniel@torrent>
* /cvsroot/aptitude/aptitude/help.txt, /cvsroot/aptitude/aptitude/README:
Add info on 'D' to the documentation
* /cvsroot/aptitude/aptitude/src/defaults.cc, /cvsroot/aptitude/aptitude/src/ui.cc:
Activate the show/hide feature (using D as a default binding, eww)
* /cvsroot/aptitude/aptitude/src/pkg_view.cc, /cvsroot/aptitude/aptitude/src/pkg_view.h, /cvsroot/aptitude/aptitude/src/ui.cc:
Added a description widget. Yes, the implementation is a bit of a hack.
No, at this point, I don't care; I still want to implement the all-powerful
|