version 0.32

* back to a basic Makefile for clean packinging purposes

diff --git a/CHANGELOG b/CHANGELOG
index 5a79507..98fcadf 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 Change log file for FAPG
 
+version 0.32   (2005-02-07)
+       * back to a basic Makefile for clean packinging purposes
+
 version 0.31   (2005-02-05)
        * a flag was added to avoid parsing twice the hardlinked files (patch by Andreas Neuper)
        * Makefile was improved to easily build packages

diff --git a/Makefile b/Makefile
index 0403744..990ae9c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-VER = 0.31
 PRE = /usr/local
 BIN = $(PRE)/bin
 DOC = $(PRE)/share/doc/fapg
@@ -9,8 +8,6 @@ fapg:fapg.c genres.h
 
 clean:
        rm -f fapg
-       rm -f build-stamp configure-stamp debian/fapg.substvars debian/files
-       rm -rf debian/fapg rpm/BUILD rpm/SPECS rpm/SOURCES rpm/SRPMS rpm/RPMS
 
 install:fapg
        mkdir -p $(BIN) $(DOC) $(MAN)
@@ -22,16 +19,3 @@ uninstall:
        rm -f $(BIN)/fapg
        rm -rf $(DOC)
        rm -f $(MAN)/fapg.1
-
-tar: clean
-       cd .. && tar zcvf fapg-$(VER).tar.gz fapg-$(VER)
-
-rpm: tar
-       mkdir -p rpm/BUILD rpm/SPECS rpm/SOURCES rpm/SRPMS rpm/RPMS
-       rpm -ta ../fapg-$(VER).tar.gz --define "_topdir `pwd`/rpm"
-       cp rpm/*/*.rpm rpm/*/*/*.rpm ..
-
-deb: clean
-       dpkg-buildpackage -us -uc -rfakeroot
-
-dist: tar rpm deb
\ No newline at end of file

diff --git a/README b/README
index 849d150..bd41f82 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-FAPG 0.31 (Fast Audio Playlist Generator)
+FAPG 0.32 (Fast Audio Playlist Generator)
 site: http://royale.zerezo.com/fapg/
 mail: royale@zerezo.com
 

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 6d703b0..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-fapg (0.31-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Antoine Jacquet <royale@zerezo.com>  Sat,  5 Feb 2005 20:23:49 +0100
-

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 40a02c6..0000000
--- a/debian/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: fapg
-Section: sound
-Priority: optional
-Maintainer: Antoine Jacquet <royale@zerezo.com>
-Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1
-
-Package: fapg
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Fast Audio Playlist Generator
- FAPG is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
- in various formats (M3U, PLS, HTML, etc).

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index bd7f9d3..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,16 +0,0 @@
-This package was debianized by Antoine Jacquet <royale@zerezo.com> on
-Sat,  5 Feb 2005 20:23:49 +0100.
-
-It was downloaded from: http://royale.zerezo.com/fapg/
-
-Upstream Author: Antoine Jacquet <royale@zerezo.com>
-
-Copyright (C) 2002-2004  Antoine Jacquet <royale@zerezo.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index 3e34bae..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       # Add here commands to configure the package.
-
-       touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/fapg.sgml > fapg.1
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) clean
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/fapg.
-       $(MAKE) install PRE=$(CURDIR)/debian/fapg/usr
-       rm $(CURDIR)/debian/fapg/usr/share/doc/fapg/COPYING
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs CHANGELOG
-       dh_installdocs
-       dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-#      dh_python
-#      dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/fapg.c b/fapg.c
index 8a6667d..529a26f 100644 (file)
--- a/fapg.c
+++ b/fapg.c
@@ -1,5 +1,5 @@
 /*
- * FAPG version 0.31
+ * FAPG version 0.32
  *
  * FAPG means Fast Audio Playlist Generator.
  * It is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
@@ -642,7 +642,7 @@ int main(int argc,char **argv)
       printf("[playlist]%s",eol);
       break;
     case 2:
-      printf("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">%s%s<html>%s%s<head>%s<title>Playlist generated by FAPG 0.31</title>%s<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />%s<style type=\"text/css\">%s<!--%s%sbody,td,tr {%s font-family: Verdana, Arial, Helvetica, sans-serif;%s  font-size: 12px;%s  color: #000000;%s}%s%sbody {%s  background: #ffffff;%s}%s%sth {%s  text-align: center;%s  background: #ffcccc;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #dd8888 solid;%s}%s%std {%s  text-align: center;%s  background: #eeeeee;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #cccccc solid;%s}%s%sh1 {%s  font-size: 25px;%s}%s%sp {%s  font-size: 10px;%s}%s%sa {%s  color: #993333;%s  text-decoration: none;%s}%s%sa:hover {%s text-decoration: underline;%s}%s%s-->%s</style>%s</head>%s%s<body>%s%s<h1>Playlist</h1>%s%s<table>%s<tr><th>Entry</th><th>Artist</th><th>Title</th><th>Length</th></tr>%s",eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol);
+      printf("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">%s%s<html>%s%s<head>%s<title>Playlist generated by FAPG 0.32</title>%s<meta http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\" />%s<style type=\"text/css\">%s<!--%s%sbody,td,tr {%s font-family: Verdana, Arial, Helvetica, sans-serif;%s  font-size: 12px;%s  color: #000000;%s}%s%sbody {%s  background: #ffffff;%s}%s%sth {%s  text-align: center;%s  background: #ffcccc;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #dd8888 solid;%s}%s%std {%s  text-align: center;%s  background: #eeeeee;%s  padding-left: 15px;%s  padding-right: 15px;%s  border: 1px #cccccc solid;%s}%s%sh1 {%s  font-size: 25px;%s}%s%sp {%s  font-size: 10px;%s}%s%sa {%s  color: #993333;%s  text-decoration: none;%s}%s%sa:hover {%s text-decoration: underline;%s}%s%s-->%s</style>%s</head>%s%s<body>%s%s<h1>Playlist</h1>%s%s<table>%s<tr><th>Entry</th><th>Artist</th><th>Title</th><th>Length</th></tr>%s",eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol,eol);
       break;
   }
   for (;optind<argc;optind++)
@@ -656,7 +656,7 @@ int main(int argc,char **argv)
       printf("NumberOfEntries=%d%sVersion=2%s",counter,eol,eol);
       break;
     case 2:
-      printf("</table>%s%s<p>Playlist generated by <a href=\"http://royale.zerezo.com/fapg/\">FAPG 0.31</a></p>%s%s</body>%s%s</html>",eol,eol,eol,eol,eol,eol);
+      printf("</table>%s%s<p>Playlist generated by <a href=\"http://royale.zerezo.com/fapg/\">FAPG 0.32</a></p>%s%s</body>%s%s</html>",eol,eol,eol,eol,eol,eol);
       break;
   }
   if (genrelist) free(genrelist);

diff --git a/rpm/fapg.spec b/rpm/fapg.spec
deleted file mode 100644 (file)
index 16243da..0000000
--- a/rpm/fapg.spec
+++ /dev/null
@@ -1,30 +0,0 @@
-Name: fapg
-Summary: Fast Audio Playlist Generator
-Version: 0.31
-Release: 1
-Source: http://royale.zerezo.com/%{name}/%{name}-%{version}.tar.gz
-Group: Applications/Multimedia 
-License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
-%description
-FAPG is a tool to generate list of audio files (Wav, MP3, Ogg, etc)
-in various formats (M3U, PLS, HTML, etc).
-
-%prep 
-%setup -q
-
-%build 
-make
-
-%install 
-make install PRE=$RPM_BUILD_ROOT/usr
-
-%clean 
-rm -rf $RPM_BUILD_ROOT 
-
-%files 
-%defattr(-,root,root,0755) 
-%doc COPYING README
-%{_bindir}/fapg
-%{_mandir}/man1/fapg.1.gz