[SCM] rtmidi/master: Rename package for GCC 5 transition
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Tue Aug 4 23:23:51 UTC 2015
The following commit has been merged in the master branch:
commit f50c241883aabbb8ea955b8ef64d8db4675a9b7a
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date: Wed Aug 5 01:18:03 2015 +0200
Rename package for GCC 5 transition
diff --git a/debian/control b/debian/control
index d7a9571..844f676 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Homepage: http://www.music.mcgill.ca/~gary/rtmidi/
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/rtmidi.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/rtmidi.git
-Package: librtmidi2
+Package: librtmidi2v5
Architecture: linux-any
Multi-Arch: same
Pre-Depends:
@@ -55,7 +55,7 @@ Depends:
libasound2-dev,
libjack-dev,
librtaudio-dev,
- librtmidi2 (= ${binary:Version}),
+ librtmidi2v5 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: C++ library for realtime MIDI input/ouput (development files)
@@ -73,7 +73,7 @@ Priority: extra
Architecture: linux-any
Multi-Arch: same
Depends:
- librtmidi2 (= ${binary:Version}),
+ librtmidi2v5 (= ${binary:Version}),
${misc:Depends}
Description: C++ library for realtime MIDI input/ouput (debugging symbols)
RtMidi is a set of C++ classes that provides a common API (Application
diff --git a/debian/librtmidi2.install b/debian/librtmidi2v5.install
similarity index 100%
rename from debian/librtmidi2.install
rename to debian/librtmidi2v5.install
diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 3fd8184..4ad4d32 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -117,8 +117,8 @@
- $(LN) -sf @sharedname@ $(SHARED)
- $(LN) -sf @sharedname@ $(SHARED).$(MAJOR)
+ $(CC) -fPIC @libflags@ $(LDFLAGS) $(OBJECTS) @LIBS@
-+ $(LN) -s @sharedname at .$(RELEASE) $(SHARED)
-+ $(LN) -s @sharedname at .$(RELEASE) $(SHARED).$(MAJOR)
++ $(LN) -s @sharedname@ $(SHARED)
++ $(LN) -s @sharedname@ $(SHARED).$(MAJOR)
# $(CC) -shared $(OBJECTS) -o $(SHARED) @LIBS@
@@ -131,17 +131,6 @@
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR(RtMidi.cpp)
AC_CONFIG_FILES([rtmidi-config librtmidi.pc Makefile tests/Makefile])
-@@ -50,8 +51,8 @@
- AC_CANONICAL_HOST
-
- AC_SUBST( sharedlib, ["librtmidi.so"] )
--AC_SUBST( sharedname, ["librtmidi.so.\$(RELEASE)"] )
--AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHARED).\$(MAJOR) -o \$(SHARED).\$(RELEASE)"] )
-+AC_SUBST( sharedname, ["librtmidi.so.\$(MAJOR)"] )
-+AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHARED).\$(MAJOR) -o \$(SHARED).\$(MAJOR).\$(RELEASE)"] )
- case $host in
- *-apple*)
- AC_SUBST( sharedlib, ["librtmidi.dylib"] )
@@ -60,14 +61,20 @@
esac
diff --git a/debian/patches/0003-gcc-5.patch b/debian/patches/0003-gcc-5.patch
new file mode 100644
index 0000000..beb1463
--- /dev/null
+++ b/debian/patches/0003-gcc-5.patch
@@ -0,0 +1,17 @@
+Description: Bump SONAME for GCC 5 transition
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2015-08-05
+
+--- rtmidi-2.1.0~ds0.orig/Makefile.in
++++ rtmidi-2.1.0~ds0/Makefile.in
+@@ -8,8 +8,8 @@ OBJECTS = RtMidi.o
+
+ LIBNAME = librtmidi
+ SHARED = @sharedlib@
+-RELEASE = 2.1.0
+-MAJOR = 2
++RELEASE = 2v5.1.0
++MAJOR = 2v5
+ LIBRARIES = $(SHARED)
+
+ CC = @CXX@
diff --git a/debian/patches/series b/debian/patches/series
index ffafa1c..165efbb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-buildsystem.patch
0002-ppc64_support.patch
+0003-gcc-5.patch
--
RtMidi packaging
More information about the pkg-multimedia-commits
mailing list