Hi, On Sat, Nov 13, 2010 at 10:02:16PM +0000, Simon McVittie wrote: > > The package cannot be released with squeeze as it is now, so I'll try to > > list some options: > > > > 1. Remove package from Squeeze (leaving it in unstable) and think about > > it for the next release > > 2. Move the package to non-free > > 3. Find the sources and build flash files from source. > > 4. Completely remove package from Debian. > > 5. repack the tarball as tdiary_2.2.1+dfsg1.orig.tar.gz (or similar), removing > the two sourceless flash files; fix tdiary-contrib so it still builds, with > the two plugins that need those flash files removed.
Here is option 5 approach.
- Removing tdiary-2.2.1/contrib2/plugin/tdiarygraph/ and
tdiary-2.2.1/contrib2/plugin/tdiarytimes/ directories.
The two plugins need flash files. Without flash files,
they are quite useless. So, we need to remove the two
plugins completely. Upstream agrees with this approach.
- Removing tdiarygraph and tdiarytimes from debian/tdiary.copyright.
% pwd
/usr/src/tdiary/tdiary-2.2.1+dfsg1
% find -name '*swf'
%
% find -name '*tdiarygraph*'
% find -name '*tdiarytimes*'
%
% grep -ir tdiarygraph *
% grep -ir tdiarytimes *
%
That's all. Patch attached.
--
Regards,
dai
GPG Fingerprint = 0B29 D88E 42E6 B765 B8D8 EA50 7839 619D D439 668E
diff -urNp tdiary-2.2.1/debian/tdiary-contrib.copyright tdiary-2.2.1+dfsg1/debian/tdiary-contrib.copyright --- tdiary-2.2.1/debian/tdiary-contrib.copyright 2010-11-14 17:32:37.000000000 +0900 +++ tdiary-2.2.1+dfsg1/debian/tdiary-contrib.copyright 2010-11-14 17:33:07.000000000 +0900 @@ -87,14 +87,6 @@ plugin/select_theme Copyright (C) 2005 akira yamada License: GPL2 -plugin/tdiarygraph - Copyright (c) 2004 phonondrive <tdi...@phonondrive.com> - License: GPL - -plugin/tdiarytimes - Copyright (c) 2003 neuichi <neui...@nmnl.jp> - License: GPL - plugin/twitter[ Copyright (C) 2007 Michitaka Ohno <el...@mars.dti.ne.jp> License: GPL2
signature.asc
Description: Digital signature
