diff -u pgdesigner-1.2.9/debian/dirs pgdesigner-1.2.9/debian/dirs --- pgdesigner-1.2.9/debian/dirs +++ pgdesigner-1.2.9/debian/dirs @@ -2,0 +3,2 @@ +usr/share/applications +usr/share/pixmaps diff -u pgdesigner-1.2.9/debian/rules pgdesigner-1.2.9/debian/rules --- pgdesigner-1.2.9/debian/rules +++ pgdesigner-1.2.9/debian/rules @@ -38,6 +38,8 @@ install -m 644 *.class *.form *.module $(DESTDIR) install -m 644 .directory .icon.png .project .settings $(DESTDIR) cp -r images .gambas .icon .lang $(DESTDIR) + install -m 755 debian/pgdesigner.desktop $(CURDIR)/debian/pgdesigner/usr/share/applications + install -m 755 debian/pgdesigner.xpm $(CURDIR)/debian/pgdesigner/usr/share/pixmaps # Build architecture-dependent files here. diff -u pgdesigner-1.2.9/debian/changelog pgdesigner-1.2.9/debian/changelog --- pgdesigner-1.2.9/debian/changelog +++ pgdesigner-1.2.9/debian/changelog @@ -1,3 +1,10 @@ +pgdesigner (1.2.9-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #333286) + - Added .desktop file and icon. + + -- Ilya Barygin Wed, 03 Jun 2009 19:32:55 +0400 + pgdesigner (1.2.9-1) unstable; urgency=low * New Upstream Version @@ -12,6 +19,13 @@ -- Pierre Chifflier Mon, 04 Aug 2008 14:19:28 +0200 +pgdesigner (1.2.7-1ubuntu1) jaunty; urgency=low + + * Added .desktop file and icon. (LP:# 315411) + * Desktop file now use and icon that is installed by pgdesigner. + + -- Gabriel Ruiz Manzano Wed, 18 Feb 2009 17:06:17 -0300 + pgdesigner (1.2.7-1) unstable; urgency=low * New upstream release @@ -33,0 +48 @@ + diff -u pgdesigner-1.2.9/debian/control pgdesigner-1.2.9/debian/control --- pgdesigner-1.2.9/debian/control +++ pgdesigner-1.2.9/debian/control @@ -1,7 +1,8 @@ Source: pgdesigner Section: misc Priority: extra -Maintainer: Pierre Chifflier +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Pierre Chifflier Build-Depends: debhelper (>= 7) Standards-Version: 3.8.1 only in patch2: unchanged: --- pgdesigner-1.2.9.orig/debian/pgdesigner.xpm +++ pgdesigner-1.2.9/debian/pgdesigner.xpm @@ -0,0 +1,346 @@ +/* XPM */ +static char * pgdesigner_xpm[] = { +"32 32 311 2", +" c None", +". c #A89887", +"+ c #A59585", +"@ c #A29382", +"# c #9F8F7F", +"$ c #9D8E7D", +"% c #9F907F", +"& c #9D8E7E", +"* c #A49583", +"= c #DECCB7", +"- c #EBDBC7", +"; c #EADAC6", +"> c #E7D8C4", +", c #E4D4C4", +"' c #D2C2B7", +") c #AB9A89", +"! c #A29380", +"~ c #DDCBB5", +"{ c #EADBC7", +"] c #E9DAC6", +"^ c #E6D7C4", +"/ c #E2D2C2", +"( c #D1C0B5", +"_ c #AD9D8B", +": c #958676", +"< c #988877", +"[ c #B5A896", +"} c #CFC2AF", +"| c #827882", +"1 c #7A707A", +"2 c #9C919B", +"3 c #D5C8B6", +"4 c #D0C3B9", +"5 c #8E8073", +"6 c #948573", +"7 c #B4A795", +"8 c #CFC1AF", +"9 c #766C76", +"0 c #7E7480", +"a c #9D919C", +"b c #D0C3B3", +"c c #DCCFC4", +"d c #A6978C", +"e c #877969", +"f c #8A7C69", +"g c #AC9E8B", +"h c #C6B8A3", +"i c #5E5457", +"j c #584F43", +"k c #51493D", +"l c #80747A", +"m c #CDBFAA", +"n c #817576", +"o c #675C4E", +"p c #817361", +"q c #847664", +"r c #847663", +"s c #817462", +"t c #AB9C8A", +"u c #5E5456", +"v c #595044", +"w c #554C41", +"x c #50483E", +"y c #534A4F", +"z c #B0A29A", +"A c #CCBEB1", +"B c #857870", +"C c #7D705D", +"D c #A49680", +"E c #BDAF98", +"F c #5E5555", +"G c #736763", +"H c #C7B8A1", +"I c #766C5E", +"J c #584F41", +"K c #8D7E69", +"L c #BAA89B", +"M c #C5B59D", +"N c #B6A598", +"O c #9B8A75", +"P c #C7B69C", +"Q c #A29383", +"R c #766957", +"S c #6E6351", +"T c #A0927D", +"U c #BEAF98", +"V c #5E5554", +"W c #594F41", +"X c #695E5D", +"Y c #C2B49C", +"Z c #928580", +"` c #6B604F", +" . c #726552", +".. c #9A8B74", +"+. c #B4A58C", +"@. c #574E4D", +"#. c #443C31", +"$. c #7F726E", +"%. c #BDAD94", +"&. c #625858", +"*. c #53493B", +"=. c #786A58", +"-. c #BFAF9E", +";. c #B1A28E", +">. c #776C73", +",. c #8A7E82", +"'. c #B5A695", +"). c #C2B499", +"!. c #827570", +"~. c #5C5242", +"{. c #5C5241", +"]. c #948670", +"^. c #B4A58B", +"/. c #564D4C", +"(. c #5D5242", +"_. c #A89A94", +":. c #A49691", +"<. c #594F3F", +"[. c #665A46", +"}. c #908168", +"|. c #AB9C7F", +"1. c #574C4A", +"2. c #594E3D", +"3. c #6B5F4F", +"4. c #AD9D8A", +"5. c #9B8C7B", +"6. c #3F3836", +"7. c #544A39", +"8. c #948579", +"9. c #AB9A80", +"0. c #484043", +"a. c #443C2F", +"b. c #473E30", +"c. c #5C5151", +"d. c #AD9E81", +"e. c #796D66", +"f. c #4D4435", +"g. c #4C4334", +"h. c #897B63", +"i. c #AA9A7E", +"j. c #4F4644", +"k. c #544A3A", +"l. c #94857B", +"m. c #A6977F", +"n. c #4C4233", +"o. c #5C513C", +"p. c #85765C", +"q. c #A69676", +"r. c #99897C", +"s. c #A19181", +"t. c #A9987F", +"u. c #8C7D6D", +"v. c #423A39", +"w. c #3A3325", +"x. c #4E4432", +"y. c #A09082", +"z. c #817470", +"A. c #403829", +"B. c #504634", +"C. c #71655C", +"D. c #3F3729", +"E. c #7D7056", +"F. c #9F8F70", +"G. c #49403D", +"H. c #514634", +"I. c #8C7C6F", +"J. c #998A70", +"K. c #443B2C", +"L. c #554934", +"M. c #7E7052", +"N. c #978764", +"O. c #584E40", +"P. c #4C4236", +"Q. c #403840", +"R. c #312A25", +"S. c #352E20", +"T. c #473E2C", +"U. c #9E8E6D", +"V. c #6E6158", +"W. c #3A3223", +"X. c #493E2C", +"Y. c #9F8E6A", +"Z. c #6C6054", +"`. c #383122", +" + c #372F22", +".+ c #75684C", +"++ c #988765", +"@+ c #443C38", +"#+ c #524732", +"$+ c #908074", +"%+ c #86776B", +"&+ c #3F3727", +"*+ c #574B35", +"=+ c #827353", +"-+ c #9C8C68", +";+ c #483E3A", +">+ c #383022", +",+ c #2F291C", +"'+ c #4B402D", +")+ c #A08F71", +"!+ c #75685D", +"~+ c #3E3526", +"{+ c #4A402C", +"]+ c #A4936D", +"^+ c #6F6256", +"/+ c #362F20", +"(+ c #776A4E", +"_+ c #9D8D68", +":+ c #463C38", +"<+ c #625642", +"[+ c #A69475", +"}+ c #6C6056", +"|+ c #403727", +"1+ c #5B4F37", +"2+ c #867657", +"3+ c #A2916B", +"4+ c #4B413C", +"5+ c #4D422F", +"6+ c #938375", +"7+ c #928275", +"8+ c #493F2C", +"9+ c #453C29", +"0+ c #6A5C4C", +"a+ c #AD9C74", +"b+ c #716457", +"c+ c #393122", +"d+ c #383021", +"e+ c #7B6D50", +"f+ c #A2906B", +"g+ c #403827", +"h+ c #60533A", +"i+ c #968475", +"j+ c #9C8B6A", +"k+ c #463E3C", +"l+ c #3C3424", +"m+ c #5F5339", +"n+ c #8A7B5A", +"o+ c #A6946F", +"p+ c #4E453E", +"q+ c #4D422E", +"r+ c #6B5E54", +"s+ c #AA9872", +"t+ c #8A7B6E", +"u+ c #746658", +"v+ c #8A7A68", +"w+ c #A19080", +"x+ c #AB9A73", +"y+ c #706454", +"z+ c #7F7152", +"A+ c #AB9973", +"B+ c #6B5E5B", +"C+ c #706253", +"D+ c #756658", +"E+ c #877768", +"F+ c #A5947A", +"G+ c #A49370", +"H+ c #544A4C", +"I+ c #463C2A", +"J+ c #64573C", +"K+ c #847655", +"L+ c #9A8A66", +"M+ c #504540", +"N+ c #534731", +"O+ c #665A58", +"P+ c #938471", +"Q+ c #A19070", +"R+ c #7F716A", +"S+ c #49403A", +"T+ c #B19F77", +"U+ c #6A5E48", +"V+ c #3A3323", +"W+ c #3B3324", +"X+ c #796C4F", +"Y+ c #9E8D69", +"Z+ c #A3926D", +"`+ c #A49470", +" @ c #968674", +".@ c #6D615B", +"+@ c #443B3C", +"@@ c #473E2B", +"#@ c #5C5138", +"$@ c #5C4F37", +"%@ c #5B5037", +"&@ c #453C2A", +"*@ c #3D3524", +"=@ c #443B28", +"-@ c #716355", +";@ c #B6A37B", +">@ c #5A4F4C", +",@ c #3D3625", +"'@ c #8A7861", +")@ c #A59376", +"!@ c #8D7C6B", +"~@ c #82725F", +"{@ c #91806D", +"]@ c #B9A886", +"^@ c #968771", +"/@ c #3E362C", +"(@ c #716456", +"_@ c #8E7F78", +":@ c #A6957B", +"<@ c #AE9E77", +"[@ c #A1917A", +"}@ c #70645D", +"|@ c #3E3633", +"1@ c #695C40", +"2@ c #594D36", +"3@ c #4B412E", +"4@ c #443B29", +"5@ c #433A28", +"6@ c #3F3626", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" . + @ # $ . + @ % & ", +"* = - ; > , ' ) ! ~ { ] > ^ / ( _ : ", +"< [ } | 1 2 3 4 5 6 7 8 | 9 0 a b c d e ", +"f g h i j k l m n o p q r s t h u v w x y z A B ", +"C D E F G H I J K L M N O P Q R S T U V W X Y Z ` ", +" ...+.@. #.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./. (._.:.<. ", +"[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j. k.l.m.n. ", +"o.p.q.r.s.t.u.v.w.x.y.z.A. B.q.C.A.D.E.F.G. H.I.J.K. ", +"L.M.N.O.P.Q.R.S. T.U.V.W. X.Y.Z.`. +.+++@+ #+$+%+&+ ", +"*+=+-+;+>+,+ '+)+!+~+ {+]+^+>+/+(+_+:+ <+[+}+|+ ", +"1+2+3+4+ 5+6+7+8+ 9+0+a+b+c+d+e+f+;+ g+h+i+j+k+l+ ", +"m+n+o+p+ q+r+s+t+u+v+w+x+y+W.c+z+A+B+C+D+E+F+G+H+I+ ", +"J+K+L+M+ N+O+P+Q+R+S+T+U+V+W+X+Y+Z+o+`+ @.@+@@@ ", +" #@8+#+ $@%@&@*@=@-@;@>@c+ 8+W+l+l+,@|+@@@@ ", +" '@)@!@~@{@]@^@/@ ", +" (@_@:@<@[@}@|@*@ ", +" 1@2@3@4@5@@@6@ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; only in patch2: unchanged: --- pgdesigner-1.2.9.orig/debian/pgdesigner.desktop +++ pgdesigner-1.2.9/debian/pgdesigner.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=pgDesigner +Exec=pgdesigner +Icon=pgdesigner +Comment=Graphical database designer for PostgreSQL +Terminal=false +Type=Application +Categories=Database;System;Development;