[SCM] libdiscid/experimental: Drop hurd.patch
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Fri Mar 8 18:14:53 UTC 2013
The following commit has been merged in the experimental branch:
commit 0d516b8a7ea2d18d75ff7c734897cc1025f7d644
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Fri Mar 8 18:51:26 2013 +0100
Drop hurd.patch
Signed-off-by: Sebastian Ramacher <sramacher at debian.org>
diff --git a/debian/changelog b/debian/changelog
index 1c6fe6f..b895a90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
+libdiscid (0.4.0-2) UNRELEASED; urgency=low
+
+ * debian/patches/hurd.patch: Not needed anymore, superseded by upstream's
+ generic platform support.
+
+ -- Sebastian Ramacher <sramacher at debian.org> Fri, 08 Mar 2013 17:44:17 +0100
+
libdiscid (0.4.0-1) experimental; urgency=low
* New upstream release. (Closes: #702570)
* debian/rules: Run docs target instead of running doxygen manually.
* debian/libdiscid0.symbols: Add new symbols.
- * debian/patches/hurd.path: Refresh.
+ * debian/patches/hurd.patch: Refresh.
-- Sebastian Ramacher <sramacher at debian.org> Fri, 08 Mar 2013 15:27:57 +0100
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index 78335c6..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Fixes FTBFS on GNU/Hurd
-Author: Pino Toscano <pino at kde.org>
-Bug-Debian: http://bugs.debian.org/558756
-Forwarded: no
-Last-Update: 2013-02-02
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,6 +53,7 @@
- #*-os2_emx*) os=os2 ;;
- *-solaris*) os=solaris ;;
- #*-qnx*) os=qnx; LIBS='-lsocket' ;;
-+ *-gnu*) os=gnu ;;
- *) os=generic;
- AC_MSG_WARN([unsupported operating system, no disc reading available!]) ;;
- esac
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -23,7 +23,7 @@
- libdiscid_la_SOURCES = base64.c sha1.c disc.c
- EXTRA_libdiscid_la_SOURCES = \
- disc_linux.c disc_win32.c disc_win32_new.c \
-- disc_darwin.c disc_freebsd.c disc_solaris.c disc_openbsd.c
-+ disc_darwin.c disc_freebsd.c disc_solaris.c disc_openbsd.c disc_gnu.c
-
- AM_CPPFLAGS = -I$(top_srcdir)/include
- libdiscid_la_LIBADD = @DISC_OS_OBJ@
---- /dev/null
-+++ b/src/disc_gnu.c
-@@ -0,0 +1,50 @@
-+/* --------------------------------------------------------------------------
-+
-+ MusicBrainz -- The Internet music metadatabase
-+
-+ Copyright (C) 2009 Pino Toscano <pino at kde.org>
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this library; if not, write to the Free Software
-+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
-+
-+--------------------------------------------------------------------------- */
-+#define _GNU_SOURCE
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/ioctl.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <assert.h>
-+#include <stdio.h>
-+
-+#include "discid/discid_private.h"
-+
-+#define MB_DEFAULT_DEVICE "/dev/cdrom"
-+
-+char *mb_disc_get_default_device_unportable(void) {
-+ return MB_DEFAULT_DEVICE;
-+}
-+
-+int mb_disc_read_unportable(mb_disc_private *disc, const char *device) {
-+
-+ {
-+ snprintf(disc->error_msg, MB_ERROR_MSG_LENGTH,
-+ "cannot open device `%s'", device);
-+ return 0;
-+ }
-+}
-+
-+/* EOF */
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 27e280c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-hurd.patch
--
libdiscid packaging
More information about the pkg-multimedia-commits
mailing list