[Python-apps-commits] r8625 - in packages/openteacher/trunk/debian (6 files)

cjsmo-guest at users.alioth.debian.org cjsmo-guest at users.alioth.debian.org
Sat May 5 05:40:48 UTC 2012


    Date: Saturday, May 5, 2012 @ 05:40:45
  Author: cjsmo-guest
Revision: 8625

* Added B-D on imagemagick for icon resizing.
* Added B-D on libicu48 to compile icon and gui resources.
* Added Depends on hicolor-icon-theme.
* Add icon resizing rules to debian/rules.
* Install icons into hicolor-icon-theme.
* Increased Standards version to 3.9.3.
* Removed debian/openteacher.xpm not needed, it is now generated in
  debian/rules.
* Update debian/watch so it works again.

Modified:
  packages/openteacher/trunk/debian/changelog
  packages/openteacher/trunk/debian/control
  packages/openteacher/trunk/debian/install
  packages/openteacher/trunk/debian/rules
  packages/openteacher/trunk/debian/watch
Deleted:
  packages/openteacher/trunk/debian/openteacher.xpm

Modified: packages/openteacher/trunk/debian/changelog
===================================================================
--- packages/openteacher/trunk/debian/changelog	2012-05-05 05:31:06 UTC (rev 8624)
+++ packages/openteacher/trunk/debian/changelog	2012-05-05 05:40:45 UTC (rev 8625)
@@ -1,3 +1,17 @@
+openteacher (2.2.1-2) UNRELEASED; urgency=low
+
+  * Added B-D on imagemagick for icon resizing.
+  * Added B-D on libicu48 to compile icon and gui resources.
+  * Added Depends on hicolor-icon-theme.
+  * Add icon resizing rules to debian/rules.
+  * Install icons into hicolor-icon-theme.
+  * Increased Standards version to 3.9.3.
+  * Removed debian/openteacher.xpm not needed, it is now generated in
+    debian/rules.
+  * Update debian/watch so it works again.
+
+ -- Charlie Smotherman <cjsmo at cableone.net>  Mon, 04 May 2012 20:07:23 -0500
+
 openteacher (2.2.1-1) unstable; urgency=low
 
   * New upstream release.  Upstream has corrected a bug, which when using the

Modified: packages/openteacher/trunk/debian/control
===================================================================
--- packages/openteacher/trunk/debian/control	2012-05-05 05:31:06 UTC (rev 8624)
+++ packages/openteacher/trunk/debian/control	2012-05-05 05:40:45 UTC (rev 8625)
@@ -4,8 +4,8 @@
 Section: misc
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~), translate-toolkit,
- pyqt4-dev-tools, qt4-linguist-tools
-Standards-Version: 3.9.2
+ pyqt4-dev-tools, qt4-linguist-tools, imagemagick, libicu48
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
 Homepage: http://openteacher.org/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/openteacher/trunk/
@@ -13,7 +13,7 @@
 
 Package: openteacher
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-qt4
+Depends: ${misc:Depends}, ${python:Depends}, python-qt4, hicolor-icon-theme
 Description: learn words in a foreign language
  OpenTeacher is an application that helps you in learning a foreign
  language vocabulary. Just enter some words in your native or foreign

Modified: packages/openteacher/trunk/debian/install
===================================================================
--- packages/openteacher/trunk/debian/install	2012-05-05 05:31:06 UTC (rev 8624)
+++ packages/openteacher/trunk/debian/install	2012-05-05 05:40:45 UTC (rev 8625)
@@ -1,3 +1,3 @@
 linux/openteacher.desktop /usr/share/applications
+linux/openteacher.png /usr/share/icons/hicolor/48x48/apps
 translations /usr/share/openteacher
-debian/openteacher.xpm /usr/share/pixmaps

Deleted: packages/openteacher/trunk/debian/openteacher.xpm
===================================================================
--- packages/openteacher/trunk/debian/openteacher.xpm	2012-05-05 05:31:06 UTC (rev 8624)
+++ packages/openteacher/trunk/debian/openteacher.xpm	2012-05-05 05:40:45 UTC (rev 8625)
@@ -1,285 +0,0 @@
-/* XPM */
-static char * openteacher35x35_xpm[] = {
-"32 32 250 2",
-"  	c None",
-". 	c #48535D",
-"+ 	c #48545D",
-"@ 	c #48525D",
-"# 	c #47525C",
-"$ 	c #49545E",
-"% 	c #4A555F",
-"& 	c #4D5862",
-"* 	c #525E68",
-"= 	c #5E6973",
-"- 	c #697580",
-"; 	c #717D88",
-"> 	c #717C87",
-", 	c #69757F",
-"' 	c #48525C",
-") 	c #48545E",
-"! 	c #46515B",
-"~ 	c #4B5660",
-"{ 	c #535F69",
-"] 	c #5F6B75",
-"^ 	c #6F7C86",
-"/ 	c #78848F",
-"( 	c #77838F",
-"_ 	c #74818B",
-": 	c #707C86",
-"< 	c #4D5963",
-"[ 	c #626D78",
-"} 	c #6F7B86",
-"| 	c #75818C",
-"1 	c #707C87",
-"2 	c #58626E",
-"3 	c #505965",
-"4 	c #4B5461",
-"5 	c #4C5461",
-"6 	c #4F5865",
-"7 	c #57616D",
-"8 	c #616B77",
-"9 	c #75828D",
-"0 	c #525D68",
-"a 	c #68747F",
-"b 	c #6D7983",
-"c 	c #424957",
-"d 	c #2F3543",
-"e 	c #232837",
-"f 	c #2B303F",
-"g 	c #323947",
-"h 	c #2A303F",
-"i 	c #222736",
-"j 	c #2E3342",
-"k 	c #3F4754",
-"l 	c #545D6A",
-"m 	c #6B7681",
-"n 	c #6C7883",
-"o 	c #737F89",
-"p 	c #323946",
-"q 	c #1F2432",
-"r 	c #151827",
-"s 	c #1E2231",
-"t 	c #48515D",
-"u 	c #59646F",
-"v 	c #5F6A75",
-"w 	c #47505D",
-"x 	c #1F2332",
-"y 	c #141827",
-"z 	c #1D2130",
-"A 	c #303644",
-"B 	c #545E6A",
-"C 	c #727E89",
-"D 	c #798692",
-"E 	c #A1B0C0",
-"F 	c #9AAABA",
-"G 	c #9DADBD",
-"H 	c #9FAFBF",
-"I 	c #A0AFBF",
-"J 	c #ACBDCC",
-"K 	c #ADBECC",
-"L 	c #ACBECC",
-"M 	c #9EAEBE",
-"N 	c #9AA9B9",
-"O 	c #A0B0BF",
-"P 	c #7E8C98",
-"Q 	c #737F8A",
-"R 	c #6A7580",
-"S 	c #5C6574",
-"T 	c #B4C6D6",
-"U 	c #C7DBEB",
-"V 	c #A8B8C8",
-"W 	c #8C9BAA",
-"X 	c #95A5B1",
-"Y 	c #96A6B3",
-"Z 	c #B6C7D7",
-"` 	c #BED1E1",
-" .	c #BED0E0",
-"..	c #B9CADA",
-"+.	c #97A7B4",
-"@.	c #96A5B1",
-"#.	c #8E9CAA",
-"$.	c #9DACBC",
-"%.	c #C9DCEC",
-"&.	c #B6C8D8",
-"*.	c #687482",
-"=.	c #67727D",
-"-.	c #73808A",
-";.	c #6E7A85",
-">.	c #48505E",
-",.	c #4A5262",
-"'.	c #B8CADA",
-").	c #2F3544",
-"!.	c #636F7A",
-"~.	c #788591",
-"{.	c #AEBFCE",
-"].	c #BDCFDF",
-"^.	c #B3C5D5",
-"/.	c #7A8792",
-"(.	c #646F7B",
-"_.	c #2E3543",
-":.	c #96A4B3",
-"<.	c #BCCEDE",
-"[.	c #586271",
-"}.	c #474F5C",
-"|.	c #76828D",
-"1.	c #74808B",
-"2.	c #6B7782",
-"3.	c #363D4B",
-"4.	c #474E5E",
-"5.	c #BFD1E1",
-"6.	c #404756",
-"7.	c #313745",
-"8.	c #6F7A85",
-"9.	c #788490",
-"0.	c #BDCFE0",
-"a.	c #B3C5D4",
-"b.	c #6F7C87",
-"c.	c #323846",
-"d.	c #3D4453",
-"e.	c #C0D1E1",
-"f.	c #555E6D",
-"g.	c #353B49",
-"h.	c #6C7782",
-"i.	c #47525D",
-"j.	c #6F7B85",
-"k.	c #606A76",
-"l.	c #2C313F",
-"m.	c #4A5161",
-"n.	c #A1B1C1",
-"o.	c #323847",
-"p.	c #3C4351",
-"q.	c #74818C",
-"r.	c #3E4552",
-"s.	c #303645",
-"t.	c #9AA9B8",
-"u.	c #586372",
-"v.	c #2A2F3D",
-"w.	c #606B77",
-"x.	c #565F6C",
-"y.	c #282D3C",
-"z.	c #353B4A",
-"A.	c #4B5463",
-"B.	c #272C3B",
-"C.	c #4A5260",
-"D.	c #73808B",
-"E.	c #4E5764",
-"F.	c #262B3A",
-"G.	c #48505F",
-"H.	c #3A4151",
-"I.	c #56606C",
-"J.	c #4E5763",
-"K.	c #202433",
-"L.	c #58616E",
-"M.	c #202534",
-"N.	c #262C3A",
-"O.	c #4A525F",
-"P.	c #5D6773",
-"Q.	c #5E6874",
-"R.	c #48505D",
-"S.	c #222635",
-"T.	c #616C78",
-"U.	c #222636",
-"V.	c #5E6875",
-"W.	c #49515E",
-"X.	c #4B5360",
-"Y.	c #242838",
-"Z.	c #5B6571",
-"`.	c #5C6672",
-" +	c #242938",
-".+	c #4B5460",
-"++	c #505966",
-"@+	c #272D3C",
-"#+	c #232736",
-"$+	c #545E69",
-"%+	c #555E6B",
-"&+	c #252A39",
-"*+	c #2D3241",
-"=+	c #59636F",
-"-+	c #656F7B",
-";+	c #363C4A",
-">+	c #383F4D",
-",+	c #39404E",
-"'+	c #727F89",
-")+	c #414956",
-"!+	c #6F7A86",
-"~+	c #49545D",
-"{+	c #6E7A84",
-"]+	c #5B6672",
-"^+	c #2D3341",
-"/+	c #262A39",
-"(+	c #5A636F",
-"_+	c #5B6572",
-":+	c #272B3A",
-"<+	c #2B3140",
-"[+	c #75828C",
-"}+	c #76828C",
-"|+	c #353C4A",
-"1+	c #6E7985",
-"2+	c #7A8692",
-"3+	c #7B8894",
-"4+	c #373E4C",
-"5+	c #48515E",
-"6+	c #454D5A",
-"7+	c #404754",
-"8+	c #74808C",
-"9+	c #9EAEBD",
-"0+	c #A7B7C7",
-"a+	c #A3B3C1",
-"b+	c #414A57",
-"c+	c #444B59",
-"d+	c #717E88",
-"e+	c #6B7883",
-"f+	c #252939",
-"g+	c #555F6C",
-"h+	c #555D6B",
-"i+	c #545D6B",
-"j+	c #565F6D",
-"k+	c #3C4352",
-"l+	c #1F2333",
-"m+	c #383E4C",
-"n+	c #4B5561",
-"o+	c #4C5562",
-"p+	c #424A57",
-"q+	c #333947",
-"r+	c #262C3B",
-"s+	c #242837",
-"t+	c #424A58",
-"u+	c #4E5664",
-"v+	c #67727E",
-"w+	c #626C78",
-"x+	c #5F6975",
-"y+	c #67737E",
-"z+	c #727D89",
-"A+	c #707C88",
-"                            . . . .                             ",
-"                  + @ . # $ $ $ $ $ $ # . @ +                   ",
-"                . . % & * = - ; > , = * & % . '                 ",
-"            ) ! ~ { ] ^ / ( _ ; ; _ ( / : ] { ~ ! .             ",
-"          . ! < [ } | 1 [ 2 3 4 5 6 7 8 } 9 } [ < ! .           ",
-"        . # 0 a | b 7 c d e f g g h i j k l m | a 0 # .         ",
-"      ) ! 0 n o 7 p q r s t u v v u w x y z A B C n 0 ! $       ",
-"      ! < a ; D E F G H I J K J J L J I H M N O P 1 a < !       ",
-"    . ~ [ Q R S T U V W X Y Z `  ...+. at .#.$.%.&.*.=.-.[ ~ @     ",
-"  + . { ;.9 >.,.'.H ).!.; ~.{.].].^./.; (._.:.<.[.}.|.;.{ . +   ",
-"  @ % ] 1.2.3.4.5.6.7.8.1 9.{.0.].a.D } b.c.d.e.f.g.h.1.] % i.  ",
-"  . & j.C k.l.m.n.o.p.q.} 9.{.0.].a.D } 1.r.s.t.u.v.w.C j.& .   ",
-"  # * | C x.y.z.A.B.C.1.} 9.{.0.].a.D } D.E.F.G.H.y.I.C | * #   ",
-"  $ = D.Q J.F.e K.i x.C } 9.{.0.].a.D } C L.i M.i N.J.Q D.= $   ",
-". $ , C -.O.e F.B.i P.C } 9.{.0.].a.D } C Q.i B.F.e O.-.C , $ @ ",
-". $ 1 ; D.R.S.F.B.S.k.C } 9.{.0.].a.D } C T.S.B.F.U.R.1.; 1 $ . ",
-". $ 1 ; D.t i F.B.U.V.C } 9.{.0.].a.D } C T.S.B.F.i W.D.; 1 $ . ",
-". $ , C -.X.Y.F.B.i Z.C } 9.{.0.].a.D } C `.i B.F. +.+-.C , $ @ ",
-"  $ = D.Q ++ at +F.B.#+$+C } 9.{.0.].a.D } C %+i B.F. at +++Q D.= $   ",
-"  # * | C u j &+B. +R.1.} 9.{.0.].a.D } 1.R. +B.&+*+=+C | * #   ",
-"  . & j.C -+;+&+B.&+>+1.} 9.{.0.].a.D } 1.,+&+B.&+g.(.'+j.& .   ",
-"  # % ] D.1 c F.F.F.).2.} 9.{.0.].a.D 1 2.).F.F.F.)+!+1.] % #   ",
-"  ~+. { {+| ]+^+/+B.F.(+; 9.{.0.].^.D ; _+:+F.F.<+2 [+{+{ . )   ",
-"    . ~ [ C }+.+B.F. +|+1+2+{.0.<.^.3+;.4+ +F.B.5+| C [ ~ .     ",
-"      ! < a C C 6+y. + +7+8+9+V 0+a+( b+ + +y.c+d+C a < !       ",
-"      . ! 0 e+Q 1 4 3.f+x >+g+h+i+j+k+l+F.m+n+; Q e+0 ! $       ",
-"        . # 0 a Q D.-+o+p+q+r+s+s+B.q+t+u+v+1.Q a 0 # .         ",
-"          . ! < [ ;.1.D.; v+w+x+x+T.y+z+D.1.;.[ < ! .           ",
-"            . ! ~ { ] j.|.9 | -.-.q.9 |.j.] { ~ ! $             ",
-"                . . % & * = , A+1 , = * & % . '                 ",
-"                  . . . # $ $ $ $ $ $ # . . .                   ",
-"                            . . . .                             "};

Modified: packages/openteacher/trunk/debian/rules
===================================================================
--- packages/openteacher/trunk/debian/rules	2012-05-05 05:31:06 UTC (rev 8624)
+++ packages/openteacher/trunk/debian/rules	2012-05-05 05:40:45 UTC (rev 8625)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
+DESTDIR = $(CURDIR)/debian/openteacher
+pork=$(DESTDIR)/usr/share/openteacher*.egg-info
+beef=$(DESTDIR)/usr/share/openteacher
 
-pork=$(CURDIR)/debian/openteacher/usr/share/openteacher*.egg-info
-beef=$(CURDIR)/debian/openteacher/usr/share/openteacher
-
 %:
 	dh $@ --with python2
 
@@ -13,6 +13,9 @@
 override_dh_auto_install:
 	dh_auto_install -- --install-scripts=/usr/share \
 	--install-lib=/usr/share
+	mkdir -p $(DESTDIR)/usr/share/pixmaps
+	convert $(CURDIR)/icons/openteacher-icon.png -resize 32 \
+			$(DESTDIR)/usr/share/pixmaps/openteacher.xpm; \
 
 override_dh_install:
 	mv $(pork) $(beef)

Modified: packages/openteacher/trunk/debian/watch
===================================================================
--- packages/openteacher/trunk/debian/watch	2012-05-05 05:31:06 UTC (rev 8624)
+++ packages/openteacher/trunk/debian/watch	2012-05-05 05:40:45 UTC (rev 8625)
@@ -1,3 +1,3 @@
 version=3
 
-http://launchpad.net/openteacher/+download http://launchpad.net/openteacher/.*/openteacher-(.+).tar.gz
+https://launchpad.net/openteacher/+download https://launchpad.net/openteacher/.*/openteacher-(.+).tar.gz




More information about the Python-apps-commits mailing list