[Pkg-ocaml-maint-commits] r2052 - in trunk/packages/ocaml-vorbis: . trunk trunk/debian upstream

[Samuel Mimram]

Author: smimram-guest
Date: 2005-11-15 21:09:42 +0000 (Tue, 15 Nov 2005)
New Revision: 2052

Added:
   trunk/packages/ocaml-vorbis/trunk/debian/svn-deblayout
   trunk/packages/ocaml-vorbis/upstream/
   trunk/packages/ocaml-vorbis/upstream/ocaml-vorbis_0.2.1.orig.tar.gz
Removed:
   trunk/packages/ocaml-vorbis/trunk/ocaml-vorbis_0.2.0.orig.tar.gz
Modified:
   trunk/packages/ocaml-vorbis/trunk/debian/
   trunk/packages/ocaml-vorbis/trunk/debian/control
   trunk/packages/ocaml-vorbis/trunk/debian/rules
   trunk/packages/ocaml-vorbis/trunk/debian/watch
Log:
Using svn-buildpackage.


Property changes on: trunk/packages/ocaml-vorbis/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/ocaml-vorbis/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/control	2005-11-15 20:51:52 UTC (rev 2051)
+++ trunk/packages/ocaml-vorbis/trunk/debian/control	2005-11-15 21:09:42 UTC (rev 2052)
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
 Build-Depends: debhelper (>> 4.0.0), libvorbis-dev, ocaml-nox-3.08.3, ocaml-findlib
-Standards-Version: 3.6.1.1
+Standards-Version: 3.6.2
 
 Package: libvorbis-ocaml
 Section: libs
 Architecture: any
 Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
 Description: OCaml bindings for vorbis library
- This OCaml library interfaces the vorbis C library. It can be used to 
- decode from or encode to the Ogg Vorbis compressed audio format as well 
+ This OCaml library interfaces the vorbis C library. It can be used to
+ decode from or encode to the Ogg Vorbis compressed audio format as well
  as to get informations about an Ogg Vorbis file.
  .
  Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
@@ -25,8 +25,8 @@
 Architecture: any
 Depends: ocaml-nox-3.08.3, libvorbis-dev, libvorbis-ocaml (= ${Source-Version})
 Description: OCaml bindings for the vorbis library
- This OCaml library interfaces the vorbis C library. It can be used to 
- decode from or encode to the Ogg Vorbis compressed audio format as well 
+ This OCaml library interfaces the vorbis C library. It can be used to
+ decode from or encode to the Ogg Vorbis compressed audio format as well
  as to get informations about an Ogg Vorbis file.
  .
  Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,

Modified: trunk/packages/ocaml-vorbis/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/rules	2005-11-15 20:51:52 UTC (rev 2051)
+++ trunk/packages/ocaml-vorbis/trunk/debian/rules	2005-11-15 21:09:42 UTC (rev 2052)
@@ -6,8 +6,17 @@
 #export DH_VERBOSE=1
 
 DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
-CFLAGS = "-O2 -g -fPIC"
+CFLAGS = -Wall -g -fPIC
 
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+        INSTALL_PROGRAM += -s
+endif
+
 config.status: configure
 	dh_testdir
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
@@ -16,7 +25,7 @@
 build-stamp: config.status
 	dh_testdir
 
-	$(MAKE) CFLAGS=$(CFLAGS)
+	$(MAKE)
 
 	touch build-stamp
 

Added: trunk/packages/ocaml-vorbis/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/svn-deblayout	2005-11-15 20:51:52 UTC (rev 2051)
+++ trunk/packages/ocaml-vorbis/trunk/debian/svn-deblayout	2005-11-15 21:09:42 UTC (rev 2052)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-vorbis/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml-vorbis

Modified: trunk/packages/ocaml-vorbis/trunk/debian/watch
===================================================================
--- trunk/packages/ocaml-vorbis/trunk/debian/watch	2005-11-15 20:51:52 UTC (rev 2051)
+++ trunk/packages/ocaml-vorbis/trunk/debian/watch	2005-11-15 21:09:42 UTC (rev 2052)
@@ -1,2 +1,3 @@
 version=2
-ftp://ftp2.sf.net/pub/sourceforge/s/sa/savonet/ocaml-vorbis-([0-9\.]*)\.tar\.gz debian uupdate
+
+http://heanet.dl.sourceforge.net/sourceforge/savonet/ocaml-vorbis-([0-9\.]*)\.tar\.gz debian uupdate

Deleted: trunk/packages/ocaml-vorbis/trunk/ocaml-vorbis_0.2.0.orig.tar.gz
===================================================================
(Binary files differ)

Added: trunk/packages/ocaml-vorbis/upstream/ocaml-vorbis_0.2.1.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/ocaml-vorbis/upstream/ocaml-vorbis_0.2.1.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream