[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#811395: marked as done (jessie-pu: package ardour/1:2.8.16+git20131003-4)

Your message dated Sat, 02 Apr 2016 14:20:04 +0100
with message-id <1459603204.2441.216.camel@adam-barratt.org.uk>
and subject line Fix included in stable
has caused the Debian Bug report #811395,
regarding jessie-pu: package ardour/1:2.8.16+git20131003-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
811395: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811395
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu

I'd like to update ardour to fix #810754 in jessie. libs/pbd/dmalloc.c has a
commercial restriction, but can safely be removed. The attached debdiff does
that. That changelog is:

ardour (1:2.8.16+git20131003+dfsg1-1~deb8u1) jessie; urgency=medium

  * Repack to remove libs/pdb/dmalloc.cc. (Closes: #810754)
  * debian/patches/debian/patches/190_exclude_dmalloc.patch: Do not build
    dmalloc.cc.
  * debian/copyright:
    - Add libs/pdb/dmalloc.cc to Files-Excluded.
    - Remove libs/pdb/dmalloc.cc paragraph.

 -- Sebastian Ramacher <sramacher@debian.org>  Mon, 18 Jan 2016 16:10:25 +0100

Cheers
-- 
Sebastian Ramacher

diff --git a/debian/changelog b/debian/changelog
index 0f30581..749f61a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ardour (1:2.8.16+git20131003+dfsg1-1~deb8u1) jessie; urgency=medium
+
+  * Repack to remove libs/pdb/dmalloc.cc. (Closes: #810754)
+  * debian/patches/debian/patches/190_exclude_dmalloc.patch: Do not build
+    dmalloc.cc.
+  * debian/copyright:
+    - Add libs/pdb/dmalloc.cc to Files-Excluded.
+    - Remove libs/pdb/dmalloc.cc paragraph.
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Mon, 18 Jan 2016 16:10:25 +0100
+
 ardour (1:2.8.16+git20131003-4) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/copyright b/debian/copyright
index 7862a79..f11f5ca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,7 @@ Upstream-Name: Ardour
 Upstream-Contact: Paul Davis <pbd@op.net>
 Source: http://ardour.org/download
 Copyright: 1998-2010, Paul Davis
+Files-Excluded: libs/pbd/dmalloc.cc
 
 Files: *
 Copyright: 1998-2010, Paul Davis
@@ -456,10 +457,6 @@ Files: ./libs/vamp-plugins/AmplitudeFollower.cpp
 Copyright: 2006, Dan Stowell
 License: Expat and other-nopromo-Chris
 
-Files: ./libs/pbd/dmalloc.cc
-Copyright: 1995, Gray Watson
-License: other-noncommercial-Watson
-
 Files: ./libs/surfaces/powermate/interface.cc
 Copyright: Harrison Audio, LLC, 2007
 License: UNKNOWN
@@ -615,14 +612,6 @@ License: other-Apple
  STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-License: other-noncommercial-Watson
- Permission to use, copy, modify, and distribute this software for any
- NON-COMMERCIAL purpose and without fee is hereby granted, provided that
- the above copyright notice and this permission notice appear in all
- copies, and that the name of Gray Watson not be used in advertising or
- publicity pertaining to distribution of the document or software
- without specific, written prior permission.
-
 License: GPL
  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
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 059dcc5..27d917c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,6 +3,8 @@
 [DEFAULT]
 pristine-tar = True
 sign-tags = True
+debian-branch = jessie
+upstream-branch = upstream.jessie
 
 [git-buildpackage]
 compression = bzip2
diff --git a/debian/patches/190_exclude_dmalloc.patch b/debian/patches/190_exclude_dmalloc.patch
new file mode 100644
index 0000000..388aa06
--- /dev/null
+++ b/debian/patches/190_exclude_dmalloc.patch
@@ -0,0 +1,14 @@
+Description: Exclude dmalloc.cc from building
+Author: Sebastian Ramacher <sramacher@debian.org>
+Bug-Debian: https://bugs.debian.org/810754
+
+--- ardour-2.8.16+git20131003.orig/libs/pbd/SConscript
++++ ardour-2.8.16+git20131003/libs/pbd/SConscript
+@@ -25,7 +25,6 @@ convert.cc
+ copyfile.cc
+ controllable.cc
+ enumwriter.cc
+-dmalloc.cc
+ epa.cc
+ error.cc
+ file_subst.cc
diff --git a/debian/patches/series b/debian/patches/series
index 6fa4858..1243ca3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 160_kfreebsd.patch
 170_template-ftbfs.patch
 180_aubio.patch
+190_exclude_dmalloc.patch
diff --git a/libs/pbd/dmalloc.cc b/libs/pbd/dmalloc.cc
deleted file mode 100644
index 0e73094..0000000
--- a/libs/pbd/dmalloc.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * file that facilitates C++ program debugging.
- *
- * Copyright 1995 by Gray Watson
- *
- * This file is part of the dmalloc package.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * NON-COMMERCIAL purpose and without fee is hereby granted, provided
- * that the above copyright notice and this permission notice appear
- * in all copies, and that the name of Gray Watson not be used in
- * advertising or publicity pertaining to distribution of the document
- * or software without specific, written prior permission.
- *
- * Please see the PERMISSIONS file or contact the author for information
- * about commercial licenses.
- *
- * Gray Watson makes no representations about the suitability of the
- * software described herein for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * The author may be contacted via http://www.letters.com/~gray/
- *
- * $Id$
- */
-
-/*
- * This file is used to effectively redirect new to the more familiar
- * malloc and delete to the more familiar free so they can be debugged
- * with the debug malloc library..  They also give the known error
- * behavior, too.
- *
- * Compile and link this in with the C++ program you want to debug.
- *
- * NOTE: I am not a C++ hacker so feedback in the form of other hints
- * and ideas for C++ users would be much appreciated.
- */
-
-#ifdef DEBUG_MALLOC
-
-extern "C" {
-#include <stdlib.h>
-#include <dmalloc.h>
-#include "/usr/local/src/dmalloc-4.1.2/return.h"
-}
-
-/*
- * An overload function for the C++ new.
- */
-void *
-operator new(size_t size)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-
-  /* handle correct C++ semantics for an alloc of size 0 */
-  
-  if (size == 0) size = 1;
-  
-  return _malloc_leap(file, 0, size);
-}
-
-/*
- * An overload function for the C++ new[].
- */
-void *
-operator new[](size_t size)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-
-  /* handle correct C++ semantics for an alloc of size 0 */
-  
-  if (size == 0) size = 1;
-
-  return _malloc_leap(file, 0, size);
-}
-
-/*
- * An overload function for the C++ delete.
- */
-void
-operator delete(void *pnt)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-  _free_leap(file, 0, pnt);
-}
-
-/*
- * An overload function for the C++ delete[].  Thanks to Jens Krinke
- * <j.krinke@gmx.de>
- */
-void
-operator delete[](void *pnt)
-{
-  char	*file;
-  GET_RET_ADDR(file);
-  _free_leap(file, 0, pnt);
-}
-
-#endif

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Version: 8.4

Hi,

The packages referenced by these bugs were included in today's stable
point release.

Regards,

Adam

--- End Message ---
Reply to: