Turtle Blocks

Merge lp:~mattva01/turtleart/deb-pkg into lp:~registry/turtleart/debian-bzr.d.o

  1. deb-pkg
  2. Merge into debian-bzr.d.o
Proposed by Matthew Gallagher
Status: Merged
Merge reported by: Luke Faraone
Merged at revision: not available
Proposed branch: lp:~mattva01/turtleart/deb-pkg
Merge into: lp:~registry/turtleart/debian-bzr.d.o
Diff against target: 71 lines (+14/-14)
5 files modified
debian/changelog (+6/-0)
debian/postinst (+2/-7)
debian/postrm (+3/-6)
debian/sugar-turtleart-activity.links (+1/-1)
debian/turtleart.install (+2/-0)
To merge this branch: bzr merge lp:~mattva01/turtleart/deb-pkg
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+35347@code.launchpad.net

Description of the change

Fixed maintainer scripts to adhere to debian policy.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-24 02:39:53 +0000
3+++ debian/changelog 2010-09-13 23:11:48 +0000
4@@ -1,3 +1,9 @@
5+turtleart (96-2) lucid; urgency=low
6+
7+ * Changed maintainer scripts to adhere to debian policy (closes: #596474)
8+
9+ -- Matthew Gallagher <mattva01@gmail.com> Mon, 13 Sep 2010 18:56:27 -0400
10+
11 turtleart (96-1) unstable; urgency=low
12
13 * New upstream version.
14
15=== modified file 'debian/postinst'
16--- debian/postinst 2010-08-13 16:32:54 +0000
17+++ debian/postinst 2010-09-13 23:11:48 +0000
18@@ -1,13 +1,8 @@
19 #!/bin/sh
20 set -e
21
22-DEFAULTS=/etc/gnome/defaults.list
23-if [ -f $DEFAULTS ]; then
24- chmod 666 $DEFAULTS
25- echo "application/x-turtle-art=turtleart.desktop" >> $DEFAULTS
26- chmod 644 $DEFAULTS
27- gtk-update-icon-cache -qf /usr/share/icons/hicolor
28-fi
29+gtk-update-icon-cache -qf /usr/share/icons/hicolor
30+gtk-update-icon-cache -qf /usr/share/icons/gnome
31 update-mime-database /usr/share/mime
32
33 # for freedeskoptop compatible env's
34
35=== modified file 'debian/postrm'
36--- debian/postrm 2010-08-13 16:32:54 +0000
37+++ debian/postrm 2010-09-13 23:11:48 +0000
38@@ -1,12 +1,9 @@
39 #!/bin/sh
40 set -e
41
42-DEFAULTS=/etc/gnome/defaults.list
43-if [ -f $DEFAULTS ]; then
44- cat $DEFAULTS | sed -e '/application\/x\-turtle\-art\=turtleart\.desktop/d' > ./defaults.list
45- mv ./defaults.list $DEFAULTS
46- gtk-update-icon-cache -qf /usr/share/icons/hicolor
47-fi
48+gtk-update-icon-cache -qf /usr/share/icons/hicolor
49+gtk-update-icon-cache -qf /usr/share/icons/gnome
50+
51 update-mime-database /usr/share/mime
52
53 # for freedeskoptop compatible env's
54
55=== modified file 'debian/sugar-turtleart-activity.links'
56--- debian/sugar-turtleart-activity.links 2010-08-19 15:30:15 +0000
57+++ debian/sugar-turtleart-activity.links 2010-09-13 23:11:48 +0000
58@@ -2,4 +2,4 @@
59 usr/share/turtleart/images usr/share/sugar/activities/TurtleArt.activity/images
60 usr/share/turtleart/icons usr/share/sugar/activities/TurtleArt.activity/icons
61 usr/share/icons/hicolor/scalable/apps/turtleart.svg usr/share/sugar/activities/TurtleArt.activity/activity/turtleart.svg
62-usr/share/icons/gnome/scalable/mimetypes/application-x-turtle-art.svg usr/share/sugar/activities/TurtleArt.activity/ctivity/application-x-turtle-art.svg
63+usr/share/icons/gnome/scalable/mimetypes/application-x-turtle-art.svg usr/share/sugar/activities/TurtleArt.activity/activity/application-x-turtle-art.svg
64
65=== modified file 'debian/turtleart.install'
66--- debian/turtleart.install 2010-08-19 20:32:52 +0000
67+++ debian/turtleart.install 2010-09-13 23:11:48 +0000
68@@ -1,1 +1,3 @@
69 usr/
70+activity/turtleart.svg /usr/share/icons/hicolor/scalable/apps/
71+activity/application-x-turtle-art.svg /usr/share/icons/gnome/scalable/mimetypes/

Subscribers

People subscribed via source and target branches