[SCM] xvidcore/master: Convert package to support multiarch. Patch to build system was needed to install symlinks from build system.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Sat Sep 17 16:55:24 UTC 2011 

The following commit has been merged in the master branch:
commit 4f5963cb9009059abaf4a3d71f56dbbe6cda0a46
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Sep 17 12:53:00 2011 -0400

    Convert package to support multiarch.
    Patch to build system was needed to install symlinks from build system.

diff --git a/debian/changelog b/debian/changelog
index d105944..7e9b8f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvidcore (2:1.3.2-6) unstable; urgency=low
+
+  * Convert package to support multiarch library.
+
+ -- Andres Mejia <amejia at debian.org>  Sat, 17 Sep 2011 12:36:05 -0400
+
 xvidcore (2:1.3.2-5) unstable; urgency=low
 
   * Introduce a debian/confflags file to conditionally disable
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 4e1b49d..703fb62 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Loïc Martin <loic.martin3 at gmail.com>,
            Reinhard Tartler <siretart at tauware.de>,
            Fabian Greffrath <fabian+debian at greffrath.com>,
            Andres Mejia <amejia at debian.org>
-Build-Depends: debhelper (>= 7.3~),
+Build-Depends: debhelper (>= 8.1.3~),
                yasm (>= 1.0) [any-i386 amd64],
                autoconf
 Standards-Version: 3.9.2
@@ -17,6 +17,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xvidcore.git
 
 Package: libxvidcore4
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: Open source MPEG-4 video codec (library)
diff --git a/debian/libxvidcore-dev.install b/debian/libxvidcore-dev.install
index e7d1857..f349901 100644
--- a/debian/libxvidcore-dev.install
+++ b/debian/libxvidcore-dev.install
@@ -1,2 +1,3 @@
 usr/include
-usr/lib/*.a
+usr/lib/*/*.a
+usr/lib/*/*.so
diff --git a/debian/libxvidcore-dev.links b/debian/libxvidcore-dev.links
deleted file mode 100644
index c48cfc4..0000000
--- a/debian/libxvidcore-dev.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libxvidcore.so.4.3 /usr/lib/libxvidcore.so
diff --git a/debian/libxvidcore4.install b/debian/libxvidcore4.install
index 093956b..3de3b10 100644
--- a/debian/libxvidcore4.install
+++ b/debian/libxvidcore4.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libxvidcore4.links b/debian/libxvidcore4.links
deleted file mode 100644
index 7a8c719..0000000
--- a/debian/libxvidcore4.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libxvidcore.so.4.3 /usr/lib/libxvidcore.so.4
diff --git a/debian/patches/add-soname-links.patch b/debian/patches/add-soname-links.patch
new file mode 100644
index 0000000..efd2d20
--- /dev/null
+++ b/debian/patches/add-soname-links.patch
@@ -0,0 +1,88 @@
+Description: xvidcore: Adds common symlinks for shared library.
+Author: Andres Mejia <amejia at debian.org>
+
+--- a/build/generic/configure.in
++++ b/build/generic/configure.in
+@@ -144,6 +144,12 @@
+ AC_CHECK_TOOL([AR], [ar], [ar-not-found])
+ 
+ dnl ==========================================================================
++dnl Check how the system supports symlinks.
++dnl ==========================================================================
++
++AC_PROG_LN_S
++
++dnl ==========================================================================
+ dnl
+ dnl This part looks for:
+ dnl
+@@ -280,11 +286,15 @@
+ SPECIFIC_CFLAGS=""
+ ALTIVEC_CFLAGS=""
+ PRE_SHARED_LIB=""
++SO_API_MAJOR_LINK=""
++SO_LINK=""
+ case "$target_os" in
+      linux*|solaris*|gnu*)
+ 	AC_MSG_RESULT([ok])
+ 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
++	SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
++	SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
+ 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
+ 	SPECIFIC_CFLAGS="-fPIC"
+ 	;;
+@@ -292,6 +302,8 @@
+ 	AC_MSG_RESULT([ok])
+ 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+ 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
++	SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
++	SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
+ 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
+ 	SPECIFIC_CFLAGS="-fPIC"
+ 	;;
+@@ -711,12 +723,15 @@
+ AC_SUBST(SPECIFIC_CFLAGS)
+ AC_SUBST(DCT_IA64_SOURCES)
+ AC_SUBST(PPC_ALTIVEC_SOURCES)
++AC_SUBST(LN_S)
+ AC_SUBST(RANLIB)
+ AC_SUBST(AR)
+ AC_SUBST(API_MAJOR)
+ AC_SUBST(API_MINOR)
+ AC_SUBST(STATIC_LIB)
+ AC_SUBST(PRE_SHARED_LIB)
++AC_SUBST(SO_API_MAJOR_LINK)
++AC_SUBST(SO_LINK)
+ AC_SUBST(SHARED_LIB)
+ AC_SUBST(ALTIVEC_CFLAGS)
+ 
+--- a/build/generic/platform.inc.in
++++ b/build/generic/platform.inc.in
+@@ -57,6 +57,7 @@
+ # ============================================================================
+ 
+ INSTALL=@INSTALL@
++LN_S=@LN_S@
+ DESTDIR=
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+@@ -79,3 +80,5 @@
+ STATIC_LIB=@STATIC_LIB@
+ SHARED_LIB=@SHARED_LIB@
+ PRE_SHARED_LIB=@PRE_SHARED_LIB@
++SO_API_MAJOR_LINK=@SO_API_MAJOR_LINK@
++SO_LINK=@SO_LINK@
+--- a/build/generic/Makefile
++++ b/build/generic/Makefile
+@@ -145,6 +145,10 @@
+ 	@$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	@echo "  I: $(libdir)/$(SHARED_LIB)"
+ 	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
++	@test -z "$(SO_API_MAJOR_LINK)" || \
++		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_API_MAJOR_LINK)
++	@test -z "$(SO_LINK)" || \
++		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_LINK)
+ 	@echo "  I: $(libdir)/$(STATIC_LIB)"
+ 	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
+ 	@echo "  D: $(includedir)"
diff --git a/debian/patches/series b/debian/patches/series
index 38aa8a2..901b0e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 hurd.diff
+add-soname-links.patch
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..0df8842
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Ignore this, since currently only debhelper (>= 8.1.3~) is needed.
+xvidcore source: package-needs-versioned-debhelper-build-depends 9

-- 
xvidcore packaging

More information about the pkg-multimedia-commits mailing list