Package: libmdsp
Version: 0.11-8
Severity: important
Tags: patch
Justification: fails to build from source
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu karmic ubuntu-patch


strndup() is redefined by local.h
It collides with declaration of strndup() in string.h of libc6
Some other minor fixes


*** /tmp/tmpp4yBsc
In Ubuntu, we've applied the attached patch to achieve the following:

  * Added 02_strndup-fix.dpatch (LP: #433450)
    - Comment strndup declaration in local.h
  * Removed DH_COMPAT=4 in debian/rules and added debian/compat
  * Do not ignore errors in make clean in debian/rules
  * Added Depends in debian/control
  * Added debian/README.source
  * Added Copyright in debian/copyright

  [ Stefan Lesicnik ]
  * Added section to debian/control 
  
We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers karmic-updates
  APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500, 'karmic')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.31-14-generic (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u libmdsp-0.11/debian/patches/00list libmdsp-0.11/debian/patches/00list
--- libmdsp-0.11/debian/patches/00list
+++ libmdsp-0.11/debian/patches/00list
@@ -1,0 +2 @@
+02_strndup-fix
diff -u libmdsp-0.11/debian/control libmdsp-0.11/debian/control
--- libmdsp-0.11/debian/control
+++ libmdsp-0.11/debian/control
@@ -1,6 +1,8 @@
 Source: libmdsp
 Priority: optional
-Maintainer: Debian VDR Team <pkg-vdr-dvb-de...@lists.alioth.debian.org>
+Section: devel
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VDR Team <pkg-vdr-dvb-de...@lists.alioth.debian.org>
 Uploaders: Tobias Grimm <t...@e-tobi.net>, Thomas Schmidt <tschm...@debian.org>
 Build-Depends: debhelper (>> 4.1.16), dpatch
 Standards-Version: 3.7.2
@@ -8,6 +10,7 @@
 Package: libmdsp-dev
 Section: devel
 Architecture: any
+Depends: ${misc:Depends}
 Description: METAR Decoder Software Package Library development files
  METAR (Meteorological Aviation Routine Weather Report) is the standard fornat
  for reporting meterological conditions. The MDSP Library provides a programmer
diff -u libmdsp-0.11/debian/changelog libmdsp-0.11/debian/changelog
diff -u libmdsp-0.11/debian/copyright libmdsp-0.11/debian/copyright
--- libmdsp-0.11/debian/copyright
+++ libmdsp-0.11/debian/copyright
@@ -12,4 +12,8 @@
 Copyright:
 
+  Copyright (C) 2003  Eric McCarthy
+
+License:
+
 It may be redistributed under the terms of the GNU LGPL
 found on Debian systems in the file /usr/share/common-licenses/LGPL .
diff -u libmdsp-0.11/debian/rules libmdsp-0.11/debian/rules
--- libmdsp-0.11/debian/rules
+++ libmdsp-0.11/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
-
 # include dpatch stuff
 include /usr/share/dpatch/dpatch.make
 
@@ -52,7 +49,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 	
 	rm -f libmetar.a
 
only in patch2:
unchanged:
--- libmdsp-0.11.orig/debian/compat
+++ libmdsp-0.11/debian/compat
@@ -0,0 +1 @@
+4
only in patch2:
unchanged:
--- libmdsp-0.11.orig/debian/README.source
+++ libmdsp-0.11/debian/README.source
@@ -0,0 +1,8 @@
+This package uses the dpatch system to save and apply patches to the
+upstream source code of the software that is packaged. For details
+about how to use dpatch read
+
+   /usr/share/doc/dpatch/README.source.gz
+   
+from the dpatch package.
+
only in patch2:
unchanged:
--- libmdsp-0.11.orig/debian/patches/02_strndup-fix.dpatch
+++ libmdsp-0.11/debian/patches/02_strndup-fix.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_strndup-fix.dpatch by Alfonso Cepeda Caballos <cep...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad libmdsp-0.11~/src/local.h libmdsp-0.11/src/local.h
+--- libmdsp-0.11~/src/local.h	2003-12-10 22:30:56.000000000 +0100
++++ libmdsp-0.11/src/local.h	2009-09-20 11:18:38.000000000 +0200
+@@ -1175,7 +1175,7 @@
+ char *strupr(char *);
+ char *strlwr(char *);
+ /* char *strdup(char *); */
+-char *strndup(char *, int);
++/* char *strndup(char *, int); */
+ int strcmpi(char *, char *);
+  
+ /* void *memccpy(void *, void *, int, unsigned); */

Reply via email to