diff -u serpentine-0.9/debian/changelog serpentine-0.9/debian/changelog --- serpentine-0.9/debian/changelog +++ serpentine-0.9/debian/changelog @@ -1,3 +1,19 @@ +serpentine (0.9-2ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #199277) + * debian/control: + - build using the current python version + - use a recommends on gstreamer0.10-plugins-ugly, not a depends + - drop python-libxml dependenciers (LP: #199014) + * debian/patches/python2.4-compat.patch: + - dropped, Ubuntu doesn't use this version + + [ Ralph Janke ] + * Fixed missing icon for KDE menu (LP: #159712) + * debian/control: add dependency on sharutils + + -- Morten Kjeldgaard Thu, 06 Mar 2008 22:04:46 +0100 + serpentine (0.9-2) unstable; urgency=low * Register as a CD-audio burning application with gnome-volume-manager @@ -17,6 +33,31 @@ -- Sam Morris Sat, 16 Feb 2008 12:11:48 +0000 +serpentine (0.9-1ubuntu2) hardy; urgency=low + + * debian/control.in: + - Build-Depends on gconf2 + + -- Sebastien Bacher Mon, 26 Nov 2007 17:54:03 +0100 + +serpentine (0.9-1ubuntu1) hardy; urgency=low + + * Sync with Debian + * debian/control: + - build using the current python version + - don't build the muine plugin since it's an universe package + - don't Build-Depends on the mono stack + - use a recommends on gstreamer0.10-plugins-ugly, not a depends + - updated maintainer information + * debian/muine-plugin-serpentine.install, debian/serpentine.install: + - dropped, the muine plugin is not built on Ubuntu + * debian/patches/python2.4-compat.patch: + - dropped, Ubuntu doesn't use this version + * debian/rules: + - don't build the muine plugin since it's an universe package + + -- Sebastien Bacher Mon, 26 Nov 2007 14:09:16 +0100 + serpentine (0.9-1) unstable; urgency=low * New upstream release. reverted: --- serpentine-0.9/debian/patches/python2.4-compat.patch +++ serpentine-0.9.orig/debian/patches/python2.4-compat.patch @@ -1,22 +0,0 @@ -diff -Nur serpentine-0.9/serpentine/plugins/plugfilter_k3b.py serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py ---- serpentine-0.9/serpentine/plugins/plugfilter_k3b.py 2007-08-02 18:11:22.000000000 +0100 -+++ serpentine-0.9.new/serpentine/plugins/plugfilter_k3b.py 2007-08-18 02:05:58.000000000 +0100 -@@ -68,12 +68,13 @@ - - - try: -- zfile = zipfile.ZipFile(fd) -- buff = zfile.read("maindata.xml") -- root = minidom.parseString(buff) -+ try: -+ zfile = zipfile.ZipFile(fd) -+ buff = zfile.read("maindata.xml") -+ root = minidom.parseString(buff) - -- except (zipfile.BadZipfile, IOError, KeyError, ExpatError): -- raise UnsupportedLocationError() -+ except (zipfile.BadZipfile, IOError, KeyError, ExpatError): -+ raise UnsupportedLocationError() - finally: - fd.close() - diff -u serpentine-0.9/debian/rules serpentine-0.9/debian/rules --- serpentine-0.9/debian/rules +++ serpentine-0.9/debian/rules @@ -14,6 +14,9 @@ common-binary-predeb-indep:: dh_clideps -i + uudecode -o debian/icons/gnome-dev-cdrom-audio.png debian/icons/gnome-dev-cdrom-audio.png.uue + dh_install debian/icons/gnome-dev-cdrom-audio.png usr/share/icons/hicolor/22x22/apps/ clean:: + rm -rf debian/icons/gnome-dev-cdrom-audio.png rm -f muine-plugin/SerpentinePlugin.dll if test -d $(MONO_SHARED_DIR)/.wapi; then rmdir $(MONO_SHARED_DIR)/.wapi; fi diff -u serpentine-0.9/debian/control serpentine-0.9/debian/control --- serpentine-0.9/debian/control +++ serpentine-0.9/debian/control @@ -1,12 +1,14 @@ Source: serpentine Section: gnome Priority: optional -Maintainer: Sam Morris +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Sam Morris Build-Depends: cdbs (>= 0.4.24), debhelper (>= 5.0.37.2), gconf2, - patchutils (>= 0.2.25) + patchutils (>= 0.2.25), + sharutils Build-Depends-Indep: autotools-dev, cli-common-dev (>= 0.4.4), @@ -17,16 +19,14 @@ python (>= 2.4), python-central (>= 0.5) Standards-Version: 3.7.3 -XS-Python-Version: >= 2.4 -#Homepage: http://s1x.homelinux.net/projects/serpentine/ +XS-Python-Version: current Homepage: http://developer.berlios.de/projects/serpentine/ -XS-DM-Upload-Allowed: yes Package: serpentine Architecture: all -Depends: ${python:Depends}, python-cairo, python-dbus, python-gst0.10 (>= 0.10.4-4), python-gnome2 (>= 2.12.4-4), python-gnome2-extras (>= 2.14.2-1), python-gnome2-desktop (>= 2.14.0-3), python-xml (>= 0.8.4-5), python-glade2 (>= 2.8.6-5), gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly, ${misc:Depends} +Depends: ${python:Depends}, python-cairo, python-dbus, python-gst0.10 (>= 0.10.4-4), python-gnome2 (>= 2.12.4-4), python-gnome2-extras (>= 2.14.2-1), python-gnome2-desktop (>= 2.14.0-3), python-glade2 (>= 2.8.6-5), gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, ${misc:Depends} XB-Python-Version: ${python:Versions} -Recommends: gstreamer0.10-gnomevfs +Recommends: gstreamer0.10-gnomevfs, gstreamer0.10-plugins-ugly Description: An application for creating audio CDs Serpentine is an application that lets you master (create) audio CDs. . only in patch2: unchanged: --- serpentine-0.9.orig/debian/icons/gnome-dev-cdrom-audio.png.uue +++ serpentine-0.9/debian/icons/gnome-dev-cdrom-audio.png.uue @@ -0,0 +1,34 @@ +begin 644 serpentine.png.unc +MB5!.1PT*&@H````-24A$4@```!8````6"`8```#$M&P[````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U@(($CH-\WW[ +MQP```)%T15AT0V]M;65N=`!4;V]L8F%R+7-I>F5D(&EC;VX*/3T]/3T]/3T] +M/3T]"@HH8RD@,C`P,R!*86MU8B`G:FEM;6%C)R!3=&5I;F5R+"`*:'1T<#HO +M+VII;6UA8RYM=7-I8VAA;&PN8WH*"F-R96%T960@=VET:"!T:&4@1TE-4"P* +M:'1T<#HO+W=W=RYG:6UP+F]R9Q;SOQ0```17241!5#C+?97/:U17%,<_Y]SQ +M36;2=&)-)I3*9&,,55Q4DX#Y48NEV!_2G2(5IQ+H']!%0^I`=PDA79?23;`1 +M;=&=E6(U2#11::)V4:F**":HQ4G-_*J3F9?WWG3QWAN#:"]<+H][[^>>']]S +MGO"*,38^LA/8!PP`'4`34`+N`C/`J>&AS-57W9>7`+-,ED&^5RF5*I!"*H +M**J"&B4>BV-9%DM+68Y.3KC`X/!09O*EX+'QD?2&#:T_'CJ8QG$<"H4"JH*( +M(JH8440%4?\14276T(#G>1P[/LG3ITN?KX7K&OA4(15475^*L\ +M!ZHH1A6C@N.L`G#H8!I@(N`\!P.CA].#1D3(%_*^RP%$55$33L$8WUH)]A&( +M1"(<3@\:8+0.'AL?V9E*M>]-)MLHE4H848P:Q"AB!&,,3:\UD7@]02S>B&5% +M_8?5(&HP:@!H:6DEE6K?&ZB)"+"OOW<`V[9Q'">XY,M_S!N@ +M'5CHVM[C]O9G^W@%.+"[L`ZXJ,)!,MK&RLN(GR_A050VA +MBT#W\%#&`KJOW9A;G)V=N6,BAIKG4BP5*10*6-8ZDLDV`MVC0(=E60@^S`0) +M:VQL)+!T__!0)@\0K/NOW9@S(D(NG\>Q5WT/14.]=X3@)@#'*J%E5%X#Z65]! +M]9(HA>"[MFW[16"T;C%`U_8>%S@9PH/UY(=[/G%=UT7-N]SK[^]Y-`?-CXR,V,/_^[@]26[=L[5RI5%"1>ACL +M:I5L]@E!@R("G)J],O/E@?V?L5)S\;P:SXI%5E=7*4F)KAW=G;T[^T(W-SF. +M0[%8K(=!@K)/)!*FCXS/)097UO21XY.3KC&1&AHB*$J==GY +M_4+6%(X&(?#7LY=GR20B'_1>;K;\X#M1`LP+J+TY?NI]HW+O]UZ^;N +M+6]OD60RB8A0J]7JUIH@495*A7B\D6JUPO<_?.?=OW?OJ['1;T\`;@"NA>`( +M$)^?N_;(\]RYQW\_?#.[E-W8VM)*,\[G9V;=R>:$]LLRWI+5>.> +MYY6KU>KC?+YP\_:MV]/G?INZ#N2!'/`O4`$