[SCM] libshout/master: Drop patches: Adopted/addressed upstream.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Aug 29 12:28:50 UTC 2017


The following commit has been merged in the master branch:
commit 1dfc4cca4a7d2627fc399b9b24363674c6dcabc9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 29 14:18:27 2017 +0200

    Drop patches: Adopted/addressed upstream.

diff --git a/debian/patches/1001_upstream_is_not_debian.patch b/debian/patches/1001_upstream_is_not_debian.patch
deleted file mode 100644
index 4a46792..0000000
--- a/debian/patches/1001_upstream_is_not_debian.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Avoid registering debian subdir with autotools
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2012-03-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.ac
-+++ b/configure.ac
-@@ -210,7 +210,7 @@
- AC_SUBST(XIPH_CFLAGS)
- AC_SUBST(XIPH_CPPFLAGS)
- 
--AC_OUTPUT([Makefile debian/Makefile include/Makefile include/shout/Makefile
-+AC_OUTPUT([Makefile include/Makefile include/shout/Makefile
-   include/shout/shout.h src/Makefile src/net/Makefile src/timing/Makefile
-   src/thread/Makefile src/avl/Makefile src/httpp/Makefile doc/Makefile
-   examples/Makefile win32/Makefile shout.pc])
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,7 @@
- AUTOMAKE_OPTIONS = 1.6 foreign
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = include src examples debian doc win32
-+SUBDIRS = include src examples doc win32
- 
- EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
- 	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
diff --git a/debian/patches/1003_fix_pkg-config_requires.patch b/debian/patches/1003_fix_pkg-config_requires.patch
deleted file mode 100644
index 2fb623a..0000000
--- a/debian/patches/1003_fix_pkg-config_requires.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Avoid static link flags from appearing for dynamic linking
-Author: Romain Beauxis <toots at rastageeks.org>
-Last-Update: 2007-12-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/shout.pc.in
-+++ b/shout.pc.in
-@@ -10,6 +10,6 @@
- Name: Shout
- Description: Audio streaming library for icecast encoders
- Version: @VERSION@
--Requires: @SHOUT_REQUIRES@
-+Requires.private: @SHOUT_REQUIRES@
- Libs: -L${libdir} -lshout
- Cflags: -I${includedir} @PTHREAD_CPPFLAGS@ @SHOUT_CFLAGS@
diff --git a/debian/patches/README b/debian/patches/README
deleted file mode 100644
index 80c1584..0000000
--- a/debian/patches/README
+++ /dev/null
@@ -1,3 +0,0 @@
-0xxx: Grabbed from upstream development.
-1xxx: Possibly relevant for upstream adoption.
-2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 90d9845..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-1001_upstream_is_not_debian.patch
-1003_fix_pkg-config_requires.patch

-- 
libshout packaging



More information about the pkg-multimedia-commits mailing list