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
=== modified file 'debian/changelog'
--- debian/changelog 2010-01-13 12:04:47 +0000
+++ debian/changelog 2010-05-20 19:04:25 +0000
@@ -1,3 +1,22 @@
1zapping (0.10~cvs6-4ubuntu1) maverick; urgency=low
2
3 * Merge from debian unstable (LP: #583483). Remaining changes:
4 + Remove aRts support:
5 - debian/rules: Drop libartsc0-dev from Build-Depends.
6
7 -- Artur Rona <ari-tczew@tlen.pl> Thu, 20 May 2010 20:26:21 +0200
8
9zapping (0.10~cvs6-4) unstable; urgency=low
10
11 * 07_python2.6_ftbfs.patch: patch from Jakub Wilk to fix ftbfs
12 with python 2.6 (closes: #571516).
13 * Modified 00_automake.patch to pass --no-add-needed and -lXext
14 to linker (closes: #556771).
15 * 08_spelling_typos.patch: fix typos found by lintian.
16 * Standards-Version: 3.8.4 (no changes).
17
18 -- Robert Luberda <robert@debian.org> Thu, 11 Mar 2010 15:07:04 +0100
19
1zapping (0.10~cvs6-3ubuntu1) lucid; urgency=low20zapping (0.10~cvs6-3ubuntu1) lucid; urgency=low
221
3 * Merge from debian testing (LP: #506927). Remaining changes:22 * Merge from debian testing (LP: #506927). Remaining changes:
423
=== modified file 'debian/control'
--- debian/control 2010-01-13 12:04:47 +0000
+++ debian/control 2010-05-20 19:04:25 +0000
@@ -3,7 +3,7 @@
3Priority: extra3Priority: extra
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Robert Luberda <robert@debian.org>5XSBC-Original-Maintainer: Robert Luberda <robert@debian.org>
6Standards-Version: 3.8.36Standards-Version: 3.8.4
7Build-Depends: automake1.9,7Build-Depends: automake1.9,
8 autotools-dev,8 autotools-dev,
9 debhelper (>= 7),9 debhelper (>= 7),
@@ -17,7 +17,6 @@
17 libjpeg62-dev,17 libjpeg62-dev,
18 liblircclient-dev,18 liblircclient-dev,
19 libpng-dev,19 libpng-dev,
20 libssl-dev,
21 libx11-dev,20 libx11-dev,
22 libxext-dev,21 libxext-dev,
23 libxinerama-dev,22 libxinerama-dev,
2423
=== modified file 'debian/patches/00_automake.patch'
--- debian/patches/00_automake.patch 2008-02-14 12:56:23 +0000
+++ debian/patches/00_automake.patch 2010-05-20 19:04:25 +0000
@@ -3,8 +3,8 @@
33
4Index: zapping/plugins/alirc/Makefile.am4Index: zapping/plugins/alirc/Makefile.am
5===================================================================5===================================================================
6--- zapping.orig/plugins/alirc/Makefile.am 2008-02-09 23:01:23.000000000 +01006--- zapping.orig/plugins/alirc/Makefile.am 2010-03-11 14:51:13.000000000 +0100
7+++ zapping/plugins/alirc/Makefile.am 2008-02-09 23:01:27.000000000 +01007+++ zapping/plugins/alirc/Makefile.am 2010-03-11 14:51:24.000000000 +0100
8@@ -16,4 +16,7 @@8@@ -16,4 +16,7 @@
9 9
10 libalirc_zapping_la_SOURCES = alirc.c10 libalirc_zapping_la_SOURCES = alirc.c
@@ -16,8 +16,8 @@
16+ $(PACKAGE_LIBS)16+ $(PACKAGE_LIBS)
17Index: zapping/plugins/deinterlace/Makefile.am17Index: zapping/plugins/deinterlace/Makefile.am
18===================================================================18===================================================================
19--- zapping.orig/plugins/deinterlace/Makefile.am 2008-02-09 23:01:23.000000000 +010019--- zapping.orig/plugins/deinterlace/Makefile.am 2010-03-11 14:51:13.000000000 +0100
20+++ zapping/plugins/deinterlace/Makefile.am 2008-02-09 23:01:27.000000000 +010020+++ zapping/plugins/deinterlace/Makefile.am 2010-03-11 14:51:24.000000000 +0100
21@@ -14,6 +14,7 @@21@@ -14,6 +14,7 @@
22 -I$(top_srcdir) \22 -I$(top_srcdir) \
23 @COMMON_INCLUDES@23 @COMMON_INCLUDES@
@@ -39,8 +39,8 @@
39+ $(PACKAGE_LIBS)39+ $(PACKAGE_LIBS)
40Index: zapping/plugins/mpeg/Makefile.am40Index: zapping/plugins/mpeg/Makefile.am
41===================================================================41===================================================================
42--- zapping.orig/plugins/mpeg/Makefile.am 2008-02-09 23:01:23.000000000 +010042--- zapping.orig/plugins/mpeg/Makefile.am 2010-03-11 14:51:13.000000000 +0100
43+++ zapping/plugins/mpeg/Makefile.am 2008-02-09 23:01:27.000000000 +010043+++ zapping/plugins/mpeg/Makefile.am 2010-03-11 14:51:24.000000000 +0100
44@@ -41,4 +41,8 @@44@@ -41,4 +41,8 @@
45 options.c \45 options.c \
46 pixmaps.h46 pixmaps.h
@@ -53,8 +53,8 @@
53+53+
54Index: zapping/plugins/screenshot/Makefile.am54Index: zapping/plugins/screenshot/Makefile.am
55===================================================================55===================================================================
56--- zapping.orig/plugins/screenshot/Makefile.am 2008-02-09 23:01:23.000000000 +010056--- zapping.orig/plugins/screenshot/Makefile.am 2010-03-11 14:51:13.000000000 +0100
57+++ zapping/plugins/screenshot/Makefile.am 2008-02-09 23:01:27.000000000 +010057+++ zapping/plugins/screenshot/Makefile.am 2010-03-11 14:51:24.000000000 +0100
58@@ -20,5 +20,9 @@58@@ -20,5 +20,9 @@
59 deint.c \59 deint.c \
60 b_jpeg.c b_ppm.c60 b_jpeg.c b_ppm.c
@@ -68,8 +68,8 @@
68+ $(PACKAGE_LIBS)68+ $(PACKAGE_LIBS)
69Index: zapping/plugins/subtitle/Makefile.am69Index: zapping/plugins/subtitle/Makefile.am
70===================================================================70===================================================================
71--- zapping.orig/plugins/subtitle/Makefile.am 2008-02-09 23:01:23.000000000 +010071--- zapping.orig/plugins/subtitle/Makefile.am 2010-03-11 14:51:13.000000000 +0100
72+++ zapping/plugins/subtitle/Makefile.am 2008-02-09 23:01:27.000000000 +010072+++ zapping/plugins/subtitle/Makefile.am 2010-03-11 14:51:24.000000000 +0100
73@@ -17,10 +17,13 @@73@@ -17,10 +17,13 @@
74 main.c main.h \74 main.c main.h \
75 preferences.c preferences.h75 preferences.c preferences.h
@@ -86,8 +86,8 @@
86 # Must prevent link conflict with libzvbi 0.2.86 # Must prevent link conflict with libzvbi 0.2.
87Index: zapping/plugins/teletext/Makefile.am87Index: zapping/plugins/teletext/Makefile.am
88===================================================================88===================================================================
89--- zapping.orig/plugins/teletext/Makefile.am 2008-02-09 23:01:23.000000000 +010089--- zapping.orig/plugins/teletext/Makefile.am 2010-03-11 14:51:13.000000000 +0100
90+++ zapping/plugins/teletext/Makefile.am 2008-02-09 23:01:27.000000000 +010090+++ zapping/plugins/teletext/Makefile.am 2010-03-11 14:51:24.000000000 +0100
91@@ -24,10 +24,14 @@91@@ -24,10 +24,14 @@
92 view.c view.h \92 view.c view.h \
93 window.c window.h93 window.c window.h
@@ -105,42 +105,44 @@
105 # Must prevent link conflict with libzvbi 0.2.105 # Must prevent link conflict with libzvbi 0.2.
106Index: zapping/zapping_setup_fb/Makefile.am106Index: zapping/zapping_setup_fb/Makefile.am
107===================================================================107===================================================================
108--- zapping.orig/zapping_setup_fb/Makefile.am 2008-02-09 23:01:23.000000000 +0100108--- zapping.orig/zapping_setup_fb/Makefile.am 2010-03-11 14:51:13.000000000 +0100
109+++ zapping/zapping_setup_fb/Makefile.am 2008-02-09 23:01:27.000000000 +0100109+++ zapping/zapping_setup_fb/Makefile.am 2010-03-11 14:51:24.000000000 +0100
110@@ -18,6 +18,8 @@110@@ -18,6 +18,8 @@
111 v4l2.c \111 v4l2.c \
112 v4l25.c112 v4l25.c
113 113
114+zapping_setup_fb_LDFLAGS = -Wl,-z,defs -Wl,--as-needed114+zapping_setup_fb_LDFLAGS = -Wl,-z,defs -Wl,--no-add-needed -Wl,--as-needed
115+115+
116 zapping_setup_fb_LDADD = \116 zapping_setup_fb_LDADD = \
117 $(top_builddir)/libtv/libtv.la \117 $(top_builddir)/libtv/libtv.la \
118 @X_LIBS@ \118 @X_LIBS@ \
119Index: zapping/src/Makefile.am119Index: zapping/src/Makefile.am
120===================================================================120===================================================================
121--- zapping.orig/src/Makefile.am 2008-02-09 23:01:23.000000000 +0100121--- zapping.orig/src/Makefile.am 2010-03-11 14:51:13.000000000 +0100
122+++ zapping/src/Makefile.am 2008-02-09 23:01:27.000000000 +0100122+++ zapping/src/Makefile.am 2010-03-11 14:52:18.000000000 +0100
123@@ -108,6 +108,7 @@123@@ -107,7 +107,9 @@
124 @PACKAGE_LIBS@ \
124 @PYTHON_LIBS@ \125 @PYTHON_LIBS@ \
125 @X_LIBS@ \126 @X_LIBS@ \
127+ -lXext \
126 -lX11 \128 -lX11 \
127+ -lpthread \129+ -lpthread \
128 @X_DPMS_LIBS@ \130 @X_DPMS_LIBS@ \
129 @X_XINERAMA_LIBS@ \131 @X_XINERAMA_LIBS@ \
130 @X_XF86DGA_LIBS@ \132 @X_XF86DGA_LIBS@ \
131@@ -119,7 +120,7 @@133@@ -119,7 +121,7 @@
132 @ESD_LIBS@ \134 @ESD_LIBS@ \
133 @LIBXML_LIBS@135 @LIBXML_LIBS@
134 136
135-zapping_LDFLAGS = -export-dynamic137-zapping_LDFLAGS = -export-dynamic
136+zapping_LDFLAGS = -Wl,-z,defs -Wl,--as-needed -export-dynamic138+zapping_LDFLAGS = -Wl,-z,defs -Wl,--no-add-needed -Wl,--as-needed -export-dynamic
137 139
138 zapping_remote_SOURCES = \140 zapping_remote_SOURCES = \
139 zapping_remote.c141 zapping_remote.c
140Index: zapping/help/omf.make142Index: zapping/help/omf.make
141===================================================================143===================================================================
142--- zapping.orig/help/omf.make 2008-02-09 23:01:23.000000000 +0100144--- zapping.orig/help/omf.make 2010-03-11 14:51:13.000000000 +0100
143+++ zapping/help/omf.make 2008-02-09 23:01:27.000000000 +0100145+++ zapping/help/omf.make 2010-03-11 14:51:24.000000000 +0100
144@@ -42,7 +42,6 @@146@@ -42,7 +42,6 @@
145 for file in $(omffile); do \147 for file in $(omffile); do \
146 $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \148 $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
@@ -156,8 +158,8 @@
156- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)158- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
157Index: zapping/configure159Index: zapping/configure
158===================================================================160===================================================================
159--- zapping.orig/configure 2008-02-09 23:01:23.000000000 +0100161--- zapping.orig/configure 2010-03-11 14:51:13.000000000 +0100
160+++ zapping/configure 2008-02-09 23:03:13.000000000 +0100162+++ zapping/configure 2010-03-11 14:51:24.000000000 +0100
161@@ -22546,7 +22546,7 @@163@@ -22546,7 +22546,7 @@
162 #define HAVE_LIBPTHREAD 1164 #define HAVE_LIBPTHREAD 1
163 _ACEOF165 _ACEOF
@@ -187,8 +189,8 @@
187 cat >conftest.$ac_ext <<_ACEOF189 cat >conftest.$ac_ext <<_ACEOF
188Index: zapping/help/man/Makefile.am190Index: zapping/help/man/Makefile.am
189===================================================================191===================================================================
190--- zapping.orig/help/man/Makefile.am 2008-02-09 23:01:23.000000000 +0100192--- zapping.orig/help/man/Makefile.am 2010-03-11 14:51:13.000000000 +0100
191+++ zapping/help/man/Makefile.am 2008-02-09 23:01:27.000000000 +0100193+++ zapping/help/man/Makefile.am 2010-03-11 14:51:24.000000000 +0100
192@@ -7,24 +7,13 @@194@@ -7,24 +7,13 @@
193 195
194 man_MANS = $(MANUALS:.xml=.1)196 man_MANS = $(MANUALS:.xml=.1)
195197
=== added file 'debian/patches/07_python2.6_ftbfs.patch'
--- debian/patches/07_python2.6_ftbfs.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/07_python2.6_ftbfs.patch 2010-05-20 19:04:25 +0000
@@ -0,0 +1,32 @@
1Fix for bug #571516: zapping: FTBFS with Python 2.6 as default
2
3--- zapping-0.10~cvs6.orig/acinclude.m4
4+++ zapping-0.10~cvs6/acinclude.m4
5@@ -25,10 +25,9 @@
6 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
7 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
8 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
9- PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
10 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
11 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
12- PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"
13+ PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
14 PYTHON_LIBS="$PY_LIB_LOC -l$PY_LIBS $PY_EXTRA_LIBS"
15 AC_SUBST(PY_LIBS)
16 AC_SUBST(PY_LIB_LOC)
17only in patch2:
18unchanged:
19--- zapping-0.10~cvs6.orig/configure
20+++ zapping-0.10~cvs6/configure
21@@ -27212,10 +27212,9 @@
22 PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
23 PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
24 PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PY_VERSION/config/Makefile"
25- PY_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
26 PY_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE`
27 PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE`
28- PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASEMODLIBS $PY_OTHER_LIBS"
29+ PY_EXTRA_LIBS="$PY_BASEMODLIBS $PY_OTHER_LIBS"
30 PYTHON_LIBS="$PY_LIB_LOC -l$PY_LIBS $PY_EXTRA_LIBS"
31
32
033
=== added file 'debian/patches/08_spelling_typos.patch'
--- debian/patches/08_spelling_typos.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/08_spelling_typos.patch 2010-05-20 19:04:25 +0000
@@ -0,0 +1,27 @@
1Fix spelling typos found by lintian
2Index: zapping/plugins/alirc/alirc.c
3===================================================================
4--- zapping.orig/plugins/alirc/alirc.c 2010-03-11 14:33:32.000000000 +0100
5+++ zapping/plugins/alirc/alirc.c 2010-03-11 14:33:59.000000000 +0100
6@@ -259,7 +259,7 @@
7 printv("Couldn't read config file\n");
8 return FALSE;
9 }
10- printv("alirc: Succesfully initialize\n");
11+ printv("alirc: Successfully initialize\n");
12
13 lirc_iotag = gtk_input_add_full (fd,
14 GDK_INPUT_READ,
15Index: zapping/src/tveng.c
16===================================================================
17--- zapping.orig/src/tveng.c 2010-03-11 14:32:59.000000000 +0100
18+++ zapping/src/tveng.c 2010-03-11 14:33:08.000000000 +0100
19@@ -4070,7 +4070,7 @@
20
21 if (v == -1) {
22 info -> tveng_errno = -1;
23- tv_error_msg(info,"Cannot find an appropiate visual");
24+ tv_error_msg(info,"Cannot find an appropriate visual");
25 XFree(visual_info);
26 return 0;
27 }
028
=== modified file 'debian/patches/series'
--- debian/patches/series 2009-08-30 12:21:08 +0000
+++ debian/patches/series 2010-05-20 19:04:25 +0000
@@ -5,3 +5,5 @@
504_schemas.patch504_schemas.patch
605_ftbfs_powerpc_libtv.patch605_ftbfs_powerpc_libtv.patch
706_reqbufs_may_fail.patch706_reqbufs_may_fail.patch
807_python2.6_ftbfs.patch
908_spelling_typos.patch

Subscribers

People subscribed via source and target branches

to all changes: