← Back to branch summary

~ubuntu-branches/ubuntu/raring/muse/raring-proposed

« back to all changes in this revision

Viewing changes to debian/patches/10_PIC_fixes.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Kobras
  • Date: 2004-02-07 15:18:22 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20040207151822-es27xxkzbcxkebjm
Tags: 0.6.3-1
http://bugs.debian.org/228788
* New upstream version.
* Added patches:
  + [10_alsa_init_fix] New, from upstream CVS.
    Initialize direction variable when setting Alsa parameters.
  + [10_canvas_translation_fix] New, from upstream CVS.
    Do not translate tooltips twice in canvas popup.
  + [10_checkbox_fix] New, from upstream CVS.
    Use proper set/test methods on metronome checkboxes.
  + [10_html_doc_cleanup] New.
    Fix links and HTML errors in documentation.
  + [20_allow_system_timer] New.
    The new upstream version fails by default if the real-time clock
    could not be accessed (usually the case when not running suid-root).
    This patch reverts the old behaviour of falling back to the more
    inaccurate system timer.
* Updated patches:
  + [11_PIC_fixes_fixup] Rediffed.
* Removed patches:
  + [20_no_atomic_asm] Merged upstream.
* debian/compat: Splice out debhelper compatibility level from rules file.
* debian/control: Build-depend on latest jack release by default.
  Closes: #228788
* debian/control: Bump standards version.
* debian/control: Use auto-generated debconf dependency via misc:Depends.
* debian/control: Minor tweaks to the long description.
* debian/control: Tighten fluidsynth build dependency to sane version.
* debian/muse.doc-base: New. Register HTML documentation with doc-base.
* debian/templates: Tiny rewording, and typo fix.
* debian/templates, debian/po/*: Switch to po-debconf for translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/10_PIC_fixes.dpatch
 
1
#!/bin/sh -e
 
2
## 10_PIC_fixes by Daniel Kobras <kobras@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Remove strange and unused plugin in widgets that causes PIC-
 
6
## DP: related build failures.
 
7
## DP: 2003-11-10 Update for 0.6.2.
 
8
## DP: DO NOT FORGET to run automake to fixup!
 
9
 
 
10
if [ $# -ne 1 ]; then
 
11
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
12
    exit 1
 
13
fi
 
14
 
 
15
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
16
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
 
17
 
 
18
case "$1" in
 
19
       -patch) patch $patch_opts -p1 < $0;;
 
20
       -unpatch) patch $patch_opts -p1 -R < $0;;
 
21
        *)
 
22
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
 
23
                exit 1;;
 
24
esac
 
25
 
 
26
exit 0
 
27
 
 
28
@DPATCH@
 
29
diff -urNad muse-0.6.2/widgets/Makefile.am muse-0.6.2/widgets/Makefile.am
 
30
--- muse-0.6.2/widgets/Makefile.am      2003-10-29 11:06:28.000000000 +0100
 
31
+++ muse-0.6.2/widgets/Makefile.am      2003-11-10 00:14:35.000000000 +0100
 
32
@@ -128,90 +128,5 @@
 
33
        moc_filedialog.cpp \
 
34
        moc_sigedit.cpp
 
35
 
 
36
-noinst_PROGRAMS = musewidgetsplugin.so
 
37
-
 
38
-dist_musewidgetsplugin_so_SOURCES = \
 
39
-       musewidgetsplug.cpp \
 
40
-       sigedit.h \
 
41
-       $(top_srcdir)/xml.cpp $(top_srcdir)/tempo.cpp \
 
42
-       $(top_srcdir)/sig.cpp $(top_srcdir)/pos.cpp
 
43
-
 
44
-nodist_musewidgetsplugin_so_SOURCES = \
 
45
-       moc_posedit.non-libtool.cpp moc_poslabel.non-libtool.cpp \
 
46
-       moc_sigedit.non-libtool.cpp \
 
47
-       moc_pitchedit.non-libtool.cpp moc_pitchlabel.non-libtool.cpp \
 
48
-       moc_tempolabel.non-libtool.cpp \
 
49
-       \
 
50
-       posedit.non-libtool.cpp poslabel.non-libtool.cpp \
 
51
-       pitchedit.non-libtool.cpp pitchlabel.non-libtool.cpp \
 
52
-       sigedit.non-libtool.cpp \
 
53
-       tempolabel.non-libtool.cpp \
 
54
-      slider.non-libtool.cpp moc_slider.non-libtool.cpp \
 
55
-      sliderbase.non-libtool.cpp moc_sliderbase.non-libtool.cpp \
 
56
-      sclif.non-libtool.cpp \
 
57
-      scldiv.non-libtool.cpp mmath.non-libtool.cpp scldraw.non-libtool.cpp \
 
58
-      dimap.non-libtool.cpp drange.non-libtool.cpp \
 
59
-      doublelabel.non-libtool.cpp moc_doublelabel.non-libtool.cpp \
 
60
-      dentry.non-libtool.cpp moc_dentry.non-libtool.cpp
 
61
-
 
62
-musewidgetsplugin_so_LDFLAGS = --whole-archive -fno-exceptions -shared \
 
63
-       -Wl,-soname,libmusewidgetsplugin.so.1 $(QT_LIBS)
 
64
-
 
65
-musewidgetsplug.o: musewidgetsplug.cpp
 
66
-       $(CXXCOMPILE) -fPIC -DQT_THREAD_SUPPORT -DQT_PLUGIN -c musewidgetsplug.cpp
 
67
-
 
68
 EXTRA_DIST = ctrlcombo.cw
 
69
 
 
70
-# This is for stuff that needs the widgets, but dosn't build them with
 
71
-# libtool
 
72
-
 
73
-BUILT_SOURCES += \
 
74
-       posedit.non-libtool.cpp \
 
75
-       poslabel.non-libtool.cpp \
 
76
-       pitchedit.non-libtool.cpp \
 
77
-       pitchlabel.non-libtool.cpp \
 
78
-       sigedit.non-libtool.cpp \
 
79
-       tempolabel.non-libtool.cpp \
 
80
-      slider.non-libtool.cpp \
 
81
-      sliderbase.non-libtool.cpp \
 
82
-      sclif.non-libtool.cpp \
 
83
-       moc_posedit.non-libtool.cpp \
 
84
-       moc_poslabel.non-libtool.cpp \
 
85
-       moc_sigedit.non-libtool.cpp \
 
86
-       moc_pitchedit.non-libtool.cpp \
 
87
-       moc_pitchlabel.non-libtool.cpp \
 
88
-       moc_tempolabel.non-libtool.cpp \
 
89
-      moc_slider.non-libtool.cpp \
 
90
-      moc_sliderbase.non-libtool.cpp \
 
91
-      scldiv.non-libtool.cpp mmath.non-libtool.cpp scldraw.non-libtool.cpp \
 
92
-      dimap.non-libtool.cpp drange.non-libtool.cpp \
 
93
-      doublelabel.non-libtool.cpp moc_doublelabel.non-libtool.cpp \
 
94
-      dentry.non-libtool.cpp moc_dentry.non-libtool.cpp
 
95
-
 
96
-%.non-libtool.cpp: %.cpp
 
97
-       $(LN_S) $*.cpp $*.non-libtool.cpp
 
98
-
 
99
-CLEANFILES = \
 
100
-       posedit.non-libtool.cpp \
 
101
-       poslabel.non-libtool.cpp \
 
102
-       pitchedit.non-libtool.cpp \
 
103
-       pitchlabel.non-libtool.cpp \
 
104
-       sigedit.non-libtool.cpp \
 
105
-       tempolabel.non-libtool.cpp \
 
106
-      slider.non-libtool.cpp \
 
107
-      sliderbase.non-libtool.cpp \
 
108
-      sclif.non-libtool.cpp \
 
109
-       moc_posedit.non-libtool.cpp \
 
110
-       moc_poslabel.non-libtool.cpp \
 
111
-       moc_sigedit.non-libtool.cpp \
 
112
-       moc_pitchedit.non-libtool.cpp \
 
113
-       moc_pitchlabel.non-libtool.cpp \
 
114
-       moc_tempolabel.non-libtool.cpp \
 
115
-      moc_slider.non-libtool.cpp \
 
116
-      moc_sliderbase.non-libtool.cpp \
 
117
-      scldiv.non-libtool.cpp mmath.non-libtool.cpp scldraw.non-libtool.cpp \
 
118
-      dimap.non-libtool.cpp drange.non-libtool.cpp \
 
119
-      doublelabel.non-libtool.cpp moc_doublelabel.non-libtool.cpp \
 
120
-      dentry.non-libtool.cpp moc_dentry.non-libtool.cpp
 
121
-
 
122
-