--- aylet-0.5.orig/debian/aylet-gtk.docs +++ aylet-0.5/debian/aylet-gtk.docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- aylet-0.5.orig/debian/aylet-gtk.install +++ aylet-0.5/debian/aylet-gtk.install @@ -0,0 +1 @@ +aylet-gtk usr/bin --- aylet-0.5.orig/debian/aylet-gtk.links +++ aylet-0.5/debian/aylet-gtk.links @@ -0,0 +1,2 @@ +usr/bin/aylet-gtk usr/bin/xaylet +usr/share/man/man1/aylet-gtk.1.gz usr/share/man/man1/xaylet.1.gz --- aylet-0.5.orig/debian/aylet-gtk.manpages +++ aylet-0.5/debian/aylet-gtk.manpages @@ -0,0 +1 @@ +aylet-gtk.1 --- aylet-0.5.orig/debian/aylet.docs +++ aylet-0.5/debian/aylet.docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- aylet-0.5.orig/debian/aylet.install +++ aylet-0.5/debian/aylet.install @@ -0,0 +1 @@ +aylet usr/bin --- aylet-0.5.orig/debian/aylet.manpages +++ aylet-0.5/debian/aylet.manpages @@ -0,0 +1 @@ +aylet.1 --- aylet-0.5.orig/debian/changelog +++ aylet-0.5/debian/changelog @@ -0,0 +1,45 @@ +aylet (0.5-3build2) bionic; urgency=high + + * No change rebuild to pick up -fPIE compiler default + + -- Balint Reczey Tue, 03 Apr 2018 12:13:56 +0000 + +aylet (0.5-3build1) xenial; urgency=medium + + * No-change rebuild for ncurses6 transition. + + -- Matthias Klose Sun, 07 Feb 2016 09:39:25 +0000 + +aylet (0.5-3) unstable; urgency=low + + * QA upload (Closes: #636740). + * Switch away from yada (Closes: #636886) to dh. + * Move homepage from descriptions to the source stanza. + * Thanks to IRILL for sponsoring this BSP in Paris. + + -- Cyril Brulebois Sun, 19 Feb 2012 17:42:35 +0000 + +aylet (0.5-2) unstable; urgency=low + + * Fix FTBFS when build twice in a row + Thank to Patrick Winnertz (Closes: #442501) + * Cleanup in packages file. + * Fixed 'hyphen-used-as-minus-sign' in aylet.1 manpage. + + -- Krystian Wlosek Mon, 24 Sep 2007 16:24:49 +0200 + +aylet (0.5-1) unstable; urgency=low + + * New release version. + Fixed a stupid bug where the fadeout time defaulted to zero. + * GTK2 port + Closes: #357495 + + -- Krystian Wlosek Mon, 15 Mar 2006 16:29:46 +0100 + +aylet (0.4-1) unstable; urgency=low + + * Initial Debian version. Closes: #332623. + + -- Krystian Wlosek Thu, 6 Oct 2005 17:01:56 +0200 + --- aylet-0.5.orig/debian/compat +++ aylet-0.5/debian/compat @@ -0,0 +1 @@ +8 --- aylet-0.5.orig/debian/control +++ aylet-0.5/debian/control @@ -0,0 +1,40 @@ +Source: aylet +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian QA Group +Section: otherosfs +Priority: optional +Standards-Version: 3.7.2 +Homepage: http://www.worldofspectrum.org/ +Build-Depends: libncurses5-dev, libgtk2.0-dev, debhelper (>= 8), quilt + +Package: aylet +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Suggests: aylet-gtk +Description: ncurses-based player for Spectrum '.ay' music files + aylet plays music files in the `.ay' format. These files are + essentially wrappers around bits of Z80 code which play music on the + Sinclair ZX Spectrum 128's sound hardware - either the beeper, or + (eponymously) the AY-3-8912 sound chip. Files using the Amstrad CPC + ports are also supported. + . + One source of `.ay' files playable with aylet is "Project AY" + on the World of Spectrum website: + +Package: aylet-gtk +Architecture: any +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Suggests: aylet +Description: X-GTK2-based player for Spectrum '.ay' music files + aylet plays music files in the `.ay' format. These files are + essentially wrappers around bits of Z80 code which play music on the + Sinclair ZX Spectrum 128's sound hardware - either the beeper, or + (eponymously) the AY-3-8912 sound chip. Files using the Amstrad CPC + ports are also supported. + . + One source of `.ay' files playable with aylet-gtk is "Project AY" + on the World of Spectrum website: --- aylet-0.5.orig/debian/copyright +++ aylet-0.5/debian/copyright @@ -0,0 +1,15 @@ +This is a prepackaged version of player for Spectrum '.ay' music files. +It was Debianised by Krystian Wlosek , and uploaded +by Piotr Roszatycki , using files obtained from +. + +More information about player for Spectrum '.ay' music files is available +from + +Copyright and licence notice: + + Copyright (C) 2001-2005 Russell Marks. + Z80 emulation copyright (C) 1994 Ian Collier. + +On any Debian system, you can find the complete text of the GNU GPL +(GNU General Public License) in the file /usr/share/common-licenses/GPL --- aylet-0.5.orig/debian/patches/1_ui.c.diff +++ aylet-0.5/debian/patches/1_ui.c.diff @@ -0,0 +1,21 @@ +--- aylet-0.5/ui.c 2003-11-27 20:42:47.000000000 +0100 ++++ aylet-0.5-changes/ui.c 2006-03-20 11:08:09.655752624 +0200 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -188,8 +189,8 @@ + { + need_update=0; + draw_frame(); +- draw_status(ay_filenames[ay_file],aydata.miscstr,aydata.authorstr, +- ay_track+1,aydata.tracks[ay_track].namestr); ++ draw_status(ay_filenames[ay_file],(char *)aydata.miscstr, (char *)aydata.authorstr, ++ ay_track+1, (char *)aydata.tracks[ay_track].namestr); + } + + /* update time display */ --- aylet-0.5.orig/debian/patches/2_uigtk.diff +++ aylet-0.5/debian/patches/2_uigtk.diff @@ -0,0 +1,13 @@ +--- aylet-0.5/uigtk.c 2002-09-14 17:45:45.000000000 +0200 ++++ aylet-0.5-changes/uigtk.c 2005-08-25 11:09:33.276040408 +0200 +@@ -386,8 +386,8 @@ + if(need_update) + { + need_update=0; +- ui_draw_status(ay_filenames[ay_file],aydata.miscstr,aydata.authorstr, +- ay_track+1,aydata.tracks[ay_track].namestr); ++ ui_draw_status(ay_filenames[ay_file], (char *)aydata.miscstr, (char *)aydata.authorstr, ++ ay_track+1, (char *)aydata.tracks[ay_track].namestr); + } + + /* update time display */ --- aylet-0.5.orig/debian/patches/3_gtk2_Makefile.diff +++ aylet-0.5/debian/patches/3_gtk2_Makefile.diff @@ -0,0 +1,34 @@ +--- aylet-0.5/Makefile 2005-12-18 04:05:08.000000000 +0100 ++++ aylet-0.5-changes/Makefile 2006-03-20 10:37:26.000000000 +0100 +@@ -39,14 +39,29 @@ + + all: aylet xaylet + ++ ++# GTK+1.2 stuff: "make all" or "make gtk1" ++GTKCONFIG=gtk-config ++GTKFLAGS=-UGTK2 ++gtk1: all ++ ++# GTK+2 stuff: "make gtk2" ++gtk2: GTKCONFIG:=pkg-config gtk+-2.0 ++gtk2: GTKFLAGS:=-DGTK2 $(shell \ ++ $(GTKCONFIG) --modversion | \ ++ awk 'BEGIN { FS="." } \ ++ 1 { if ($$1 > 2 || ($$1 == 2 && $$2 >= 6)) \ ++ { print "-DGTK2_6" } }') ++gtk2: all ++ + aylet: $(OBJS) + $(CC) -o aylet $(OBJS) $(CURSES_LIB) + + xaylet: $(XOBJS) +- $(CC) -o xaylet $(XOBJS) `gtk-config --libs` ++ $(CC) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs` + + uigtk.o: uigtk.c +- $(CC) $(CFLAGS) `gtk-config --cflags` -c uigtk.c -o uigtk.o ++ $(CC) $(CFLAGS) $(GTKFLAGS) `$(GTKCONFIG) --cflags` -c uigtk.c -o uigtk.o + + installdirs: + /bin/sh ./mkinstalldirs $(BINDIR) $(XBINDIR) $(MANDIR) --- aylet-0.5.orig/debian/patches/3_gtk2_uigtk.c.diff +++ aylet-0.5/debian/patches/3_gtk2_uigtk.c.diff @@ -0,0 +1,166 @@ +--- aylet-0.5/uigtk.c ++++ aylet-0.5-changes/uigtk.c +@@ -14,11 +14,13 @@ + #include "ui.h" + + /* button pixmaps */ ++#ifndef GTK2_6 + #include "button1.xpm" + #include "button2.xpm" + #include "button3.xpm" + #include "button4.xpm" + #include "button5.xpm" ++#endif + + + static GtkWidget *window,*vbox,*detailstbl,*detaillabel[5]; +@@ -107,6 +109,11 @@ + GdkBitmap *bitmap,*mask; + int tbl_row,width; + ++#ifdef GTK2 ++#define gtk_accel_group_get_default() accel ++ GtkAccelGroup *accel; ++#endif ++ + window=gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_signal_connect(GTK_OBJECT(window),"destroy", + GTK_SIGNAL_FUNC(cb_doquit),NULL); +@@ -116,6 +123,11 @@ + gtk_window_set_title(GTK_WINDOW(window),"xaylet"); + gtk_window_set_policy(GTK_WINDOW(window),FALSE,TRUE,FALSE); /* XXX? */ + ++#ifdef GTK2 ++ accel = gtk_accel_group_new (); ++ gtk_window_add_accel_group (GTK_WINDOW (window), accel); ++#endif ++ + /* main vbox */ + vbox=gtk_vbox_new(FALSE,0); + gtk_container_add(GTK_CONTAINER(window),vbox); +@@ -194,7 +206,11 @@ + DO_TBL_RIGHT(statustbl,1, 1,2,""); + label_for_time=label; + ++#ifdef GTK2 ++ highspeed_widget = gtk_check_button_new_with_mnemonic ("_High speed"); ++#else + highspeed_widget=gtk_check_button_new_with_label("High-speed"); ++#endif + /* don't allow focus, looks too weird and we have shortcut */ + GTK_WIDGET_UNSET_FLAGS(highspeed_widget,GTK_CAN_FOCUS); + gtk_table_attach_defaults(GTK_TABLE(statustbl),highspeed_widget, 2,4, 0,2); +@@ -227,6 +243,21 @@ + gtk_container_set_border_width(GTK_CONTAINER(buttontbl),5); + gtk_widget_show(buttontbl); + ++#ifdef GTK2_6 /* >= GTK+ 2.6 */ ++#define ADD_PIXMAP_TO_BUTTON(button,xpm,stock) \ ++ pixmap = gtk_image_new_from_stock (GTK_STOCK_MEDIA_##stock, \ ++ GTK_ICON_SIZE_BUTTON); \ ++ gtk_container_add (GTK_CONTAINER ((button)), pixmap); \ ++ gtk_widget_show (pixmap) ++#else /* < GTK+ 2.6 */ ++#define ADD_PIXMAP_TO_BUTTON(button,xpm,stock) \ ++ bitmap=gdk_pixmap_create_from_xpm_d(window->window,&mask, \ ++ &(window->style->black), \ ++ (xpm)); \ ++ pixmap=gtk_pixmap_new(bitmap,mask); \ ++ gtk_container_add(GTK_CONTAINER(button),pixmap); \ ++ gtk_widget_show(pixmap) ++#endif + + hbox=gtk_hbox_new(TRUE,5); + gtk_table_attach_defaults(GTK_TABLE(buttontbl),hbox, 0,4, 0,1); +@@ -236,16 +267,8 @@ + /* XXX this seems to be needed here, but is it ok? */ + gtk_widget_realize(window); + +-#define ADD_PIXMAP_TO_BUTTON(button,xpm) \ +- bitmap=gdk_pixmap_create_from_xpm_d(window->window,&mask, \ +- &(window->style->black), \ +- (xpm)); \ +- pixmap=gtk_pixmap_new(bitmap,mask); \ +- gtk_container_add(GTK_CONTAINER(button),pixmap); \ +- gtk_widget_show(pixmap) +- + button=gtk_button_new(); +-ADD_PIXMAP_TO_BUTTON(button,button1); ++ADD_PIXMAP_TO_BUTTON(button,button1,PREVIOUS); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_prev_track),NULL); +@@ -256,7 +279,7 @@ + gtk_widget_show(button); + + button=gtk_button_new(); +-ADD_PIXMAP_TO_BUTTON(button,button2); ++ADD_PIXMAP_TO_BUTTON(button,button2,PLAY); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_play),NULL); +@@ -266,7 +289,7 @@ + gtk_widget_show(button); + + button=gtk_button_new(); +-ADD_PIXMAP_TO_BUTTON(button,button3); ++ADD_PIXMAP_TO_BUTTON(button,button3,PAUSE); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_pause),NULL); +@@ -276,7 +299,7 @@ + gtk_widget_show(button); + + button=gtk_button_new(); +-ADD_PIXMAP_TO_BUTTON(button,button4); ++ADD_PIXMAP_TO_BUTTON(button,button4,STOP); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_stop),NULL); +@@ -286,7 +309,7 @@ + gtk_widget_show(button); + + button=gtk_button_new(); +-ADD_PIXMAP_TO_BUTTON(button,button5); ++ADD_PIXMAP_TO_BUTTON(button,button5,NEXT); + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_next_track),NULL); +@@ -295,7 +318,11 @@ + GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS); + gtk_widget_show(button); + ++#ifdef GTK2 ++ button = gtk_button_new_with_mnemonic ("_Restart"); ++#else + button=gtk_button_new_with_label("Restart"); ++#endif + gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_restart),NULL); +@@ -304,17 +331,24 @@ + GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS); + gtk_widget_show(button); + +- + /* second row, these go straight on the table */ + /* backspace/delete/space are dealt with by keypress() */ ++#ifdef GTK2 ++ button = gtk_button_new_with_mnemonic ("_Previous file"); ++#else + button=gtk_button_new_with_label("Prev File"); ++#endif + gtk_table_attach_defaults(GTK_TABLE(buttontbl),button, 1,2, 1,2); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_prev_file),NULL); + GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS); + gtk_widget_show(button); + ++#ifdef GTK2 ++ button = gtk_button_new_with_mnemonic("_Next file"); ++#else + button=gtk_button_new_with_label("Next File"); ++#endif + gtk_table_attach_defaults(GTK_TABLE(buttontbl),button, 2,3, 1,2); + gtk_signal_connect(GTK_OBJECT(button),"clicked", + GTK_SIGNAL_FUNC(cb_button_next_file),NULL); --- aylet-0.5.orig/debian/patches/4_Makefile_clean_bug442501.diff +++ aylet-0.5/debian/patches/4_Makefile_clean_bug442501.diff @@ -0,0 +1,11 @@ +--- aylet-0.5/Makefile 2007-09-24 15:26:28.000000000 +0200 ++++ aylet-0.5/Makefile.new 2007-09-24 15:27:20.000000000 +0200 +@@ -77,7 +77,7 @@ + $(RM) $(MANDIR)/aylet.1* $(MANDIR)/xaylet.1* + + clean: +- $(RM) *.o *~ aylet xaylet ++ $(RM) *.o *~ aylet xaylet aylet-gtk2 + + # dependencies + cbops.o: cbops.c --- aylet-0.5.orig/debian/patches/5_aylet.1_hypen.diff +++ aylet-0.5/debian/patches/5_aylet.1_hypen.diff @@ -0,0 +1,40 @@ +--- aylet-0.5/aylet.1 2004-10-02 00:32:36.000000000 +0200 ++++ aylet-0.5/aylet.1.new 2007-09-24 16:20:04.000000000 +0200 +@@ -99,8 +99,8 @@ + rather than the default `wide' separation. + .TP + .B -s +-output sample data to stdout rather than playing it; implies `-n'. The +-sample is 44.1kHz 16-bit stereo (or mono if using `-m'). Don't be ++output sample data to stdout rather than playing it; implies `\-n'. The ++sample is 44.1kHz 16-bit stereo (or mono if using `\-m'). Don't be + surprised if the sample takes a little while to generate, as it still + has to emulate the Z80. + .TP +@@ -137,7 +137,7 @@ + total silence. And a track may never end at all; aylet fades it out + after 3 minutes by default. (Yes, 3 minutes be may too soon to allow + some tracks to `finish', but you have to strike the balance somewhere, +-and it's only a default. Use `-A' or press `s' to change it.) ++and it's only a default. Use `\-A' or press `s' to change it.) + .\" + .\"------------------------------------------------------------------ + .\" +@@ -193,7 +193,7 @@ + In xaylet, you can also use the matching buttons for most of the + above. + .PP +-When using `aylet -n', the interactivity is scaled down dramatically, ++When using `aylet \-n', the interactivity is scaled down dramatically, + leaving just the one control: + .TP + .I Ctrl-C +@@ -217,7 +217,7 @@ + To convert ysfollin.ay to a mono sample in .wav format (requires + `sox'): + .PP +-aylet -sm ysfollin.ay |sox -r 44100 -t sw - tune.wav ++aylet \-sm ysfollin.ay |sox \-r 44100 \-t sw \- tune.wav + .\" + .\"------------------------------------------------------------------ + .\" --- aylet-0.5.orig/debian/patches/series +++ aylet-0.5/debian/patches/series @@ -0,0 +1,6 @@ +1_ui.c.diff +2_uigtk.diff +3_gtk2_Makefile.diff +3_gtk2_uigtk.c.diff +4_Makefile_clean_bug442501.diff +5_aylet.1_hypen.diff --- aylet-0.5.orig/debian/rules +++ aylet-0.5/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +CFLAGS += -DDRIVER_OSS + +override_dh_auto_build: + dh_auto_build -- gtk2 + mv xaylet aylet-gtk + cp aylet.1 aylet-gtk.1 + +override_dh_clean: + dh_clean + rm -f aylet-gtk aylet-gtk.1 xaylet.1 + +override_dh_auto_install: + # No-op, let's do everything through dh_install. + +%: + dh $@ --with quilt