retitle please merge ubuntu patches thanks I attached the debdiff to the ubuntu package to this email. Please consider applying. The bugnumbers refer to the malone bugtracking system:
http://launchpad.net/malone/bugs/3262 http://launchpad.net/malone/bugs/2925 -- Reinhard Tartler <[EMAIL PROTECTED]>
diff -u rbscrobbler-0.0.9r/debian/changelog rbscrobbler-0.0.9r/debian/changelog
--- rbscrobbler-0.0.9r/debian/changelog
+++ rbscrobbler-0.0.9r/debian/changelog
@@ -1,3 +1,53 @@
+rbscrobbler (0.0.9r-1ubuntu6) dapper; urgency=low
+
+ * apply match from Malone #3262. try iso8851 for
+ encoding format first before failing horribly.
+
+ -- Reinhard Tartler <[EMAIL PROTECTED]> Wed, 21 Dec 2005 19:06:38 +0100
+
+rbscrobbler (0.0.9r-1ubuntu5) breezy; urgency=low
+
+ * debian/icon-[online,offline].png.uu:
+ - Exchange Josh Zenker (supermetroid)'s icons for
+ the ones improved by Brian Gurtler.
+ * debian/control:
+ - Bumped Standards-Version (thanks lintian).
+
+ -- Christian Bjälevik <[EMAIL PROTECTED]> Sun, 9 Oct 2005 14:37:02 +0200
+
+rbscrobbler (0.0.9r-1ubuntu4) breezy; urgency=low
+
+ * 01_password-enter.dpatch:
+ + Closes Malone #2925:
+ - Connect the activate event of the password field with the
+ btnOk_clicked callback
+
+ -- Sebastian Dröge <[EMAIL PROTECTED]> Sat, 8 Oct 2005 17:19:27 +0200
+
+rbscrobbler (0.0.9r-1ubuntu3) breezy; urgency=low
+
+ * debian/icon-[online,offline].png.uu:
+ - Added two new icons found on audioscrobbler,
+ created by supermetroid.
+ * debian/control, debian/rules:
+ - Added sharutils to build-depends.
+ - Modified rules to copy the new icons.
+
+ -- Christian Bjälevik <[EMAIL PROTECTED]> Fri, 2 Sep 2005 05:26:47 +0200
+
+rbscrobbler (0.0.9r-1ubuntu2) breezy; urgency=low
+
+ * Rebuild with the new rythmbox.
+
+ -- Sebastien Bacher <[EMAIL PROTECTED]> Thu, 7 Jul 2005 14:56:17 +0200
+
+rbscrobbler (0.0.9r-1ubuntu1) breezy; urgency=low
+
+ * Patch to build on Ubuntu where Python 2.4 is the default
+ (thanks to Colin Watson and Timo Aaltonen).
+
+ -- Hervé Cauwelier <[EMAIL PROTECTED]> Sat, 4 Jun 2005 15:37:27 +0200
+
rbscrobbler (0.0.9r-1) unstable; urgency=low
* New upstream release 0.0.9. (With minor munge.)
diff -u rbscrobbler-0.0.9r/debian/control rbscrobbler-0.0.9r/debian/control
--- rbscrobbler-0.0.9r/debian/control
+++ rbscrobbler-0.0.9r/debian/control
@@ -2,8 +2,8 @@
Section: sound
Priority: optional
Maintainer: Joey Hess <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4), python, python-gnome2-dev, python-gtk2-dev, pkg-config, libgtk2.0-dev, python-dev
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 4), python, python-gnome2-dev, python-gtk2-dev, pkg-config, libgtk2.0-dev, python-dev, sharutils, dpatch
+Standards-Version: 3.6.2.1
Package: rbscrobbler
Architecture: any
diff -u rbscrobbler-0.0.9r/debian/rules rbscrobbler-0.0.9r/debian/rules
--- rbscrobbler-0.0.9r/debian/rules
+++ rbscrobbler-0.0.9r/debian/rules
@@ -1,16 +1,21 @@
#!/usr/bin/make -f
-build: build-stamp
+#include dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+build: patch-stamp build-stamp
build-stamp:
dh_testdir
$(MAKE) PREFIX=/usr
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp
-$(MAKE) clean
+ rm -f debian/icon-offline.png
+ rm -f debian/icon-online.png
dh_clean
install: build
@@ -19,6 +24,8 @@
dh_clean -k
dh_installdirs usr/bin
$(MAKE) PREFIX=/usr DESTDIR=`pwd`/debian/`dh_listpackages`/ install
+ uudecode debian/icon-offline.png.uu && mv icon-offline.png debian/rbscrobbler/usr/share/rbscrobbler/images
+ uudecode debian/icon-online.png.uu && mv icon-online.png debian/rbscrobbler/usr/share/rbscrobbler/images
binary-indep: build install
only in patch2:
unchanged:
--- rbscrobbler-0.0.9r.orig/Audioscrobbler.py
+++ rbscrobbler-0.0.9r/Audioscrobbler.py
@@ -308,4 +308,7 @@
def encode(self, input):
if (type(input) == types.UnicodeType):
return(urllib.quote_plus(input))
- return(urllib.quote_plus(unicode(input, 'iso-8859-1')))
+ try:
+ return(urllib.quote_plus(unicode(input, 'iso-8859-1')))
+ except KeyError:
+ return(urllib.quote_plus(input))
only in patch2:
unchanged:
--- rbscrobbler-0.0.9r.orig/trayicon/Makefile
+++ rbscrobbler-0.0.9r/trayicon/Makefile
@@ -1,6 +1,6 @@
DEFS=`pkg-config --variable=defsdir pygtk-2.0`
-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.3/ -I. -fPIC
+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.4/ -I. -fPIC
LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
LIBS=eggtrayicon.o trayiconmodule.o trayicon.o trayicon.so
only in patch2:
unchanged:
--- rbscrobbler-0.0.9r.orig/debian/icon-offline.png.uu
+++ rbscrobbler-0.0.9r/debian/icon-offline.png.uu
@@ -0,0 +1,22 @@
+begin 644 icon-offline.png
+MB5!.1PT*&@[EMAIL PROTECTED]@````/"`8```#^I`_;````!F)+1T0`_P#_
+M`/[EMAIL PROTECTED]:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'[EMAIL PROTECTED]
[EMAIL PROTECTED]))1$%4.,NUE-U+DV$8QG^O;G.;[EMAIL PROTECTED]@J6>
+MZ(E-FD,([EMAIL PROTECTED]/(B0Z*"AS!X*D0;$#81!**BD(.9M65F2R)1,GSM&HS-S;
+M022)TS/OHYN'B^MZKOM+N&<TRNQB*!(]9EDL'"DO9[_-QFHDPM*;-WP>&&!Q
+M;FX3+MUDXGA-#6J#@<7)2=YYO?SZ^7,[EMAIL PROTECTED]<+JEA225BM5P&.7>
+MO22I5/R.Q1AH:.#3Z"@`>DGB<F\O6I.)[EMAIL PROTECTED]:>'P9LW^1&+;74@"`(7
+MKEW#VMS,BM_/>'L[\U-3*%0J#A<586MKH_31(R)V.TO!(/FUM>C,9IZ7EA*9
+MG^=,?3UB=O:6:FPXR"DHX)+7R]+8&/TN%]^6ES<!C0</4N7QL.SS\<SII.K!
+M`W2YN3RIK.3WVMJV/[EMAIL PROTECTED],:-+>0`X4"`CVXWF1459.3F$GKUBC2K
+M%4M9&[EMAIL PROTECTED]@(HO7N7Q>%AQA\_WO8WWT,ACC<TH-/K&>GH8(]6
+MR]GV=O*=3C(M%N1HE&@H1#P>[EMAIL PROTECTED]:-A-1+9<>3"@0!!CX?LRDKT!P[PHK65
+MEU>OLC`XB*FZFO*G3[$Y'(E+%)N=);VP$(52N:/(E-M-LD;#L>IJ9%EFVNO%
+MT]3TM]D^'R>N7T\L$.CO1V<VDU=<G)!8$`3TDL37Z6DB/A]'[EMAIL PROTECTED]/!YG
+M?F:&B3MW4$M28H&IOCY6_'Y*.CLY:;>C3DW=(-89#)R[<H6+]^\37U_G]>W;
+MI!B-V)S.#<<:422GK(S5<#CQ)D<6%O"[EMAIL PROTECTED],X-H9"JR7+;B?%
+M:.1M1P>R+/-A:(A#75U8FYO99[7R;6X.J;B8-*N5R;:V[3<90&<P4%!71Y[#
[EMAIL PROTECTED]>8TH<KZI"7-C(PI1Y'LPR/N'#_'U]6TZ%\)N
+;'[LD=CG^`+<*![5<CQ'7`````$E%3D2N0F""
+`
+end
only in patch2:
unchanged:
--- rbscrobbler-0.0.9r.orig/debian/icon-online.png.uu
+++ rbscrobbler-0.0.9r/debian/icon-online.png.uu
@@ -0,0 +1,22 @@
+begin 644 icon-online.png
+MB5!.1PT*&@[EMAIL PROTECTED]@````/"`8```#^I`_;````!F)+1T0`_P#_
+M`/[EMAIL PROTECTED]:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'[EMAIL PROTECTED]
[EMAIL PROTECTED])1$%4.,NUE-M+DW$<QC^O;FN;[ZJMEJ^'=3!<L\/LX`H*H2'8!"N[
+MT1N=M([EMAIL PROTECTED]:7>[EMAIL PROTECTED])A607PB"45$P(<C;M3"9;,G'BVVB49N[M
+M*DF<WOF]^O+CX7E^S_<DF!^8%;8Q5*D>;[EMAIL PROTECTED]>;/PAH$O`\S,
+MSZS#6?9:N';T&B:MB8GY"0+O`BS]7EJ'$?YWH%:I<3O<W#IU"TV:AMARC%WJ
+M76C2-"3^)[EMAIL PROTECTED]<`2$:)[BO=6/06XBMQ)*U$U]<N;@_>)O$KL=&!(`C4
+MGZ^GT=Y(Z'N(EE<M3,Y.HE%IN'#H`LV.9IXXG^"27406(E2>J,1JL.+L<S(K
+MSU)]NII<,7=#-=8<%!XH)'`YP-C"&-Y^+XL_%M<!]YOWX[_J)[EMAIL PROTECTED]//,PZ.K
[EMAIL PROTECTED]'^M)R5/RN;]B#M7U)94`G`S9&;&[EMAIL PROTECTED],O,8S0ZBGVW
+MG1);"2:#"[EMAIL PROTECTED]&X[[S/\/PP[:_:-_U-]&>4VJ.U&`U&6D=:T>_4
+MTW*F!<\)#[9L&W$E3C0>)9E,;[EMAIL PROTECTED]<A+\M;CEPX%L8?\5.>6TZ6,8NFYTU<
+M?W&=P;E!*BP5]);VXG:X4Y=H.C%-T=XBU"KUEB*^21^Z=!T5!14HBD)@*D"=
+MOPYGGY.@'[EMAIL PROTECTED]/U:#E>[EMAIL PROTECTED]@&26FODT1E([EMAIL PROTECTED](`R622
+M#[,?N#=^#TDKI1;HF>PA]#U$V\4V7,==9&@SUHA-!A,U9VMX>.DAJ\E5[KZ^
+MBWF'&8_#L^98U(F4'"@AMAQ+O<ES\AS>@)<V5QN^BSY")T.,S8^A5^EQY;@P
+M[S#3^K8515$8^CA$Q\$.&NV-V/?8F?DQ0[%4C'VWG>:)YLTW&<!D,%%56(4[
+MWTVF-I-5997IQ#2=GSKI'N]>FWE1)U)WKHX;UAN(*I'(SPB/WS^F)]BS[EP(
+<VWWLTMCF^`NV+@>U!:5YH0````!)14Y$KD)@@@``
+`
+end
only in patch2:
unchanged:
--- rbscrobbler-0.0.9r.orig/debian/patches/00list
+++ rbscrobbler-0.0.9r/debian/patches/00list
@@ -0,0 +1 @@
+01_password-enter.dpatch
only in patch2:
unchanged:
--- rbscrobbler-0.0.9r.orig/debian/patches/01_password-enter.dpatch
+++ rbscrobbler-0.0.9r/debian/patches/01_password-enter.dpatch
@@ -0,0 +1,15 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+
[EMAIL PROTECTED]@
+
+--- rbscrobbler-0.0.9r/rbscrobbler.py.old 2005-10-08 17:16:25.078562976 +0200
++++ rbscrobbler-0.0.9r/rbscrobbler.py 2005-10-08 17:17:06.006341008 +0200
+@@ -172,7 +172,7 @@
+ self.entPassword = gtk.Entry(25)
+ self.entPassword.set_visibility(False)
+ self.entPassword.set_sensitive(False)
+- self.entPassword.connect("activate", self.entPassword_activate)
++ self.entPassword.connect("activate", self.btnOk_clicked)
+ self.entPassword.connect("changed", self.entPassword_changed)
+ self.entPassword.add_accelerator("grab_focus", self.accel_group, ord("P"), gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+ self.lblPassword.set_accel_widget(self.entPassword)
signature.asc
Description: This is a digitally signed message part
