Merge lp:~timo-jyrinki/example-content/folder_i18n into lp:~ubuntu-core-dev/example-content/ubuntu

[Timo Jyrinki]

[Timo Jyrinki (timo-jyrinki)]

The ~timo-jyrinki/example-content/folder_i18n branch changes the Examples link into an examples.desktop file, which is of type Link and points to the folder. It uses gettext to get translations on-the-fly from langpacks, therefore fixing the bug #45489 for the case of after-installation for every Ubuntu user's home folder. The link on the Live-CD desktop probably comes from elsewhere.

At the same time, some of the content was moved around. The python usage here is a bit of an overkill, but it was the way I (thought I) knew how to make this work. The only hack needed was for installing the .desktop file under /etc while still using cdbs defaults otherwise.

It's lintian clean and tested with pbuilder, and seems to work fine. I'm attaching a screenshot to the bug report of a situation where the examples.desktop is installed in /etc/skel (without translations), .mo files are in locale directories, a new user has been created and it has been logged in for the first time.

I didn't use Icon=Folder, since it's actually after the ordinary folders and the icon in my opinion confused the user. So it's just the default link icon, which I'd prefer over also a folder icon with a link arrow on it since it looks wrong in the alphabetical order if it looks like a folder but is after other folders in the list.

[lp:~timo-jyrinki/example-content/folder_i18n]

51. By Timo Jyrinki <timo@olohuone> on 2009-03-13

Remove postrm which I forgot. Not needed anymore.

=== added directory 'data'
=== added file 'data/examples.desktop.in'
--- data/examples.desktop.in	1970-01-01 00:00:00 +0000
+++ data/examples.desktop.in	2009-03-12 18:09:45 +0000
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Link
+_Name=Examples
+_Comment=Example content for Ubuntu
+URL=file:///usr/share/example-content/
+X-Ubuntu-Gettext-Domain=example-content
+
 
=== modified file 'debian/changelog'
--- debian/changelog	2008-10-22 07:16:03 +0000
+++ debian/changelog	2009-03-12 18:09:45 +0000
@@ -1,3 +1,13 @@
+example-content (36) jaunty; urgency=low
+
+  * Change symlink into a .desktop file
+  * Add I18N infrastructure for the .desktop file using Python (LP: #45489)
+  * Move content from root to main and source directories
+  * Update Standards-Version (no changes)
+  * Update copyright file
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 11 Mar 2009 19:56:55 +0200
+
 example-content (35) intrepid; urgency=low
 
   * fables_01_01_aesop.spx: re-encoded the file at the proper bitrate, smaller
 
=== modified file 'debian/control'
--- debian/control	2008-10-07 06:22:21 +0000
+++ debian/control	2009-03-12 18:09:45 +0000
@@ -2,14 +2,15 @@
 Section: x11
 Priority: optional
 Maintainer: Ubuntu Artwork Team <[e-mail]>
-Build-Depends: cdbs, debhelper (>= 5), 
+Build-Depends: cdbs, debhelper (>= 5), po-debconf, python-central, python-dev, python-setuptools, python-distutils-extra
 #Build-Depends-Indep: openoffice.org-dev, xvfb, xfonts-base
 XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-art-pkg/example-content/ubuntu
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: https://launchpad.net/example-content
 
 Package: example-content
 Architecture: all
+Depends: ${misc:Depends}
 Description: Ubuntu example content
  For each desktop application in the default install where it is practical, 
  we provide at least one piece of example content. This is valuable for 
 
=== modified file 'debian/copyright'
--- debian/copyright	2006-09-07 15:31:30 +0000
+++ debian/copyright	2009-03-12 18:09:45 +0000
@@ -60,6 +60,12 @@
 Henrik Nilsen Omma <[e-mail]>
 
 
+Python I18N framework:
+Based loosely on checkbox package's framework by Marc Tardif 
+<[e-mail]>, modified for example-content usage 
+by Timo Jyrinki <[e-mail]>. Licensed under GPL.
+
+
 
 License:
 
 
=== modified file 'debian/install'
--- debian/install	2008-10-16 09:58:27 +0000
+++ debian/install	2009-03-12 18:09:45 +0000
@@ -1,4 +1,1 @@
-*.{doc,odg,odp,ods,odt,ogg,png,rtf,spx,TXT,xcf,xls,pdf,jpg}	/usr/share/example-content
-#build/usr/lib/openoffice 					/usr/lib
-logos                                                     	/usr/share/example-content
-Ubuntu_Free_Culture_Showcase					/usr/share/example-content
+etc/skel/examples.desktop /etc/skel
 
=== removed file 'debian/links'
--- debian/links	2006-03-23 13:56:32 +0000
+++ debian/links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/usr/share/example-content /etc/skel/Examples
 
=== modified file 'debian/rules'
--- debian/rules	2008-10-07 06:22:21 +0000
+++ debian/rules	2009-03-12 18:09:45 +0000
@@ -1,5 +1,15 @@
 #!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM := pycentral
+
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+# DEB_PYTHON_INSTALL_ARGS_ALL := --no-compile
+# --single-version-externally-managed 
+
+clean::
+	rm -rf build etc example_content.egg-info debian/pycompat
 
 # oversized .svg files
 OVERSIZED_FILES :=
 
=== added directory 'main'
=== renamed file 'case_Contact.pdf' => 'main/case_Contact.pdf'
=== renamed file 'case_KRUU.pdf' => 'main/case_KRUU.pdf'
=== renamed file 'case_OaklandUniversity.pdf' => 'main/case_OaklandUniversity.pdf'
=== renamed file 'case_Skegness.pdf' => 'main/case_Skegness.pdf'
=== renamed file 'case_Wellcome.pdf' => 'main/case_Wellcome.pdf'
=== renamed file 'case_howard_county_library.pdf' => 'main/case_howard_county_library.pdf'
=== renamed file 'case_oxford_archaeology.pdf' => 'main/case_oxford_archaeology.pdf'
=== renamed file 'case_ubuntu_johnshopkins_v2.pdf' => 'main/case_ubuntu_johnshopkins_v2.pdf'
=== renamed file 'case_ubuntu_locatrix_v1.pdf' => 'main/case_ubuntu_locatrix_v1.pdf'
=== renamed file 'fables_01_01_aesop.spx' => 'main/fables_01_01_aesop.spx'
=== renamed file 'gimp-ubuntu-splash.xcf' => 'main/gimp-ubuntu-splash.xcf'
=== renamed file 'kubuntu-leaflet.jpg' => 'main/kubuntu-leaflet.jpg'
=== renamed file 'oo-about-these-files.odt' => 'main/oo-about-these-files.odt'
=== renamed file 'oo-about-ubuntu-ru.rtf' => 'main/oo-about-ubuntu-ru.rtf'
=== renamed file 'oo-derivatives.doc' => 'main/oo-derivatives.doc'
=== renamed file 'oo-maxwell.odt' => 'main/oo-maxwell.odt'
=== renamed file 'oo-payment-schedule.ods' => 'main/oo-payment-schedule.ods'
=== renamed file 'oo-presenting-kubuntu.odp' => 'main/oo-presenting-kubuntu.odp'
=== renamed file 'oo-presenting-ubuntu.odp' => 'main/oo-presenting-ubuntu.odp'
=== renamed file 'oo-trig.xls' => 'main/oo-trig.xls'
=== renamed file 'oo-welcome.odt' => 'main/oo-welcome.odt'
=== added directory 'po'
=== added file 'po/POTFILES.in'
--- po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in	2009-03-12 18:09:45 +0000
@@ -0,0 +1,6 @@
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
+#
+[encoding: UTF-8]
+data/examples.desktop.in
+
 
=== added file 'po/es.po'
--- po/es.po	1970-01-01 00:00:00 +0000
+++ po/es.po	2009-03-12 18:09:45 +0000
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: example-content\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-11 11:36+0200\n"
+"PO-Revision-Date: 2009-03-11 11:39+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/examples.desktop.in.h:1
+msgid "Example content for Ubuntu"
+msgstr "Contenido del ejemplo para Ubuntu"
+
+#: ../data/examples.desktop.in.h:2
+msgid "Examples"
+msgstr "Ejemplos"
 
=== added file 'po/example-content.pot'
--- po/example-content.pot	1970-01-01 00:00:00 +0000
+++ po/example-content.pot	2009-03-12 18:09:45 +0000
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-12 17:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/examples.desktop.in.h:1
+msgid "Example content for Ubuntu"
+msgstr ""
+
+#: ../data/examples.desktop.in.h:2
+msgid "Examples"
+msgstr ""
 
=== added file 'po/fi.po'
--- po/fi.po	1970-01-01 00:00:00 +0000
+++ po/fi.po	2009-03-12 18:09:45 +0000
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: example-content\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-11 11:36+0200\n"
+"PO-Revision-Date: 2009-03-11 11:39+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/examples.desktop.in.h:1
+msgid "Example content for Ubuntu"
+msgstr "Esimerkkisisältöjä Ubuntulle"
+
+#: ../data/examples.desktop.in.h:2
+msgid "Examples"
+msgstr "Esimerkkejä"
 
=== added file 'po/fr.po'
--- po/fr.po	1970-01-01 00:00:00 +0000
+++ po/fr.po	2009-03-12 18:09:45 +0000
@@ -0,0 +1,25 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: example-content\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-03-11 11:36+0200\n"
+"PO-Revision-Date: 2009-03-11 11:39+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/examples.desktop.in.h:1
+msgid "Example content for Ubuntu"
+msgstr "Contenu d'exemple pour Ubuntu"
+
+#: ../data/examples.desktop.in.h:2
+msgid "Examples"
+msgstr "Exemples"
 
=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2009-03-12 18:09:45 +0000
@@ -0,0 +1,11 @@
+[build]
+i18n=True
+
+[build_i18n]
+domain=example-content
+# This is ugly, but needed so that it gets installed in the correct place
+desktop_files=[("../etc/skel/", ("data/examples.desktop.in",))]
+
+[install_egg_info]
+# just away from the packaging directory
+install_dir = build/temp
 
=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2009-03-12 18:09:45 +0000
@@ -0,0 +1,70 @@
+#!/usr/bin/env python
+
+import os
+import re
+import posixpath
+from glob import glob
+
+from distutils.core import setup
+from setuptools import setup
+
+from distutils.command.install_data import install_data
+#from DistUtilsExtra.command.build_extra import build_extra
+from DistUtilsExtra.command.build_i18n import build_i18n
+
+def changelog_version(changelog="debian/changelog"):
+    version = "dev"
+    if posixpath.exists(changelog):
+        head=open(changelog).readline()
+        match = re.compile(".*\((.*)\).*").match(head)
+        if match:
+            version = match.group(1)
+
+    return version
+
+class example_content_install_data(install_data, object):
+
+    def finalize_options(self):
+        """Add wildcard support for filenames."""
+        super(example_content_install_data, self).finalize_options()
+
+        for f in self.data_files:
+            if type(f) != str:
+                files = f[1]
+                i = 0
+                while i < len(files):
+                    if "*" in files[i]:
+                        for e in glob(files[i]):
+                            files.append(e)
+                        files.pop(i)
+                        i -= 1
+                    i += 1
+
+    def run(self):
+        """Run substitutions on files."""
+        super(example_content_install_data, self).run()
+        # Causes Lintian warning
+        ## os.chmod("etc/skel/examples.desktop", 755)
+        return
+
+setup(
+    name = "example-content",
+    version = changelog_version(),
+    author = "Timo Jyrinki",
+    author_email = "[e-mail]",
+    license = "GPL",
+    description = "Example Content I18N",
+    long_description = """
+Python is only used for I18N of the .desktop entry.
+""",
+    data_files = [
+    ("share/example-content/", ["main/*"]),
+    ("share/example-content/logos/", ["logos/*"]),
+    ("share/example-content/Ubuntu_Free_Culture_Showcase/", ["Ubuntu_Free_Culture_Showcase/*"])
+                 ],
+    cmdclass = {
+        "install_data": example_content_install_data,
+#        "build" : build_extra,
+        "build_i18n" :  build_i18n }
+)
+
 
=== added directory 'source'
=== renamed file 'kubuntu-leaflet.svg' => 'source/kubuntu-leaflet.svg'