diff -u bookmarkbridge-0.76/debian/control bookmarkbridge-0.76/debian/control --- bookmarkbridge-0.76/debian/control +++ bookmarkbridge-0.76/debian/control @@ -1,7 +1,8 @@ Source: bookmarkbridge Section: x11 Priority: optional -Maintainer: Masami Ichikawa +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Masami Ichikawa Uploaders: Bartosz Fenski Build-Depends: debhelper (>= 4.0.0), libxinerama-dev, libqt4-dev, libxml2-dev, qt4-dev-tools, dpatch, pkg-config Standards-Version: 3.7.3 diff -u bookmarkbridge-0.76/debian/rules bookmarkbridge-0.76/debian/rules --- bookmarkbridge-0.76/debian/rules +++ bookmarkbridge-0.76/debian/rules @@ -79,6 +79,10 @@ mv $(CURDIR)/debian/bookmarkbridge/usr/share/doc/bookmarkbridge/*.png $(CURDIR)/debian/bookmarkbridge/usr/share/doc/bookmarkbridge/html/. + # install .desktop file and icon + install -m 0644 debian/bookmarkbridge.xpm $(CURDIR)/debian/bookmarkbridge/usr/share/pixmaps + install -m 0644 debian/bookmarkbridge.desktop $(CURDIR)/debian/bookmarkbridge/usr/share/applications + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. diff -u bookmarkbridge-0.76/debian/dirs bookmarkbridge-0.76/debian/dirs --- bookmarkbridge-0.76/debian/dirs +++ bookmarkbridge-0.76/debian/dirs @@ -2,0 +3,2 @@ +usr/share/applications +usr/share/pixmaps diff -u bookmarkbridge-0.76/debian/changelog bookmarkbridge-0.76/debian/changelog --- bookmarkbridge-0.76/debian/changelog +++ bookmarkbridge-0.76/debian/changelog @@ -1,3 +1,19 @@ +bookmarkbridge (0.76-2.2ubuntu1) lucid; urgency=low + + * Merge from Debian unstable (Closes: 513949), remaining Ubuntu changes: + + debian/bookmarkbridge.xpm: + - Provide an icon. + + debian/bookmarkbridge.desktop: + - Provide a .desktop file. + + debian/dirs: + - Create /usr/share/applications and /usr/share/pixmaps. + + debian/rules: + - Install icon and .desktop file. + + debian/control: + - Update Maintainer field as per spec. + + -- Brian Thomason Thu, 28 Jan 2010 15:08:14 -0500 + bookmarkbridge (0.76-2.2) unstable; urgency=low * Non-maintainer upload. only in patch2: unchanged: --- bookmarkbridge-0.76.orig/debian/bookmarkbridge.xpm +++ bookmarkbridge-0.76/debian/bookmarkbridge.xpm @@ -0,0 +1,289 @@ +/* XPM */ +static char * bookmarkbridge_xpm[] = { +"32 32 254 2", +" c #FFFFFF", +". c #FCF5F4", +"+ c #FCF6F5", +"@ c #FEFDFC", +"# c #D4625A", +"$ c #F5DAD8", +"% c #FDF9F8", +"& c #D36158", +"* c #FDF7F7", +"= c #EBB8B4", +"- c #D8726B", +"; c #E49C96", +"> c #D8726A", +", c #E7A8A3", +"' c #F8E7E6", +") c #D8736C", +"! c #E39A95", +"~ c #E6A5A0", +"{ c #F3D5D3", +"] c #FEFAF9", +"^ c #E08F89", +"/ c #E5A29D", +"( c #DF8C86", +"_ c #F4D6D4", +": c #FCF3F3", +"< c #DA7A73", +"[ c #E39A94", +"} c #F1CBC9", +"| c #E1928C", +"1 c #FFFEFE", +"2 c #E8ADA8", +"3 c #EFC6C3", +"4 c #D4665E", +"5 c #F9E9E8", +"6 c #F8E5E4", +"7 c #D77169", +"8 c #EBB5B1", +"9 c #E6A5A1", +"0 c #F1CDCA", +"a c #E49D98", +"b c #EEC3C0", +"c c #FBF1F1", +"d c #DB7F78", +"e c #F0C8C6", +"f c #E5A09B", +"g c #D8746D", +"h c #F5D9D7", +"i c #FEFBFB", +"j c #D4655D", +"k c #EAB3AF", +"l c #F0CAC8", +"m c #F1CCCA", +"n c #FCF4F4", +"o c #DF8E88", +"p c #EDBCB9", +"q c #E49E9A", +"r c #EFC4C1", +"s c #D87169", +"t c #E8ABA7", +"u c #FDF8F7", +"v c #F3D3D1", +"w c #EAB2AE", +"x c #E8ACA8", +"y c #DF8A84", +"z c #EFC5C2", +"A c #DD847D", +"B c #EFC6C4", +"C c #DC827B", +"D c #D56860", +"E c #EFC7C4", +"F c #F5DCDA", +"G c #D76F67", +"H c #EAB4B0", +"I c #ECBBB7", +"J c #E49C97", +"K c #DB7E77", +"L c #E39B96", +"M c #D66C64", +"N c #ECBAB7", +"O c #E39994", +"P c #D66A62", +"Q c #F2D0CD", +"R c #DD827C", +"S c #BF1A0D", +"T c #CE4C42", +"U c #D5675F", +"V c #D15950", +"W c #D36057", +"X c #D0554C", +"Y c #CF5047", +"Z c #D5665D", +"` c #D0574E", +" . c #C93D33", +".. c #D76E66", +"+. c #D0544B", +"@. c #CF5249", +"#. c #D4635A", +"$. c #D5685F", +"%. c #D1584F", +"&. c #C01B0F", +"*. c #D66961", +"=. c #DF8B84", +"-. c #BD1003", +";. c #D9776F", +">. c #E7A7A3", +",. c #BD1104", +"'. c #F3D4D2", +"). c #F8F8F8", +"!. c #D4D4D4", +"~. c #F2F2F2", +"{. c #C8C8C8", +"]. c #FAECEC", +"^. c #BF180B", +"/. c #E9AFAA", +"(. c #C22418", +"_. c #A1A1A1", +":. c #787878", +"<. c #FDFDFD", +"[. c #BABABA", +"}. c #E8E8E8", +"|. c #F4F4F4", +"1. c #C93A2F", +"2. c #F7E3E2", +"3. c #C3271B", +"4. c #505050", +"5. c #464646", +"6. c #BCBCBC", +"7. c #EAEAEA", +"8. c #FEFEFE", +"9. c #676767", +"0. c #808080", +"a. c #A3A3A3", +"b. c #CA3E34", +"c. c #F9E8E7", +"d. c #878787", +"e. c #7E7E7E", +"f. c #F0F0F0", +"g. c #B6B6B6", +"h. c #939393", +"i. c #FAFAFA", +"j. c #3C3C3C", +"k. c #616161", +"l. c #FBFBFB", +"m. c #A6A6A6", +"n. c #5F5F5F", +"o. c #ACACAC", +"p. c #656565", +"q. c #525252", +"r. c #767676", +"s. c #595959", +"t. c #868686", +"u. c #797979", +"v. c #A9A9A9", +"w. c #C2C2C2", +"x. c #D7D7D7", +"y. c #858585", +"z. c #FCFCFC", +"A. c #E9E9E9", +"B. c #888888", +"C. c #4B4B4B", +"D. c #777777", +"E. c #686868", +"F. c #7F7F7F", +"G. c #474747", +"H. c #929292", +"I. c #424242", +"J. c #8F8F8F", +"K. c #757575", +"L. c #9D9D9D", +"M. c #4A4A4A", +"N. c #A4A4A4", +"O. c #B5B5B5", +"P. c #7B7B7B", +"Q. c #909090", +"R. c #898989", +"S. c #5E5E5E", +"T. c #8B8B8B", +"U. c #747474", +"V. c #9A9A9A", +"W. c #989898", +"X. c #6A6A6A", +"Y. c #7C7C7C", +"Z. c #9F9F9F", +"`. c #8C8C8C", +" + c #A5A5A5", +".+ c #999999", +"++ c #A0A0A0", +"@+ c #9E9E9E", +"#+ c #828282", +"$+ c #3E3E3E", +"%+ c #F9F9F9", +"&+ c #555555", +"*+ c #9B9B9B", +"=+ c #323232", +"-+ c #575757", +";+ c #D0D0D0", +">+ c #727272", +",+ c #A7A7A7", +"'+ c #EEEEEE", +")+ c #979797", +"!+ c #BBBBBB", +"~+ c #E0E0E0", +"{+ c #F6F6F6", +"]+ c #262626", +"^+ c #4D4D4D", +"/+ c #393939", +"(+ c #3F3F3F", +"_+ c #F1F1F1", +":+ c #818181", +"<+ c #DDDDDD", +"[+ c #DCDCDC", +"}+ c #CDCDCD", +"|+ c #D2D2D2", +"1+ c #B7B7B7", +"2+ c #B1B1B1", +"3+ c #DFDFDF", +"4+ c #A2A2A2", +"5+ c #C9C9C9", +"6+ c #A8A8A8", +"7+ c #E7E7E7", +"8+ c #AEAEAE", +"9+ c #C7342A", +"0+ c #9C9C9C", +"a+ c #959595", +"b+ c #626262", +"c+ c #666666", +"d+ c #5D5D5D", +"e+ c #B9B9B9", +"f+ c #E3E3E3", +"g+ c #CD4A41", +"h+ c #F9EAE9", +"i+ c #DE8781", +"j+ c #AAAAAA", +"k+ c #949494", +"l+ c #C4C4C4", +"m+ c #636363", +"n+ c #707070", +"o+ c #333333", +"p+ c #E5A19C", +"q+ c #F3D4D1", +"r+ c #565656", +"s+ c #585858", +"t+ c #D9D9D9", +"u+ c #363636", +"v+ c #F9EBEA", +"w+ c #FEFCFC", +"x+ c #6B6B6B", +"y+ c #D1D1D1", +"z+ c #FEFDFD", +"A+ c #F7F7F7", +"B+ c #8E8E8E", +"C+ c #B8B8B8", +"D+ c #232323", +"E+ c #ADADAD", +" . + ", +" @ # $ % & * ", +" = - ; = > , ", +" ' ) ! ~ { ] ^ / ( _ ", +" : < / [ } | 1 2 = / 3 4 5 ", +" 6 7 8 9 [ 0 a b c d 0 / e f g h ", +" i = j k l 9 [ 0 m > n o p 0 / e q r s t u ", +" v g > w 0 l 9 [ 0 0 x y 1 z A 0 0 / e q 0 B C D E 1 ", +" F - G H x I 0 l 9 [ 0 0 I J K L M N 0 0 / e q 0 0 b O d P Q ", +"R S T U D V W D U X Y D M Z - ` ...W D D +.Z @.D D #.X $.%.&.*.", +"=.-.;.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.y -.s ", +"0 ,.'. ). !.~. {. ].^./.", +"i (.@ _.:.<. [.}. |. _. 1.2.", +" 3. 4.5.}. 6.7.8. 9.0. 8. a. b.c.", +" 3. d.e.~.f.f.g.h.}. i.j.k.8.g.l.m. <. b.c.", +" 3. 0.n.o.p.q.r.s.i. 8.t.u.v.w.x.y.z.A.B. b.c.", +" 3. h.C.D.B.E.q.F. G.H.I.e.J.K.L.t.M.z. b.c.", +" 3. N.O.P.Q._.5.B. R.S.T.U.V.W.:.X.Y.f. b.c.", +" 3. Z.a.`.Y.Y.r.R.8. +.+m.++@+#+T.C.$+%+ b.c.", +" 3. C.&+u.*+=+Z.h.7. l.H.F.N.++D.p.K.-+;+i. b.c.", +" 3. >+O.,+'+)+!+~+{+ |.]+R._.L.^+D./+F.(+|. b.c.", +" 3. _+ i. !.:+f.<+[+}+|+Y.1+t. b.c.", +" 3. 2+ 3+ 4+z. ).5+{.8. b.c.", +" 3. T.{+.+ 6+z. 7+n.!. b.c.", +" 3. T.;+:+;+|+'+++8+ 8./+'+ b.c.", +" 9+ 0+a+D.b+c+d+4.e+ f+ g+h+", +" i+ j+b+k+l+m+n+o+z. p+: ", +" q+ 6+r+v.s+-+t+u+%+ v+w+", +" n ,+L.a.e.k.7.x+y+ z+ ", +" 1 a.A+B+0.q.f.h.V. ", +" C+ L.D+#+).E+y+ ", +" z. ).x.l. %+ "}; only in patch2: unchanged: --- bookmarkbridge-0.76.orig/debian/bookmarkbridge.desktop +++ bookmarkbridge-0.76/debian/bookmarkbridge.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Bookmarkbridge +Comment=Synchronize bookmarks between browsers +Exec=bookmarkbridge +Icon=bookmarkbridge +Type=Application +Categories=Utility;