Ubuntu
zapping package

Merge lp:~ari-tczew/ubuntu/maverick/zapping/merge-lp-583483 into lp:ubuntu/maverick/zapping

  1. Maverick (10.10)
  2. merge-lp-583483
  3. Merge into maverick
Proposed by Artur Rona
Status: Merged
Merged at revision: 17
Proposed branch: lp:~ari-tczew/ubuntu/maverick/zapping/merge-lp-583483
Merge into: lp:ubuntu/maverick/zapping
Diff against target: 273 lines (+109/-28)
6 files modified
debian/changelog (+19/-0)
debian/control (+1/-2)
debian/patches/00_automake.patch (+28/-26)
debian/patches/07_python2.6_ftbfs.patch (+32/-0)
debian/patches/08_spelling_typos.patch (+27/-0)
debian/patches/series (+2/-0)
To merge this branch: bzr merge lp:~ari-tczew/ubuntu/maverick/zapping/merge-lp-583483
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+25714@code.launchpad.net
To post a comment you must log in.
lp:~ari-tczew/ubuntu/maverick/zapping/merge-lp-583483 updated
18. By Artur Rona

Update merge target.
s/testing/unstable

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-01-13 12:04:47 +0000
3+++ debian/changelog 2010-05-20 19:04:25 +0000
4@@ -1,3 +1,22 @@
5+zapping (0.10~cvs6-4ubuntu1) maverick; urgency=low
6+
7+ * Merge from debian unstable (LP: #583483). Remaining changes:
8+ + Remove aRts support:
9+ - debian/rules: Drop libartsc0-dev from Build-Depends.
10+
11+ -- Artur Rona <ari-tczew@tlen.pl> Thu, 20 May 2010 20:26:21 +0200
12+
13+zapping (0.10~cvs6-4) unstable; urgency=low
14+
15+ * 07_python2.6_ftbfs.patch: patch from Jakub Wilk to fix ftbfs
16+ with python 2.6 (closes: #571516).
17+ * Modified 00_automake.patch to pass --no-add-needed and -lXext
18+ to linker (closes: #556771).
19+ * 08_spelling_typos.patch: fix typos found by lintian.
20+ * Standards-Version: 3.8.4 (no changes).
21+
22+ -- Robert Luberda <robert@debian.org> Thu, 11 Mar 2010 15:07:04 +0100
23+
24 zapping (0.10~cvs6-3ubuntu1) lucid; urgency=low
25
26 * Merge from debian testing (LP: #506927). Remaining changes:
27
28=== modified file 'debian/control'
29--- debian/control 2010-01-13 12:04:47 +0000
30+++ debian/control 2010-05-20 19:04:25 +0000
31@@ -3,7 +3,7 @@
32 Priority: extra
33 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
34 XSBC-Original-Maintainer: Robert Luberda <robert@debian.org>
35-Standards-Version: 3.8.3
36+Standards-Version: 3.8.4
37 Build-Depends: automake1.9,
38 autotools-dev,
39 debhelper (>= 7),
40@@ -17,7 +17,6 @@
41 libjpeg62-dev,
42 liblircclient-dev,
43 libpng-dev,
44- libssl-dev,
45 libx11-dev,
46 libxext-dev,
47 libxinerama-dev,
48
49=== modified file 'debian/patches/00_automake.patch'
50--- debian/patches/00_automake.patch 2008-02-14 12:56:23 +0000
51+++ debian/patches/00_automake.patch 2010-05-20 19:04:25 +0000
52@@ -3,8 +3,8 @@
53
54 Index: zapping/plugins/alirc/Makefile.am
55 ===================================================================
56---- zapping.orig/plugins/alirc/Makefile.am 2008-02-09 23:01:23.000000000 +0100
57-+++ zapping/plugins/alirc/Makefile.am 2008-02-09 23:01:27.000000000 +0100
58+--- zapping.orig/plugins/alirc/Makefile.am 2010-03-11 14:51:13.000000000 +0100
59++++ zapping/plugins/alirc/Makefile.am 2010-03-11 14:51:24.000000000 +0100
60 @@ -16,4 +16,7 @@
61
62 libalirc_zapping_la_SOURCES = alirc.c
63@@ -16,8 +16,8 @@
64 + $(PACKAGE_LIBS)
65 Index: zapping/plugins/deinterlace/Makefile.am
66 ===================================================================
67---- zapping.orig/plugins/deinterlace/Makefile.am 2008-02-09 23:01:23.000000000 +0100
68-+++ zapping/plugins/deinterlace/Makefile.am 2008-02-09 23:01:27.000000000 +0100
69+--- zapping.orig/plugins/deinterlace/Makefile.am 2010-03-11 14:51:13.000000000 +0100
70++++ zapping/plugins/deinterlace/Makefile.am 2010-03-11 14:51:24.000000000 +0100
71 @@ -14,6 +14,7 @@
72 -I$(top_srcdir) \
73 @COMMON_INCLUDES@
74@@ -39,8 +39,8 @@
75 + $(PACKAGE_LIBS)
76 Index: zapping/plugins/mpeg/Makefile.am
77 ===================================================================
78---- zapping.orig/plugins/mpeg/Makefile.am 2008-02-09 23:01:23.000000000 +0100
79-+++ zapping/plugins/mpeg/Makefile.am 2008-02-09 23:01:27.000000000 +0100
80+--- zapping.orig/plugins/mpeg/Makefile.am 2010-03-11 14:51:13.000000000 +0100
81++++ zapping/plugins/mpeg/Makefile.am 2010-03-11 14:51:24.000000000 +0100
82 @@ -41,4 +41,8 @@
83 options.c \
84 pixmaps.h
85@@ -53,8 +53,8 @@
86 +
87 Index: zapping/plugins/screenshot/Makefile.am
88 ===================================================================
89---- zapping.orig/plugins/screenshot/Makefile.am 2008-02-09 23:01:23.000000000 +0100
90-+++ zapping/plugins/screenshot/Makefile.am 2008-02-09 23:01:27.000000000 +0100
91+--- zapping.orig/plugins/screenshot/Makefile.am 2010-03-11 14:51:13.000000000 +0100
92++++ zapping/plugins/screenshot/Makefile.am 2010-03-11 14:51:24.000000000 +0100
93 @@ -20,5 +20,9 @@
94 deint.c \
95 b_jpeg.c b_ppm.c
96@@ -68,8 +68,8 @@
97 + $(PACKAGE_LIBS)
98 Index: zapping/plugins/subtitle/Makefile.am
99 ===================================================================
100---- zapping.orig/plugins/subtitle/Makefile.am 2008-02-09 23:01:23.000000000 +0100
101-+++ zapping/plugins/subtitle/Makefile.am 2008-02-09 23:01:27.000000000 +0100
102+--- zapping.orig/plugins/subtitle/Makefile.am 2010-03-11 14:51:13.000000000 +0100
103++++ zapping/plugins/subtitle/Makefile.am 2010-03-11 14:51:24.000000000 +0100
104 @@ -17,10 +17,13 @@
105 main.c main.h \
106 preferences.c preferences.h
107@@ -86,8 +86,8 @@
108 # Must prevent link conflict with libzvbi 0.2.
109 Index: zapping/plugins/teletext/Makefile.am
110 ===================================================================
111---- zapping.orig/plugins/teletext/Makefile.am 2008-02-09 23:01:23.000000000 +0100
112-+++ zapping/plugins/teletext/Makefile.am 2008-02-09 23:01:27.000000000 +0100
113+--- zapping.orig/plugins/teletext/Makefile.am 2010-03-11 14:51:13.000000000 +0100
114++++ zapping/plugins/teletext/Makefile.am 2010-03-11 14:51:24.000000000 +0100
115 @@ -24,10 +24,14 @@
116 view.c view.h \
117 window.c window.h
118@@ -105,42 +105,44 @@
119 # Must prevent link conflict with libzvbi 0.2.
120 Index: zapping/zapping_setup_fb/Makefile.am
121 ===================================================================
122---- zapping.orig/zapping_setup_fb/Makefile.am 2008-02-09 23:01:23.000000000 +0100
123-+++ zapping/zapping_setup_fb/Makefile.am 2008-02-09 23:01:27.000000000 +0100
124+--- zapping.orig/zapping_setup_fb/Makefile.am 2010-03-11 14:51:13.000000000 +0100
125++++ zapping/zapping_setup_fb/Makefile.am 2010-03-11 14:51:24.000000000 +0100
126 @@ -18,6 +18,8 @@
127 v4l2.c \
128 v4l25.c
129
130-+zapping_setup_fb_LDFLAGS = -Wl,-z,defs -Wl,--as-needed
131++zapping_setup_fb_LDFLAGS = -Wl,-z,defs -Wl,--no-add-needed -Wl,--as-needed
132 +
133 zapping_setup_fb_LDADD = \
134 $(top_builddir)/libtv/libtv.la \
135 @X_LIBS@ \
136 Index: zapping/src/Makefile.am
137 ===================================================================
138---- zapping.orig/src/Makefile.am 2008-02-09 23:01:23.000000000 +0100
139-+++ zapping/src/Makefile.am 2008-02-09 23:01:27.000000000 +0100
140-@@ -108,6 +108,7 @@
141+--- zapping.orig/src/Makefile.am 2010-03-11 14:51:13.000000000 +0100
142++++ zapping/src/Makefile.am 2010-03-11 14:52:18.000000000 +0100
143+@@ -107,7 +107,9 @@
144+ @PACKAGE_LIBS@ \
145 @PYTHON_LIBS@ \
146 @X_LIBS@ \
147++ -lXext \
148 -lX11 \
149 + -lpthread \
150 @X_DPMS_LIBS@ \
151 @X_XINERAMA_LIBS@ \
152 @X_XF86DGA_LIBS@ \
153-@@ -119,7 +120,7 @@
154+@@ -119,7 +121,7 @@
155 @ESD_LIBS@ \
156 @LIBXML_LIBS@
157
158 -zapping_LDFLAGS = -export-dynamic
159-+zapping_LDFLAGS = -Wl,-z,defs -Wl,--as-needed -export-dynamic
160++zapping_LDFLAGS = -Wl,-z,defs -Wl,--no-add-needed -Wl,--as-needed -export-dynamic
161
162 zapping_remote_SOURCES = \
163 zapping_remote.c
164 Index: zapping/help/omf.make
165 ===================================================================
166---- zapping.orig/help/omf.make 2008-02-09 23:01:23.000000000 +0100
167-+++ zapping/help/omf.make 2008-02-09 23:01:27.000000000 +0100
168+--- zapping.orig/help/omf.make 2010-03-11 14:51:13.000000000 +0100
169++++ zapping/help/omf.make 2010-03-11 14:51:24.000000000 +0100
170 @@ -42,7 +42,6 @@
171 for file in $(omffile); do \
172 $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
173@@ -156,8 +158,8 @@
174 - -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
175 Index: zapping/configure
176 ===================================================================
177---- zapping.orig/configure 2008-02-09 23:01:23.000000000 +0100
178-+++ zapping/configure 2008-02-09 23:03:13.000000000 +0100
179+--- zapping.orig/configure 2010-03-11 14:51:13.000000000 +0100
180++++ zapping/configure 2010-03-11 14:51:24.000000000 +0100
181 @@ -22546,7 +22546,7 @@
182 #define HAVE_LIBPTHREAD 1
183 _ACEOF
184@@ -187,8 +189,8 @@
185 cat >conftest.$ac_ext <<_ACEOF
186 Index: zapping/help/man/Makefile.am
187 ===================================================================
188---- zapping.orig/help/man/Makefile.am 2008-02-09 23:01:23.000000000 +0100
189-+++ zapping/help/man/Makefile.am 2008-02-09 23:01:27.000000000 +0100
190+--- zapping.orig/help/man/Makefile.am 2010-03-11 14:51:13.000000000 +0100
191++++ zapping/help/man/Makefile.am 2010-03-11 14:51:24.000000000 +0100
192 @@ -7,24 +7,13 @@
193
194 man_MANS = $(MANUALS:.xml=.1)
195
196=== added file 'debian/patches/07_python2.6_ftbfs.patch'
197--- debian/patches/07_python2.6_ftbfs.patch 1970-01-01 00:00:00 +0000
198+++ debian/patches/07_python2.6_ftbfs.patch 2010-05-20 19:04:25 +0000
199@@ -0,0 +1,32 @@
200+Fix for bug #571516: zapping: FTBFS with Python 2.6 as default
201+
202+--- zapping-0.10~cvs6.orig/acinclude.m4
203++++ zapping-0.10~cvs6/acinclude.m4
204+@@ -25,10 +25,9 @@
205+ PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
206+ PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
207+ PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
208+- PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
209+ PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
210+ PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
211+- PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"
212++ PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
213+ PYTHON_LIBS="$PY_LIB_LOC -l$PY_LIBS $PY_EXTRA_LIBS"
214+ AC_SUBST(PY_LIBS)
215+ AC_SUBST(PY_LIB_LOC)
216+only in patch2:
217+unchanged:
218+--- zapping-0.10~cvs6.orig/configure
219++++ zapping-0.10~cvs6/configure
220+@@ -27212,10 +27212,9 @@
221+ PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
222+ PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
223+ PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
224+- PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
225+ PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
226+ PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
227+- PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"
228++ PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
229+ PYTHON_LIBS="$PY_LIB_LOC -l$PY_LIBS $PY_EXTRA_LIBS"
230+
231+
232
233=== added file 'debian/patches/08_spelling_typos.patch'
234--- debian/patches/08_spelling_typos.patch 1970-01-01 00:00:00 +0000
235+++ debian/patches/08_spelling_typos.patch 2010-05-20 19:04:25 +0000
236@@ -0,0 +1,27 @@
237+Fix spelling typos found by lintian
238+Index: zapping/plugins/alirc/alirc.c
239+===================================================================
240+--- zapping.orig/plugins/alirc/alirc.c 2010-03-11 14:33:32.000000000 +0100
241++++ zapping/plugins/alirc/alirc.c 2010-03-11 14:33:59.000000000 +0100
242+@@ -259,7 +259,7 @@
243+ printv("Couldn't read config file\n");
244+ return FALSE;
245+ }
246+- printv("alirc: Succesfully initialize\n");
247++ printv("alirc: Successfully initialize\n");
248+
249+ lirc_iotag = gtk_input_add_full (fd,
250+ GDK_INPUT_READ,
251+Index: zapping/src/tveng.c
252+===================================================================
253+--- zapping.orig/src/tveng.c 2010-03-11 14:32:59.000000000 +0100
254++++ zapping/src/tveng.c 2010-03-11 14:33:08.000000000 +0100
255+@@ -4070,7 +4070,7 @@
256+
257+ if (v == -1) {
258+ info -> tveng_errno = -1;
259+- tv_error_msg(info,"Cannot find an appropiate visual");
260++ tv_error_msg(info,"Cannot find an appropriate visual");
261+ XFree(visual_info);
262+ return 0;
263+ }
264
265=== modified file 'debian/patches/series'
266--- debian/patches/series 2009-08-30 12:21:08 +0000
267+++ debian/patches/series 2010-05-20 19:04:25 +0000
268@@ -5,3 +5,5 @@
269 04_schemas.patch
270 05_ftbfs_powerpc_libtv.patch
271 06_reqbufs_may_fail.patch
272+07_python2.6_ftbfs.patch
273+08_spelling_typos.patch

Subscribers

People subscribed via source and target branches

to all changes: