[SCM] flake packaging branch, master, updated. upstream/0.11-3-gf39430c

Mon Jan 4 14:44:45 UTC 2010

The following commit has been merged in the master branch:
commit f39430c549b910ac30430c4877ff64fd509a6977
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Mon Jan 4 15:44:32 2010 +0100

    Debian release 0.11-1

diff --git a/debian/changelog b/debian/changelog
index 74f5bfd..cc15879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+flake (0.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to dpkg-source 3.0 (quilt) format.
+  * Switch to debhelper 7.
+  * Update and fix debian/watch.
+  * debian/control:
+    - Change Maintainer to Debian Multimedia Maintainers.
+    - Add myself to Uploaders.
+    - Allow uploads by debian maintainers.
+    - Bump Standards up to 3.8.3.
+    - Move project's URL to the Homepage field value.
+    - Add Vcs-* fields.
+    - Move libflake-dev into libdevel section.
+  * debian/copyright:
+    - Replace (c) with © to fix copyright-with-old-dh-make-debian-copyright
+      lintian warning.
+    - Point to the correct GPL license file; fix
+      copyright-refers-to-symlink-license lintian warning.
+  * debian/menu:
+    - Fix menu-item-uses-apps-section lintian warning.
+  * libflake/md5.c: Drop changes, adopted upstream.
+  * Remove useless debian/dirs.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Mon, 04 Jan 2010 10:53:57 +0100
+
 flake (0.10-3) unstable; urgency=low
 
   * Pass --disable-strip to configure script (Closes: #436849)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 4d790c6..7ac1c9e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,17 @@
 Source: flake
 Section: sound
 Priority: extra
-Maintainer: Debian Multimedia Team <debian-multimedia at lists.debian.org>
-Uploaders: Free Ekanayaka <freee at debian.org>, Thomas Perl <thp at perli.net>, Joost Yervante Damad <andete at debian.org>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
+Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Free Ekanayaka <freee at debian.org>,
+ Thomas Perl <thp at perli.net>,
+ Joost Yervante Damad <andete at debian.org>,
+ Alessio Treglia <quadrispro at ubuntu.com>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.3
+Homepage: http://flake-enc.sourceforge.net/
+Vcs-Git: git://git.debian.org/pkg-multimedia/flake.git
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/flake.git;a=summary
 
 Package: flake
 Architecture: any
@@ -15,12 +22,11 @@ Description: Alternative encoder for the Free Lossless Audio Codec
  encoding speed and implementing experimental features.
  .
  Flake encodes WAV audio files into lossless FLAC files.
- .
- Upstream: http://flake-enc.sourceforge.net/
 
 Package: libflake-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: libdevel
 Description: Alternative encoder for the Free Lossless Audio Codec -- Development files
  The purpose of Flake is to be an alternative to the 
  FLAC reference encoder with the goal of increasing 
@@ -28,7 +34,4 @@ Description: Alternative encoder for the Free Lossless Audio Codec -- Developmen
  .
  Flake encodes WAV audio files into lossless FLAC files.
  .
- Upstream: http://flake-enc.sourceforge.net/
- .
  This package contains the static library and header files.
-
diff --git a/debian/copyright b/debian/copyright
index a5f7f9a..2c50749 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Upstream Author:
 
 Copyright: 
 
-    Copyright (C) 2006 Justin Ruggles
+    Copyright © 2006 Justin Ruggles
 
 License:
 
@@ -28,20 +28,20 @@ License:
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-The Debian packaging is (C) 2007, Thomas Perl <thp at perli.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2007, Thomas Perl <thp at perli.net> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
 
 ------
 
 Copyright for libflake/bitio.c, libflake/bitio.h:
 
     Bitwise File Writer
-    Copyright (c) 2006 Justin Ruggles
+    Copyright © 2006 Justin Ruggles
     
     derived from ffmpeg/libavcodec/bitstream.h
     Common bit i/o utils
-    Copyright (c) 2000, 2001 Fabrice Bellard
-    Copyright (c) 2002-2004 Michael Niedermayer
+    Copyright © 2000, 2001 Fabrice Bellard
+    Copyright © 2002-2004 Michael Niedermayer
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index e772481..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin
diff --git a/debian/menu b/debian/menu
index aa7d80d..ff5ab43 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,2 +1,2 @@
-?package(flake):needs="text" section="Apps/Sound"\
+?package(flake):needs="text" section="Applications/Sound"\
   title="flake" command="/usr/bin/flake"
diff --git a/debian/rules b/debian/rules
index 7f51d3d..ab973a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,88 +1,15 @@
 #!/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
+%:
+	dh $@
 
+override_dh_auto_configure:
+	CFLAGS="$(CFLAGS)" ./configure --cpu=$(DEB_BUILD_ARCH) --disable-strip --prefix=/usr
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_ARCH   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --cpu=$(DEB_BUILD_ARCH) --disable-strip --prefix=/usr && touch config.status
-
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-
-	# Add here commands to clean up after the build process.
-	$(MAKE) distclean
-	rm -f config.status build-stamp
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/flake.
+override_dh_auto_install:
 	DESTDIR=$(CURDIR)/debian/flake $(MAKE) install-progs
-	# Add here commands to install the package into debian/libflake-dev.
 	DESTDIR=$(CURDIR)/debian/libflake-dev $(MAKE) install-libs
 	DESTDIR=$(CURDIR)/debian/libflake-dev $(MAKE) install-headers
 
-
-# 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
+override_dh_installchangelogs:
 	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index 6e9d83b..1f0e489 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
-version=2
-
-# Pattern
-ftp://heanet.dl.sourceforge.net/f/fl/flake-enc/flake-([\d\.]*)\.tar\.bz2 debian uupdate
+version=3
+http://sf.net/flake-enc/flake-([\d\.]*)\.tar\.bz2 debian uupdate

-- 
flake packaging

