[Pkg-ocaml-maint-commits] r4283 - in /trunk/packages/ocaml-vorbis/trunk/debian: changelog patches/ patches/00list patches/link.dpatch rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Sun Sep  2 22:37:32 2007
New Revision: 4283

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4283
Log:
Correctly link.

Added:
    trunk/packages/ocaml-vorbis/trunk/debian/patches/
    trunk/packages/ocaml-vorbis/trunk/debian/patches/00list
    trunk/packages/ocaml-vorbis/trunk/debian/patches/link.dpatch   (with props)
Modified:
    trunk/packages/ocaml-vorbis/trunk/debian/changelog
    trunk/packages/ocaml-vorbis/trunk/debian/rules

Modified: trunk/packages/ocaml-vorbis/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-vorbis/trunk/debian/changelog?rev=4283&op=diff
==============================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-vorbis/trunk/debian/changelog Sun Sep  2 22:37:32 2007
@@ -1,3 +1,10 @@
+ocaml-vorbis (0.3.1-2) UNRELEASED; urgency=low
+
+  * Using dpatch to handle patches.
+  * Added link.dpatch to correctly link shared library, closes: #433055.
+
+ -- Samuel Mimram <smimram at debian.org>  Mon, 03 Sep 2007 00:37:33 +0200
+
 ocaml-vorbis (0.3.1-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/ocaml-vorbis/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-vorbis/trunk/debian/patches/00list?rev=4283&op=file
==============================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/patches/00list (added)
+++ trunk/packages/ocaml-vorbis/trunk/debian/patches/00list Sun Sep  2 22:37:32 2007
@@ -1,0 +1,1 @@
+link

Added: trunk/packages/ocaml-vorbis/trunk/debian/patches/link.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-vorbis/trunk/debian/patches/link.dpatch?rev=4283&op=file
==============================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/patches/link.dpatch (added)
+++ trunk/packages/ocaml-vorbis/trunk/debian/patches/link.dpatch Sun Sep  2 22:37:32 2007
@@ -1,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## link.dpatch by Julien Cristau <jcristau at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct a linking problem, see #433055.
+
+ at DPATCH@
+diff -urNad ocaml-vorbis-0.3.1~/configure.ac ocaml-vorbis-0.3.1/configure.ac
+--- ocaml-vorbis-0.3.1~/configure.ac	2007-05-22 13:50:24.000000000 +0200
++++ ocaml-vorbis-0.3.1/configure.ac	2007-09-03 00:33:49.000000000 +0200
+@@ -110,8 +110,32 @@
+ 
+ AC_PROG_CC
+ 
+-PKG_CHECK_MODULES([OGG],[ogg])
+-PKG_CHECK_MODULES([VORBIS],[vorbis vorbisenc vorbisfile])
++# PKG_CHECK_MODULE loses, because we need --libs-only-l
++# PKG_CHECK_MODULES([OGG],[ogg])
++AC_PATH_PROG(PKGCONFIG, pkg-config, no)
++if test "$PKGCONFIG" = no; then
++	AC_MSG_ERROR([pkg-config not found.])
++fi
++if ! $PKGCONFIG --exists ogg; then
++	AC_MSG_ERROR([libogg not found.])
++fi
++OGG_LDFLAGS=`$PKGCONFIG --libs-only-L ogg`
++AC_SUBST([OGG_LDFLAGS])
++OGG_CFLAGS=`$PKGCONFIG --cflags ogg`
++AC_SUBST([OGG_CFLAGS])
++OGG_LIBS=`$PKGCONFIG --libs-only-l ogg`
++AC_SUBST([OGG_LIBS])
++
++#PKG_CHECK_MODULES([VORBIS],[vorbis vorbisenc vorbisfile])
++if ! $PKGCONFIG --exists vorbis vorbisenc vorbisfile; then
++	AC_MSG_ERROR([libvorbis not found.])
++fi
++VORBIS_LDFLAGS=`$PKGCONFIG --libs-only-L vorbis vorbisenc vorbisfile`
++AC_SUBST([VORBIS_LDFLAGS])
++VORBIS_CFLAGS=`$PKGCONFIG --cflags vorbis vorbisenc vorbisfile`
++AC_SUBST([VORBIS_CFLAGS])
++VORBIS_LIBS=`$PKGCONFIG --libs-only-l vorbis vorbisenc vorbisfile`
++AC_SUBST([VORBIS_LIBS])
+ 
+ # other progs
+ AC_PATH_PROG(OCAMLFIND,ocamlfind,no)
+diff -urNad ocaml-vorbis-0.3.1~/src/Makefile.in ocaml-vorbis-0.3.1/src/Makefile.in
+--- ocaml-vorbis-0.3.1~/src/Makefile.in	2007-05-22 13:50:24.000000000 +0200
++++ ocaml-vorbis-0.3.1/src/Makefile.in	2007-09-03 00:34:44.000000000 +0200
+@@ -36,7 +36,7 @@
+ LIBS = unix str
+ ACLIBS = @LIBS@
+ CLIBS = $(ACLIBS:-l%=%)
+-LDFLAGS = @LDFLAGS@ @OGG_LIBS@ @VORBIS_LIBS@
++LDFLAGS = @LDFLAGS@ @OGG_LDFLAGS@ @VORBIS_LDFLAGS@
+ 
+ all: $(BEST)
+ 

Propchange: trunk/packages/ocaml-vorbis/trunk/debian/patches/link.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocaml-vorbis/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-vorbis/trunk/debian/rules?rev=4283&op=diff
==============================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/rules (original)
+++ trunk/packages/ocaml-vorbis/trunk/debian/rules Sun Sep  2 22:37:32 2007
@@ -4,6 +4,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
 
 OCAMLABI := $(shell ocamlc -version)
 OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
@@ -27,7 +29,7 @@
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-build: ocamlinit build-stamp
+build: ocamlinit patch-stamp build-stamp
 build-stamp: config.status
 	dh_testdir
 
@@ -35,7 +37,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp