[SCM] vlevel/master: Make package building again with new upstream release 0.5.1

abe at users.alioth.debian.org abe at users.alioth.debian.org
Fri Feb 20 13:33:21 UTC 2015 

The following commit has been merged in the master branch:
commit f40fcec26b263bab33b962af4fdf848899f45f38
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Fri Feb 20 13:19:29 2015 +0100

    Make package building again with new upstream release 0.5.1
    
    * Update patch
      - Rename vlevel-bin to vlevel in override_dh_auto_install instead of
        adding a new file to the patch.
      - Add usr/lib/ladspa to debian/dirs
    * Prevent dh_clean removing upstream's REAMDE.orig
    * Add new build-dependency on "libjack-jackd2-dev | libjack-dev"
    * Install README.md and README.orig instead of README as documentation
    * Update debian/copyright wrt. to paths, license, authors and years.
      - The original upstream changed the license from GPL to LGPL in CVS
        after the 0.5 release and the fork is based upon the latest CVS
        checkout.
    
    Source for the license change:
    http://vlevel.cvs.sourceforge.net/viewvc/vlevel/vlevel/COPYING?view=log

diff --git a/debian/changelog b/debian/changelog
index 008c041..27c30c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+vlevel (0.5.1-1) unstable; urgency=low
+
+  * New upstream release
+    + Update patch
+      - Rename vlevel-bin to vlevel in override_dh_auto_install instead of
+        adding a new file to the patch.
+      - Add usr/lib/ladspa to debian/dirs
+    + Prevent dh_clean removing upstream's REAMDE.orig
+    + Add new build-dependency on "libjack-jackd2-dev | libjack-dev"
+    + Install README.md and README.orig instead of README as documentation
+    + Update debian/copyright wrt. to paths, license, authors and years
+      - The original upstream changed the license from GPL to LGPL in CVS
+        after the 0.5 release and the fork is based upon the latest CVS
+        checkout.
+
+ -- Axel Beckert <abe at debian.org>  Fri, 20 Feb 2015 12:40:08 +0100
+
 vlevel (0.5-1) unstable; urgency=low
 
   * Initial release (Closes: #774230)
diff --git a/debian/control b/debian/control
index 80ee42d..e922994 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Axel Beckert <abe at debian.org>
 Build-Depends: debhelper (>= 9),
-               help2man
+               help2man,
+               libjack-jackd2-dev | libjack-dev
 Standards-Version: 3.9.6
 Homepage: https://github.com/radiocicletta/vlevel
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/vlevel.git
diff --git a/debian/copyright b/debian/copyright
index 4a62fc4..5cfab7b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,21 +1,25 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: VLevel
-Source: http://vlevel.sourceforge.net/installing/
-Comment: Future releases are likely to show up on
- https://github.com/radiocicletta/vlevel instead
+Source: https://github.com/radiocicletta/vlevel/releases
+Comment: The original author published his releases under
+ http://vlevel.sourceforge.net/installing/. Debian follows the
+ fork/continuation of Radio Cicletta at
+ https://github.com/radiocicletta/vlevel
 
 Files: *
 Copyright: 2002-2003 Tom Felker <tcfelker at users.sourceforge.net>
-License: GPL-2+
+           2014-2015 Leonardo <leofiore at libero.it>
+           2014      Antonio Malara <antonio.malara at booking.com>
+License: LGPL-2.1+
 
-Files: ladspa.h
+Files: vlevel-ladspa/ladspa.h
 Copyright: 2000-2002 Richard W.E. Furse
            2000-2002 Paul Barton-Davis
            2000-2002 Stefan Westerfeld
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2014 Axel Beckert <abe at debian.org>
+Copyright: 2014-2015 Axel Beckert <abe at debian.org>
 License: GPL-2+
 
 License: GPL-2+
diff --git a/debian/dirs b/debian/dirs
index e772481..28b6c4a 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
 usr/bin
+usr/lib/ladspa
diff --git a/debian/docs b/debian/docs
index 55a2ccb..cc179f8 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,3 +1,4 @@
-README
+README.md
+README.orig
 TODO
 docs/*.txt
diff --git a/debian/patches/fix-hardcoded-makefile-variables.patch b/debian/patches/fix-hardcoded-makefile-variables.patch
index 46d8ae7..8a0232e 100644
--- a/debian/patches/fix-hardcoded-makefile-variables.patch
+++ b/debian/patches/fix-hardcoded-makefile-variables.patch
@@ -1,32 +1,28 @@
 Description: Fix hardcoded Makefile variables
  Needed for proper installation paths as well as compiler flags
 Author: Axel Beckert <abe at debian.org>
+Last-Update: 2015-Feb-20
 
 Index: vlevel/Makefile
 ===================================================================
---- vlevel.orig/Makefile	2014-10-11 16:00:29.524144871 +0200
-+++ vlevel/Makefile	2014-10-11 16:17:31.103327730 +0200
-@@ -19,18 +19,19 @@
- # User-editable options:
+--- vlevel.orig/Makefile	2015-02-20 12:53:54.811087786 +0100
++++ vlevel/Makefile	2015-02-20 12:53:54.811087786 +0100
+@@ -27,7 +27,7 @@
+ # on my system, it makes it a bit worse.
  
- # Change this to suit your preferences (maybe add -march=cputype)	
--CXXFLAGS=-Wall -O3 -fPIC -DPIC -g
-+CXXFLAGS=$(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -fPIC -DPIC
+ #export CXXFLAGS = -Wall -O3 -fPIC -DPIC -g -march=pentium4
+-export CXXFLAGS = -Wall -O3 -fPIC -DPIC
++export CXXFLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -fPIC -DPIC
  
- # This is where it will be installed
--PREFIX=/usr/local/bin/
--LADSPA_PREFIX=/usr/local/lib/ladspa/
-+DESTDIR:=/
-+PREFIX=$(DESTDIR)/usr/bin/
-+LADSPA_PREFIX=$(DESTDIR)/usr/lib/ladspa/
- 
- # End of user-editable options
+ # On my system, ICC is quite a bit faster, with these options:
+ #export CC=icc
+@@ -36,7 +36,8 @@
+ #export CXXFLAGS = -fPIC -DPIC -g  -O3 -rcd
  
- all: vlevel-bin vlevel-ladspa.so
- 
- install: all
--	cp -f vlevel-bin $(PREFIX)
-+	cp -f vlevel-bin $(PREFIX)/vlevel
- 	mkdir -p $(LADSPA_PREFIX)
- 	cp -f vlevel-ladspa.so $(LADSPA_PREFIX)
+ # This is where it will be installed
+-export PREFIX = /usr/local/
++export DESTDIR := /
++export PREFIX = $(DESTDIR)/usr/
+ export LADSPA_PATH = $(PREFIX)/lib/ladspa/
  
+ # End of user-editable options.
diff --git a/debian/rules b/debian/rules
index 8ab9822..ba13f86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,10 @@
 %:
 	dh $@ 
 
+override_dh_auto_install:
+	dh_auto_install
+	mv -v debian/vlevel/usr/bin/vlevel-bin debian/vlevel/usr/bin/vlevel
+
 override_dh_installman:
 	help2man -N \
 		--no-discard-stderr \
@@ -10,3 +14,6 @@ override_dh_installman:
 		-n 'Levelling Filter' \
 		debian/vlevel/usr/bin/vlevel > vlevel.1
 	dh_installman
+
+override_dh_clean:
+	dh_clean -XREADME.orig

-- 
vlevel packaging

More information about the pkg-multimedia-commits mailing list