rev 2955 - in kde-extras/codeine/trunk/debian: . patches
Achim Bohnet
ach-guest at costa.debian.org
Thu Jan 19 00:10:55 UTC 2006
Author: ach-guest
Date: 2006-01-19 00:10:54 +0000 (Thu, 19 Jan 2006)
New Revision: 2955
Added:
kde-extras/codeine/trunk/debian/patches/kubuntu_01_add_translations_to_desktop_file.diff
Removed:
kde-extras/codeine/trunk/debian/patches/kubuntu_01_fix_desktop_file.patch
Modified:
kde-extras/codeine/trunk/debian/TODO
kde-extras/codeine/trunk/debian/changelog
kde-extras/codeine/trunk/debian/codeine.1.docbook
kde-extras/codeine/trunk/debian/rules
Log:
codeine:
o replace dh_* based rules with cdbs
o add 'real content' to skeletion manpage
o install codeine_part.desktop in /usr/share/services/
not applications/kde. It's a Type=Service desktop
o codeine.desktop: add 'Media Player' translations from
kaffeine (replaces 'Video Player')
o use dh compat 5. no changes required
o remove python from build-dep. Rely on whatever
scon uses and depends on
Modified: kde-extras/codeine/trunk/debian/TODO
===================================================================
--- kde-extras/codeine/trunk/debian/TODO 2006-01-18 21:03:36 UTC (rev 2954)
+++ kde-extras/codeine/trunk/debian/TODO 2006-01-19 00:10:54 UTC (rev 2955)
@@ -1,9 +1,9 @@
-o add kmplayers 'Media Player' translations
+o DONE: add kaffeine 'Media Player' translations
o check kpart can/is used
o think about priority in desktop file. Need to be
discussed with kubuntu people what they want as default
o add konq service menu
o comment out some code that writes the output stdout
o rosettafication
-o more meat in the manpage
-o cleanup rules: try with cdbs, much cleaner ;)
+o DONE: more meat in the manpage
+o DONE cleanup rules file: try with cdbs, much cleaner ;)
Modified: kde-extras/codeine/trunk/debian/changelog
===================================================================
--- kde-extras/codeine/trunk/debian/changelog 2006-01-18 21:03:36 UTC (rev 2954)
+++ kde-extras/codeine/trunk/debian/changelog 2006-01-19 00:10:54 UTC (rev 2955)
@@ -1,12 +1,15 @@
-codeine (1.0-0ubuntu1) dapper; urgency=low
+codeine (1.0-0ubuntu1+1) dapper; urgency=low
[ Achim Bohnet ]
* Initial Release.
- * bit of polishing and fixing all over debian/*
- * set compat to 5, bump debhelper require >= 5. No changes required
- * better short and long description
- [ Anthony Mercatante ]
- * Added patch 01 to fix the codeine.desktop file.
+ * patches/kubuntu_01_add_translations_to_desktop_file.diff:
+ Replace GenericName "Vidio Player" with "Media Player" as used for
+ kaffeine and kmplayer. Add dozends "Media Player" translations
+ from kaffeine.desktop to codeine.desktop. Replaces
+ patches/kubuntu_01_fix_desktop_file.patch
+ * rules: codeine_part.desktop is of Type=Service so install it in
+ /usr/share/services/ not /usr/share/applications/kde/
+ * Add codeine.1 manpage
-- Achim Bohnet <ach at mpe.mpg.de> Tue, 17 Jan 2006 23:26:41 +0100
Modified: kde-extras/codeine/trunk/debian/codeine.1.docbook
===================================================================
--- kde-extras/codeine/trunk/debian/codeine.1.docbook 2006-01-18 21:03:36 UTC (rev 2954)
+++ kde-extras/codeine/trunk/debian/codeine.1.docbook 2006-01-19 00:10:54 UTC (rev 2955)
@@ -9,13 +9,20 @@
<surname>Anthony</surname>
<email>anthony.mercatante at laposte.net</email>
</author>
+ <author>
+ <firstname>Mercatante</firstname>
+ <surname>Bohnet</surname>
+ <email>ach at mpe.mpg.de</email>
+ </author>
<copyright>
<year>2005</year>
<holder>Anthony Mercatante</holder>
+ <year>2006</year>
+ <holder>Achim Bohnet</holder>
</copyright>
<!-- XXX IMPORTANT XXX -->
<!-- Keep this date up to date: -->
- <date>2005-10-24</date>
+ <date>2006-01-18</date>
<!-- ^^^^^^^^^^ -->
</refentryinfo>
<refmeta>
@@ -24,7 +31,9 @@
</refmeta>
<refnamediv>
<refname>codeine</refname>
- <refpurpose>Video player for KDE</refpurpose>
+ <refpurpose>video player for <productname>KDE</productname> designed to be as
+ simple as possible
+ </refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
@@ -35,16 +44,24 @@
<arg choice="opt">
<option><replaceable>KDE-options</replaceable></option>
</arg>
+ <arg choice="opt">
+ <option><replaceable>URL|file</replaceable></option>
+ </arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- Video Player for KDE.
+ Video player with a different philosophy: Simple, uncluttered interface
</para>
<para>
- Codeine is a video player based on the Xine engine, and designed to be as easy to use as possible.
+ Features:
</para>
+ <itemizedlist>
+ <listitem> <para>Plays DVDs, VCDs, all video formats supported by Xine</para> </listitem>
+ <listitem> <para>Bundled with a simple web-page KPart</para> </listitem>
+ <listitem> <para>Starts quickly</para> </listitem>
+ </itemizedlist>
</refsect1>
<refsect1>
<title>OPTIONS</title>
@@ -88,25 +105,37 @@
<term> <option>--</option> </term>
<listitem> <para>Indicates end of options</para> </listitem>
</varlistentry>
+ <varlistentry>
+ <term> <option>URL|file</option> </term>
+ <listitem> <para>URL to or filename of a video</para> </listitem>
+ </varlistentry>
</variablelist>
<!-- TODO * add all the rest of the options, but maybe find an automated
way to keep it up to date -->
</para>
</refsect1>
<refsect1>
+ <title>AUTHOR</title>
+ <para>
+ Codeine was writen by Max Howell <email>max.howell at methylblue.com</email>
+ Homepage: <ulink>http://www.methylblue.com/codeine/</ulink>
+ </para>
+ </refsect1>
+ <refsect1>
<title>COPYRIGHT</title>
<para>
- This manual page was written by Anthony Mercatante
- <email>anthony.mercatante at laposte.net</email> for the
+ This manual page was written by Achim Bohnet <email>ach at mpe.mpg.de</email>,
+ based on work of Anthony Mercatante
+ <email>anthony.mercatante at laposte.net</email>, for the
<productname>Debian</productname> system (but may be used by others).
Permission is granted to copy, distribute and/or modify this document
under the terms of the <acronym>GNU</acronym> General Public License,
Version 2 or any later version published by the Free Software Foundation.
</para>
<para>
- On Debian systems, the complete text of the GNU General Public
+ On Debian systems, the complete text of the GNU General Public Version 2
License can be found in
- <filename>/usr/share/common-licenses/GPL</filename>.
+ <filename>/usr/share/common-licenses/GPL-2</filename>.
</para>
</refsect1>
</refentry>
Added: kde-extras/codeine/trunk/debian/patches/kubuntu_01_add_translations_to_desktop_file.diff
===================================================================
--- kde-extras/codeine/trunk/debian/patches/kubuntu_01_add_translations_to_desktop_file.diff 2006-01-18 21:03:36 UTC (rev 2954)
+++ kde-extras/codeine/trunk/debian/patches/kubuntu_01_add_translations_to_desktop_file.diff 2006-01-19 00:10:54 UTC (rev 2955)
@@ -0,0 +1,47 @@
+diff -Nur codeine-1.0/misc/codeine.desktop codeine-1.0.new/misc/codeine.desktop
+--- codeine-1.0/misc/codeine.desktop 2005-04-28 03:39:55.000000000 +0200
++++ codeine-1.0.new/misc/codeine.desktop 2006-01-18 23:52:23.000000000 +0100
+@@ -1,9 +1,41 @@
+ [Desktop Entry]
++Encoding=UTF-8
+ Name=Codeine
+ Exec=codeine %u
+ Icon=codeine
+ Type=Application
+-Encoding=UTF-8
++Terminal=false
+ MimeType=video/x-theora;video/x-ogm;video/x-ms-wmv;video/x-msvideo;video/x-ms-asf;video/x-matroska;video/mpeg;video/avi;video/quicktime;video/vnd.rn-realvideo;video/x-flic;
+ Categories=Qt;KDE;AudioVideo;Player
+-GenericName=Video Player
++Comment=Video player for KDE designed to be as simple as possible
++Comment[de]=Videoabspieler für KDE entworfen zur einfachen Bedienung
++GenericName=Media Player
++GenericName[br]=Soner liesvedia
++GenericName[ca]=Reproductor multimèdia
++GenericName[cs]=Přehrávač médií
++GenericName[cy]=Chwaraeydd Cyfryngau
++GenericName[da]=Medieafspiller
++GenericName[el]=Αναπαραγωγέας μέσων
++GenericName[es]=Reproductor multimedia
++GenericName[et]=Meediamängija
++GenericName[fr]=Lecteur multimédia
++GenericName[ga]=Seinnteoir Meán
++GenericName[he]=נגן מדיה
++GenericName[hi]=मीडिया प्लेयर
++GenericName[hu]=Médialejátszó
++GenericName[it]=Lettore multimediale
++GenericName[lt]=Media grotuvas
++GenericName[mk]=Изведувач на мултимедиа
++GenericName[nl]=Mediaspeler
++GenericName[pa]=ਮੀਡਿਆ ਪਲੇਅਰ
++GenericName[pt]=Leitor Multimédia
++GenericName[pt_BR]=Tocador de Mídia
++GenericName[ru]=Медиаплеер
++GenericName[sr]=Медија плејер
++GenericName[sr at Latn]=Medija plejer
++GenericName[sv]=Mediaspelare
++GenericName[tr]=Medya Oynatıcı
++GenericName[xh]=Umdlali we Midia
++GenericName[xx]=xxMedia Playerxx
++GenericName[zh_CN]=媒体播放器
++GenericName[zu]=Umdlali Wezezindaba
Property changes on: kde-extras/codeine/trunk/debian/patches/kubuntu_01_add_translations_to_desktop_file.diff
___________________________________________________________________
Name: svn:mime-type
+ text/x-patch
Deleted: kde-extras/codeine/trunk/debian/patches/kubuntu_01_fix_desktop_file.patch
Modified: kde-extras/codeine/trunk/debian/rules
===================================================================
--- kde-extras/codeine/trunk/debian/rules 2006-01-18 21:03:36 UTC (rev 2954)
+++ kde-extras/codeine/trunk/debian/rules 2006-01-19 00:10:54 UTC (rev 2955)
@@ -1,119 +1,44 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_SCONS_PREFIX=/usr
+CONFIG_STATUS=$(DEB_BUILDDIR)/config.status
+SCONS_CMD=`which scons`
-CFLAGS = -Wall -g
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: $(CONFIG_STATUS)
+$(CONFIG_STATUS):
+ $(SCONS_CMD) configure prefix=$(DEB_DESTDIR)$(DEB_SCONS_PREFIX)
+ touch $(CONFIG_STATUS)
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+common-build-arch common-build-indep:: common-build-impl
+common-build-impl::
+ $(SCONS_CMD)
-#-include debian/debiandirs
-#
-## To be used with kde-style admin subdirectories if desired.
-#debian/debiandirs: admin/debianrules
-# perl -w admin/debianrules echodirs > debian/debiandirs
+common-install-arch common-install-indep:: common-install-impl
+common-install-impl::
+ $(SCONS_CMD) install
-config.status: configure
- dh_testdir
- # Add here commands to configure the package.
-# CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+install/digikam::
+ mv debian/codeine/usr/share/applications/codeine_part.desktop \
+ debian/codeine/usr/share/services/
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
- scons
- docbook2x-man debian/codeine.1.docbook
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -scons -c
- rm -rf cache/*
- rm -f generic.cache.py kde.cache.py
+clean::
+ $(SCONS_CMD) -c
+ rm -f $(CONFIG_STATUS)
+ rm -rf cache
+ rm -rf .sconf_temp
+ rm -rf admin
+ rm -f generic.cache.py kde.cache.py configure.log
rm -f scons/*.pyc scons/signatures.dblite
rm -f codeine.1
-
- #-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- #cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- #cp -f /usr/share/misc/config.guess config.guess
-endif
+build/codeine::
+ docbook2x-man debian/codeine.1.docbook
+DEB_INSTALL_MANPAGES_myapp = codeine.1
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- # Add here commands to install the package into debian/codeine.
- #$(MAKE) install prefix=$(CURDIR)/debian/codeine/usr
- DESTDIR=$(CURDIR)/debian/codeine scons install
-
- dh_installman codeine.1
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
More information about the pkg-kde-commits
mailing list