← Back to branch summary

~ubuntu-branches/ubuntu/vivid/frescobaldi/vivid

« back to all changes in this revision

Viewing changes to debian/patches/04_no_binary_lilypond_upgrades.diff

  • Committer: Package Import Robot
  • Author(s): Ryan Kavanagh
  • Date: 2012-01-03 16:20:11 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120103162011-tsjkwl4sntwmprea
Tags: 2.0.0-1
* New upstream release 
* Drop the following uneeded patches:
  + 01_checkmodules_no_python-kde4_build-dep.diff
  + 02_no_pyc.diff
  + 04_no_binary_lilypond_upgrades.diff
* Needs new dependency python-poppler-qt4
* Update debian/watch for new download path
* Update copyright file with new holders and years

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_no_binary_lilypond_upgrades.diff
1
 
# 04_no_binary_lilypond_upgrades.diff by Ryan Kavanagh <ryanakca@kubuntu.org>
2
 
# Description: Comment out the download 3rd-party lilypond binary feature. We
3
 
# don't want to end up with bug reports in Debian about users screwing up their
4
 
# system by installing 3rd party packages. The stable lilypond packages in
5
 
# Debian are generally up to date and if they know enough to want to run an
6
 
# unstable version, they know enough to install it themselves.
7
 
Index: frescobaldi-1.1.7/python/frescobaldi_app/settings.py
8
 
===================================================================
9
 
--- frescobaldi-1.1.7.orig/python/frescobaldi_app/settings.py   2010-10-08 10:42:23.474305523 -0400
10
 
+++ frescobaldi-1.1.7/python/frescobaldi_app/settings.py        2010-10-08 10:47:45.527302819 -0400
11
 
@@ -828,15 +828,21 @@
12
 
     """
13
 
     def __init__(self, parent):
14
 
         KDialog.__init__(self, parent)
15
 
+        # Comment out the download 3rd-party lilypond binary feature. We don't
16
 
+        # want to end up with bug reports in Debian about users screwing up
17
 
+        # their system by installing 3rd party packages. The stable lilypond
18
 
+        # packages in Debian are generally up to date and if they know enough to
19
 
+        # want to run an unstable version, they know enough to install it
20
 
+        # themselves.
21
 
         self.setButtons(KDialog.ButtonCode(
22
 
-            KDialog.Ok | KDialog.Cancel | KDialog.Help | KDialog.User1))
23
 
+            KDialog.Ok | KDialog.Cancel | KDialog.Help))# | KDialog.User1))
24
 
         self.setCaption(i18n("LilyPond"))
25
 
         self.setHelp("settings-paths-lilypond")
26
 
-        self.setButtonText(KDialog.User1, i18n("Download..."))
27
 
-        self.setButtonIcon(KDialog.User1, KIcon("download"))
28
 
-        self.setButtonToolTip(KDialog.User1, i18n(
29
 
-            "Download new binary LilyPond releases."))
30
 
-        self.user1Clicked.connect(self.downloadLilyPond)
31
 
+        #self.setButtonText(KDialog.User1, i18n("Download..."))
32
 
+        #self.setButtonIcon(KDialog.User1, KIcon("download"))
33
 
+        #self.setButtonToolTip(KDialog.User1, i18n(
34
 
+        #    "Download new binary LilyPond releases."))
35
 
+        #self.user1Clicked.connect(self.downloadLilyPond)
36
 
         layout = QGridLayout(self.mainWidget())
37
 
         
38
 
         l = QLabel(i18n("LilyPond Command:"))
39
 
@@ -879,8 +885,12 @@
40
 
         info.auto = self.auto.isChecked()
41
 
     
42
 
     def downloadLilyPond(self):
43
 
-        from frescobaldi_app.download import LilyPondDownloadDialog
44
 
-        LilyPondDownloadDialog(self).exec_()
45
 
+        # We don't want users installing 3rd party binary packages of Lilypond
46
 
+        # through Frescobaldi, we don't want to get bug reports about broken
47
 
+        # lilypond installations. Commenting out for Debian.
48
 
+        #from frescobaldi_app.download import LilyPondDownloadDialog
49
 
+        #LilyPondDownloadDialog(self).exec_()
50
 
+        pass
51
 
 
52
 
 
53
 
 class SessionsStartup(SettingsGroup):