Skip to content

Commit

Permalink
Make ready for saucy
Browse files Browse the repository at this point in the history
  • Loading branch information
sigurdga committed Oct 24, 2013
1 parent 4a55f03 commit 4f6f731
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 40 deletions.
2 changes: 1 addition & 1 deletion debian/changelog
@@ -1,4 +1,4 @@
maps (12.07.4) precise; urgency=low
maps (12.07.4) saucy; urgency=low

* Remove and ignore icon-cache
* Remove .git
Expand Down
11 changes: 7 additions & 4 deletions debian/control
@@ -1,7 +1,8 @@
Source: maps
Section: python
Priority: extra
Build-Depends: debhelper (>= 8), libglib2.0-bin, python (>= 2.6.6-3~),
Build-Depends: debhelper (>= 8),
python (>= 2.6.6-3~),
python-distutils-extra (>= 2.10)
Maintainer: Sigurd Gartmann <sigurdga-ubuntu@sigurdga.no>
Standards-Version: 3.9.3
Expand All @@ -19,7 +20,9 @@ Depends: ${misc:Depends},
gir1.2-clutter-1.0,
gir1.2-gdkpixbuf-2.0,
python-lxml,
gir1.2-gtkclutter-1.0
gir1.2-gtkclutter-1.0,
yelp,
python-rsvg
Description: Maps for Gnome and Ubuntu
Simple map application for browsing, searching and getting directions.
Can also show GPX traces.
Simple openstreetmap client application for browsing, searching and getting directions.
Can also show GPX traces by opening from menu or dropping from file system.
23 changes: 0 additions & 23 deletions debian/rules
Expand Up @@ -6,27 +6,4 @@ else
dh $@ --with python2
endif

override_dh_auto_install:
dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/maps/bin --install-data=/opt/extras.ubuntu.com/maps --install-lib=/opt/extras.ubuntu.com/maps

override_dh_python2:
dh_python2 /opt/extras.ubuntu.com/maps


override_dh_install:
dh_install
mkdir -p debian/maps/opt/extras.ubuntu.com/maps/bin
if [ -x debian/maps/opt/extras.ubuntu.com/maps/maps/maps ]; then mv debian/maps/opt/extras.ubuntu.com/maps/maps/maps debian/maps/opt/extras.ubuntu.com/maps/bin; fi
if [ -f debian/maps/opt/extras.ubuntu.com/maps/share/applications/maps.desktop ]; then \
mkdir -p debian/maps/usr/share/applications; \
mv debian/maps/opt/extras.ubuntu.com/maps/share/applications/maps.desktop debian/maps/usr/share/applications/extras-maps.desktop; \
rmdir --ignore-fail-on-non-empty debian/maps/opt/extras.ubuntu.com/maps/share/applications; \
sed -i 's|Exec=[^ ]*|Exec=/opt/extras.ubuntu.com/maps/bin/maps|' debian/maps/usr/share/applications/extras-maps.desktop; \
sed -i 's|Icon=/usr/|Icon=/opt/extras.ubuntu.com/maps/|' debian/maps/usr/share/applications/extras-maps.desktop; \
fi
grep -RlZ 'import gettext' debian/maps/* | xargs -0 -r sed -i 's|\(import\) gettext$$|\1 locale|'
grep -RlZ 'from gettext import gettext as _' debian/maps/* | xargs -0 -r sed -i 's|from gettext \(import gettext as _\)|from locale \1|'
grep -RlZ "gettext.textdomain('maps')" debian/maps/* | xargs -0 -r sed -i "s|gettext\(\.textdomain('maps')\)|locale\.bindtextdomain('maps', '/opt/extras.ubuntu.com/maps/share/locale')\nlocale\1|"
sed -i "s|__maps_data_directory__ =.*|__maps_data_directory__ = '/opt/extras.ubuntu.com/maps/share/maps/'|" debian/maps/opt/extras.ubuntu.com/maps/maps*/mapsconfig.py
sed -i 's| sys.path.insert(0, opt_path)|\0\n os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/maps/share/", os.getenv("XDG_DATA_DIRS", "")))|' debian/maps/opt/extras.ubuntu.com/maps/bin/maps
if [ -d debian/maps/opt/extras.ubuntu.com/maps/share/glib-2.0/schemas ]; then glib-compile-schemas debian/maps/opt/extras.ubuntu.com/maps/share/glib-2.0/schemas; fi
3 changes: 1 addition & 2 deletions po/maps.pot
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-09 18:40+0200\n"
"POT-Creation-Date: 2013-10-24 13:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand All @@ -21,7 +21,6 @@ msgstr ""
msgid "Show debug messages (-vv debugs maps_lib also)"
msgstr ""

#. Code for other initialization actions should be added here.
#: ../maps.desktop.in.h:1
msgid "Maps"
msgstr ""
Expand Down
20 changes: 10 additions & 10 deletions setup.py
Expand Up @@ -2,16 +2,16 @@
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
### BEGIN LICENSE
# Copyright (C) 2012 Sigurd Gartmann sigurdga-ubuntu@sigurdga.no
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 3, as published
# by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranties of
# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
### END LICENSE

Expand Down Expand Up @@ -129,14 +129,14 @@ def run(self):
update_desktop_file(desktop_file, target_pkgdata, target_scripts)
compile_schemas(self.root, target_data)


##################################################################################
###################### YOU SHOULD MODIFY ONLY WHAT IS BELOW ######################
##################################################################################

DistUtilsExtra.auto.setup(
name='maps',
version='12.07.4',
version='13.10.0',
license='GPL-3',
author='Sigurd Gartmann',
author_email='sigurdga-ubuntu@sigurdga.no',
Expand Down

0 comments on commit 4f6f731

Please sign in to comment.