[Python-apps-commits] r6175 - in packages/frescobaldi/trunk/debian (5 files)
ryanakca-guest at users.alioth.debian.org
ryanakca-guest at users.alioth.debian.org
Fri Oct 8 15:39:07 UTC 2010
Date: Friday, October 8, 2010 @ 15:38:56
Author: ryanakca-guest
Revision: 6175
Packaging for frescobaldi 1.1.7-1
Added:
packages/frescobaldi/trunk/debian/patches/04_no_binary_lilypond_upgrades.diff
Modified:
packages/frescobaldi/trunk/debian/changelog
packages/frescobaldi/trunk/debian/control
packages/frescobaldi/trunk/debian/patches/series
Deleted:
packages/frescobaldi/trunk/debian/patches/03_gnome_icon.diff
Modified: packages/frescobaldi/trunk/debian/changelog
===================================================================
--- packages/frescobaldi/trunk/debian/changelog 2010-10-08 15:05:03 UTC (rev 6174)
+++ packages/frescobaldi/trunk/debian/changelog 2010-10-08 15:38:56 UTC (rev 6175)
@@ -1,3 +1,15 @@
+frescobaldi (1.1.7-1) unstable; urgency=low
+
+ * New upstream release
+ * Drop 03_gnome_icon.diff, applied upstream.
+ * Comment out the feature to download 3rd party binaries of lilypond.
+ Packages of the stable Lilypond version are generally up to date in Debian
+ and we don't want users sending Debian bug reports about broken Lilypond
+ installs when their Lilypond installation isn't from Debian.
+ * Turn on DM-Upload-Allowed: yes.
+
+ -- Ryan Kavanagh <ryanakca at kubuntu.org> Fri, 08 Oct 2010 11:38:53 -0400
+
frescobaldi (1.1.5-1) unstable; urgency=low
* New upstream release
Modified: packages/frescobaldi/trunk/debian/control
===================================================================
--- packages/frescobaldi/trunk/debian/control 2010-10-08 15:05:03 UTC (rev 6174)
+++ packages/frescobaldi/trunk/debian/control 2010-10-08 15:38:56 UTC (rev 6175)
@@ -13,6 +13,7 @@
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/frescobaldi/trunk/
X-Python-Version: >= 2.6
Homepage: http://www.frescobaldi.org/
+DM-Upload-Allowed: yes
Package: frescobaldi
Architecture: all
Deleted: packages/frescobaldi/trunk/debian/patches/03_gnome_icon.diff
===================================================================
--- packages/frescobaldi/trunk/debian/patches/03_gnome_icon.diff 2010-10-08 15:05:03 UTC (rev 6174)
+++ packages/frescobaldi/trunk/debian/patches/03_gnome_icon.diff 2010-10-08 15:38:56 UTC (rev 6175)
@@ -1,246 +0,0 @@
-# 03_gnome_icon.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-# Description: For some reason, GNOME doesn't like .svgz icons. At a cost of
-# 16K, we'll add a decompressed version just for it instead of tracking all
-# references of frescobaldi.svgz in the source. (Closes: #593297)
-Index: frescobaldi-1.1.5/data/frescobaldi-lily.svg
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ frescobaldi-1.1.5/data/frescobaldi-lily.svg 2010-08-17 10:13:17.480238640 -0400
-@@ -0,0 +1,222 @@
-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-+<svg
-+ xmlns:svg="http://www.w3.org/2000/svg"
-+ xmlns="http://www.w3.org/2000/svg"
-+ xmlns:xlink="http://www.w3.org/1999/xlink"
-+ version="1.0"
-+ width="582.85712"
-+ height="582.85712"
-+ id="svg2">
-+ <defs
-+ id="defs4">
-+ <linearGradient
-+ id="linearGradient3325">
-+ <stop
-+ id="stop3327"
-+ style="stop-color:#008357;stop-opacity:0"
-+ offset="0" />
-+ <stop
-+ id="stop3333"
-+ style="stop-color:#ffffff;stop-opacity:1"
-+ offset="0.6785714" />
-+ <stop
-+ id="stop3329"
-+ style="stop-color:#008357;stop-opacity:1"
-+ offset="1" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3305">
-+ <stop
-+ id="stop3307"
-+ style="stop-color:#fbeb00;stop-opacity:0"
-+ offset="0" />
-+ <stop
-+ id="stop3313"
-+ style="stop-color:#fbeb00;stop-opacity:0"
-+ offset="0.2857143" />
-+ <stop
-+ id="stop3309"
-+ style="stop-color:#fbe000;stop-opacity:1"
-+ offset="1" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3239">
-+ <stop
-+ id="stop3241"
-+ style="stop-color:#ffffff;stop-opacity:1"
-+ offset="0" />
-+ <stop
-+ id="stop3243"
-+ style="stop-color:#ff9191;stop-opacity:1"
-+ offset="1" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3233">
-+ <stop
-+ id="stop3235"
-+ style="stop-color:#ffffff;stop-opacity:1"
-+ offset="0" />
-+ <stop
-+ id="stop3237"
-+ style="stop-color:#ffcbcb;stop-opacity:1"
-+ offset="1" />
-+ </linearGradient>
-+ <linearGradient
-+ id="linearGradient3207">
-+ <stop
-+ id="stop3209"
-+ style="stop-color:#ffffff;stop-opacity:1"
-+ offset="0" />
-+ <stop
-+ id="stop3211"
-+ style="stop-color:#ffb6b6;stop-opacity:1"
-+ offset="1" />
-+ </linearGradient>
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="192.47151"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3215"
-+ xlink:href="#linearGradient3233"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.3826834,-0.9238795,0.9238795,0.3826834,-204.51301,598.64903)" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="192.47151"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3219"
-+ xlink:href="#linearGradient3239"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="192.47151"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3223"
-+ xlink:href="#linearGradient3239"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.7071068,-0.7071068,0.7071068,0.7071068,-218.611,376.95074)" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="192.47151"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3227"
-+ xlink:href="#linearGradient3207"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.9238795,-0.3826834,0.3826834,0.9238795,-146.79558,166.73315)" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="192.47151"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3231"
-+ xlink:href="#linearGradient3207"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(0.3826834,-0.9238795,0.9238795,0.3826834,-204.51301,598.64903)" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="254.36617"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3253"
-+ xlink:href="#linearGradient3239"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="translate(0,-4.4459744e-6)" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="251.32288"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3261"
-+ xlink:href="#linearGradient3239"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="translate(0,-4.4998114e-6)" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="192.47151"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3269"
-+ xlink:href="#linearGradient3233"
-+ gradientUnits="userSpaceOnUse" />
-+ <radialGradient
-+ cx="345.71429"
-+ cy="452.36218"
-+ r="271.98871"
-+ fx="345.71429"
-+ fy="452.36218"
-+ id="radialGradient3277"
-+ xlink:href="#linearGradient3233"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="translate(0,2.4947478e-6)" />
-+ <radialGradient
-+ cx="322.15863"
-+ cy="760.29919"
-+ r="329.40756"
-+ fx="322.15863"
-+ fy="760.29919"
-+ id="radialGradient3311"
-+ xlink:href="#linearGradient3305"
-+ gradientUnits="userSpaceOnUse"
-+ gradientTransform="matrix(1,0,0,1.0042199,0,-3.208376)" />
-+ <radialGradient
-+ cx="368.57144"
-+ cy="458.07648"
-+ r="291.42856"
-+ fx="368.57144"
-+ fy="458.07648"
-+ id="radialGradient3331"
-+ xlink:href="#linearGradient3325"
-+ gradientUnits="userSpaceOnUse" />
-+ </defs>
-+ <g
-+ transform="translate(-51.428597,-160.93363)"
-+ id="layer1">
-+ <path
-+ d="M 660,458.07648 A 291.42856,291.42856 0 1 1 77.142883,458.07648 A 291.42856,291.42856 0 1 1 660,458.07648 z"
-+ transform="translate(-25.714286,-5.7142857)"
-+ id="path3315"
-+ style="fill:url(#radialGradient3331);fill-opacity:1;stroke:none;stroke-width:7.08661413;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-+ <path
-+ d="M 537.6858,260.39068 C 519.27724,329.09234 494.83344,402.06909 444.54034,452.36219 C 494.83344,502.65529 519.27724,575.63204 537.6858,644.3337 C 468.98414,625.92514 396.00739,601.48134 345.71429,551.18824 C 295.42119,601.48134 222.44444,625.92514 153.74278,644.3337 C 172.15134,575.63204 196.59514,502.65529 246.88824,452.36219 C 196.59514,402.06909 172.15134,329.09234 153.74278,260.39068 C 222.44444,278.79924 295.42119,303.24304 345.71429,353.53614 C 396.00739,303.24304 468.98414,278.79924 537.6858,260.39068 z"
-+ id="path3217"
-+ style="fill:url(#radialGradient3219);fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3269);stroke-width:7.08661413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-+ <path
-+ d="M 345.71429,180.87348 C 381.27688,242.4697 415.59486,311.35644 415.59486,382.48162 C 486.72004,382.48162 555.60678,416.7996 617.203,452.36219 C 555.60678,487.92478 486.72004,522.24276 415.59486,522.24276 C 415.59486,593.36794 381.27688,662.25468 345.71429,723.8509 C 310.1517,662.25468 275.83372,593.36794 275.83372,522.24276 C 204.70854,522.24276 135.8218,487.92478 74.225577,452.36219 C 135.8218,416.7996 204.70854,382.48162 275.83372,382.48162 C 275.83372,311.35644 310.1517,242.4697 345.71429,180.87348 z"
-+ id="path3221"
-+ style="fill:url(#radialGradient3223);fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3277);stroke-width:7.08661413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-+ <path
-+ d="M 449.60852,201.53932 C 458.89222,272.05603 464.23608,348.832 437.01765,414.5431 C 502.72876,441.76153 553.23888,499.82902 596.53716,556.25642 C 526.02045,565.54012 449.24448,570.88398 383.53338,543.66555 C 356.31495,609.37666 298.24746,659.88678 241.82006,703.18506 C 232.53636,632.66835 227.1925,555.89238 254.41093,490.18128 C 188.69982,462.96285 138.1897,404.89536 94.891425,348.46796 C 165.40813,339.18426 242.1841,333.8404 307.8952,361.05883 C 335.11363,295.34772 393.18112,244.8376 449.60852,201.53932 z"
-+ id="path3225"
-+ style="fill:url(#radialGradient3227);fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3261);stroke-width:7.08661413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-+ <path
-+ d="M 241.82006,201.53932 C 298.24746,244.8376 356.31495,295.34772 383.53338,361.05883 C 449.24448,333.8404 526.02045,339.18426 596.53716,348.46796 C 553.23888,404.89536 502.72876,462.96285 437.01765,490.18128 C 464.23608,555.89238 458.89222,632.66835 449.60852,703.18506 C 393.18112,659.88678 335.11363,609.37666 307.8952,543.66555 C 242.1841,570.88398 165.40813,565.54012 94.891425,556.25642 C 138.1897,499.82902 188.69982,441.76153 254.41093,414.5431 C 227.1925,348.832 232.53636,272.05603 241.82006,201.53932 z"
-+ id="path3229"
-+ style="fill:url(#radialGradient3231);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-+ <path
-+ d="M 241.82006,201.53932 C 298.24746,244.8376 356.31495,295.34772 383.53338,361.05883 C 449.24448,333.8404 526.02045,339.18426 596.53716,348.46796 C 553.23888,404.89536 502.72876,462.96285 437.01765,490.18128 C 464.23608,555.89238 458.89222,632.66835 449.60852,703.18506 C 393.18112,659.88678 335.11363,609.37666 307.8952,543.66555 C 242.1841,570.88398 165.40813,565.54012 94.891425,556.25642 C 138.1897,499.82902 188.69982,441.76153 254.41093,414.5431 C 227.1925,348.832 232.53636,272.05603 241.82006,201.53932 z"
-+ id="path2404"
-+ style="fill:url(#radialGradient3215);fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient3253);stroke-width:7.08661413;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-+ <path
-+ d="M 374.4375,429.5625 C 347.94326,428.61994 322.23359,438.64829 303.375,457.28125 L 282.96875,477.46875 L 258.3125,462.78125 C 229.94218,445.88761 194.8919,444.71764 165.45817,459.68179 C 136.02444,474.64594 116.31711,503.65477 113.25,536.53125 L 110.59375,565.0625 L 82.28125,569.65625 C 49.680396,574.94045 22.06615,596.57215 9.1299509,626.95954 C -3.8062485,657.34692 -0.25730565,692.24509 18.53125,719.40625 L 34.875,743 L 16.125,764.71875 C -5.4492848,789.72424 -12.69484,824.04568 -3.0688102,855.63782 C 6.5572194,887.22997 31.710164,911.67969 63.5625,920.40625 L 91.21875,927.96875 L 90.8125,956.65625 C 90.356533,989.67907 106.86519,1020.6292 134.54473,1038.6447 C 162.22428,1056.6602 197.20816,1059.2244 227.21875,1045.4375 L 253.28125,1033.4688 L 271.40625,1055.6875 C 292.28147,1081.2793 324.82114,1094.3797 357.6054,1090.3911 C 390.38966,1086.4024 418.83888,1065.8819 432.96875,1036.0312 L 445.25,1010.0938 L 473.40625,1015.4688 C 505.8536,1021.6574 539.20762,1010.7728 561.75877,986.6362 C 584.30992,962.49961 592.90677,928.48402 584.53125,896.53125 L 577.25,868.78125 L 602.28125,854.8125 C 631.11243,838.69768 649.66569,808.92375 651.42862,775.94168 C 653.19155,742.95962 637.91785,711.3776 610.96875,692.28125 L 587.5625,675.6875 L 597.75,648.875 C 609.4645,618.00217 604.53326,583.27915 584.68641,556.88855 C 564.83956,530.49795 532.84857,516.12502 499.9375,518.8125 L 471.34375,521.15625 L 461.90625,494.0625 C 448.8407,456.58215 414.105,430.96783 374.4375,429.5625 z"
-+ transform="matrix(0.382445,0,0,0.382445,221.23768,159.52655)"
-+ id="path3303"
-+ style="fill:url(#radialGradient3311);fill-opacity:1;stroke:#ffff00;stroke-width:18.52976036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-+ <path
-+ d="M 415.15494,371.94872 C 404.17852,375.04463 393.20207,380.95503 385.32156,390.52422 C 375.18948,390.24277 365.62026,384.61383 355.48818,382.92515 C 340.29005,376.17043 321.99597,372.23017 304.26482,373.91885 C 284.00066,377.29621 261.20343,392.21292 256.41884,413.88432 C 253.04148,427.95665 258.10753,441.74758 267.67672,451.87966 C 280.90471,463.98187 299.76169,470.17371 316.92994,463.13754 C 318.90007,462.01175 321.15164,459.47873 320.58875,456.94571 C 318.33718,453.2869 315.5227,457.22715 312.98968,457.22715 C 294.69565,461.44886 275.55722,455.53846 264.86225,439.21455 C 258.67042,429.64536 260.64055,415.57299 266.55093,406.5667 C 293.00692,370.26007 343.38599,389.11699 378.00394,396.15316 C 378.84828,396.4346 379.69262,397.27895 380.25551,397.56039 C 368.99764,419.51324 370.68631,448.22088 370.68631,473.26963 C 370.12342,473.55108 369.56053,474.11397 368.99763,474.67687 C 357.73976,475.23976 346.48186,475.80266 335.78689,476.647 C 334.6611,477.20989 333.53531,477.20989 333.25386,478.33568 C 332.40952,478.33568 332.40952,479.18002 333.25386,479.74291 C 343.66739,482.27593 356.05108,481.4316 367.5904,481.71304 C 368.71618,482.27594 368.99763,482.27594 369.56053,483.40172 C 371.8121,489.875 368.99763,496.62974 369.56053,502.54012 C 365.62027,515.76812 361.1171,530.40338 347.32621,537.43955 C 336.34979,544.19427 318.90006,544.19427 307.92364,537.43955 C 296.94721,530.40338 290.75537,519.14548 291.88116,506.76183 C 291.88116,502.82157 296.66575,500.00709 294.13273,496.62973 C 289.06669,496.91118 287.9409,502.82157 286.81511,507.04327 C 285.97077,521.95995 292.72551,534.90653 305.39061,542.22415 C 321.43308,552.35623 343.38597,546.72729 357.45831,537.1581 C 376.31524,525.90023 383.91432,506.7618 384.19577,485.93475 C 384.19577,484.24607 384.75867,482.55738 386.44735,482.27594 C 395.45364,480.8687 405.02286,482.55738 412.62192,478.33568 C 413.46626,477.49134 413.18481,476.36555 412.34047,475.23976 C 403.33417,474.67687 394.32785,474.11397 385.88445,474.11397 C 385.32156,474.11397 384.19577,473.26963 384.19577,472.42529 C 383.06998,453.00547 380.81841,431.89691 382.78854,412.47708 C 384.19577,407.41104 383.06999,401.50065 387.85458,397.56039 C 399.95679,397.27895 411.77759,396.15315 422.47256,391.36856 C 425.28703,389.11699 428.66439,385.45817 428.66439,381.23647 C 428.38295,378.98489 427.82005,376.17042 425.84992,374.48174 C 423.59835,372.23017 419.65809,370.82293 415.15494,371.94872 M 421.90967,380.95502 C 422.47256,382.92515 420.78388,385.17673 419.37664,386.30251 C 412.34048,391.08711 403.05271,391.08711 394.32786,391.36856 C 393.20207,391.08711 394.04641,389.67988 394.04641,389.11698 C 401.64548,382.36226 409.52601,376.17042 419.65809,378.422 C 420.22098,378.98489 421.34677,378.98489 421.90967,380.95502"
-+ id="text3289"
-+ style="font-size:281.44699097px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Muriel;-inkscape-font-specification:Muriel" />
-+ </g>
-+</svg>
-Index: frescobaldi-1.1.5/data/CMakeLists.txt
-===================================================================
---- frescobaldi-1.1.5.orig/data/CMakeLists.txt 2010-08-17 10:13:22.460238813 -0400
-+++ frescobaldi-1.1.5/data/CMakeLists.txt 2010-08-17 10:14:15.232244322 -0400
-@@ -10,3 +10,10 @@
- DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/apps
- RENAME frescobaldi.svgz
- )
-+
-+# For GNOME users
-+install(
-+ FILES frescobaldi-lily.svg
-+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/scalable/apps
-+ RENAME frescobaldi.svg
-+)
Added: packages/frescobaldi/trunk/debian/patches/04_no_binary_lilypond_upgrades.diff
===================================================================
--- packages/frescobaldi/trunk/debian/patches/04_no_binary_lilypond_upgrades.diff (rev 0)
+++ packages/frescobaldi/trunk/debian/patches/04_no_binary_lilypond_upgrades.diff 2010-10-08 15:38:56 UTC (rev 6175)
@@ -0,0 +1,53 @@
+# 04_no_binary_lilypond_upgrades.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
+# Description: Comment out the download 3rd-party lilypond binary feature. We
+# don't want to end up with bug reports in Debian about users screwing up their
+# system by installing 3rd party packages. The stable lilypond packages in
+# Debian are generally up to date and if they know enough to want to run an
+# unstable version, they know enough to install it themselves.
+Index: frescobaldi-1.1.7/python/frescobaldi_app/settings.py
+===================================================================
+--- frescobaldi-1.1.7.orig/python/frescobaldi_app/settings.py 2010-10-08 10:42:23.474305523 -0400
++++ frescobaldi-1.1.7/python/frescobaldi_app/settings.py 2010-10-08 10:47:45.527302819 -0400
+@@ -828,15 +828,21 @@
+ """
+ def __init__(self, parent):
+ KDialog.__init__(self, parent)
++ # Comment out the download 3rd-party lilypond binary feature. We don't
++ # want to end up with bug reports in Debian about users screwing up
++ # their system by installing 3rd party packages. The stable lilypond
++ # packages in Debian are generally up to date and if they know enough to
++ # want to run an unstable version, they know enough to install it
++ # themselves.
+ self.setButtons(KDialog.ButtonCode(
+- KDialog.Ok | KDialog.Cancel | KDialog.Help | KDialog.User1))
++ KDialog.Ok | KDialog.Cancel | KDialog.Help))# | KDialog.User1))
+ self.setCaption(i18n("LilyPond"))
+ self.setHelp("settings-paths-lilypond")
+- self.setButtonText(KDialog.User1, i18n("Download..."))
+- self.setButtonIcon(KDialog.User1, KIcon("download"))
+- self.setButtonToolTip(KDialog.User1, i18n(
+- "Download new binary LilyPond releases."))
+- self.user1Clicked.connect(self.downloadLilyPond)
++ #self.setButtonText(KDialog.User1, i18n("Download..."))
++ #self.setButtonIcon(KDialog.User1, KIcon("download"))
++ #self.setButtonToolTip(KDialog.User1, i18n(
++ # "Download new binary LilyPond releases."))
++ #self.user1Clicked.connect(self.downloadLilyPond)
+ layout = QGridLayout(self.mainWidget())
+
+ l = QLabel(i18n("LilyPond Command:"))
+@@ -879,8 +885,12 @@
+ info.auto = self.auto.isChecked()
+
+ def downloadLilyPond(self):
+- from frescobaldi_app.download import LilyPondDownloadDialog
+- LilyPondDownloadDialog(self).exec_()
++ # We don't want users installing 3rd party binary packages of Lilypond
++ # through Frescobaldi, we don't want to get bug reports about broken
++ # lilypond installations. Commenting out for Debian.
++ #from frescobaldi_app.download import LilyPondDownloadDialog
++ #LilyPondDownloadDialog(self).exec_()
++ pass
+
+
+ class SessionsStartup(SettingsGroup):
Modified: packages/frescobaldi/trunk/debian/patches/series
===================================================================
--- packages/frescobaldi/trunk/debian/patches/series 2010-10-08 15:05:03 UTC (rev 6174)
+++ packages/frescobaldi/trunk/debian/patches/series 2010-10-08 15:38:56 UTC (rev 6175)
@@ -1,3 +1,3 @@
01_checkmodules_no_python-kde4_build-dep.diff
02_no_pyc.diff
-03_gnome_icon.diff
+04_no_binary_lilypond_upgrades.diff
More information about the Python-apps-commits
mailing list