[Pkg-ocaml-maint-commits] r5567 - /trunk/packages/ocaml-gettext/trunk/debian/

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Tue Apr 29 23:37:37 UTC 2008 

Author: gildor
Date: Tue Apr 29 23:37:37 2008
New Revision: 5567

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5567
Log:
* New upstream release

Added:
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs.in
      - copied, changed from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.1
      - copied, changed from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.1
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.2
      - copied, changed from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.2
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.3
      - copied, changed from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.3
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs.in
Removed:
    trunk/packages/ocaml-gettext/trunk/debian/control.in
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.dirs
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.1
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.2
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.3
    trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs
Modified:
    trunk/packages/ocaml-gettext/trunk/debian/changelog
    trunk/packages/ocaml-gettext/trunk/debian/compat
    trunk/packages/ocaml-gettext/trunk/debian/control
    trunk/packages/ocaml-gettext/trunk/debian/copyright
    trunk/packages/ocaml-gettext/trunk/debian/rules
    trunk/packages/ocaml-gettext/trunk/debian/watch

Modified: trunk/packages/ocaml-gettext/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/changelog?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/changelog Tue Apr 29 23:37:37 2008
@@ -1,9 +1,9 @@
-ocaml-gettext (0.2.0-1) UNRELEASED; urgency=low
+ocaml-gettext (0.3.0-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
-  * Initial upload ( Closes: #305743 )
+  * Initial upload (Closes: #305743)
 
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 21 Jun 2007 23:12:28 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Wed, 30 Apr 2008 00:20:58 +0200

Modified: trunk/packages/ocaml-gettext/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/compat?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/compat (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/compat Tue Apr 29 23:37:37 2008
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/ocaml-gettext/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/control?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/control (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/control Tue Apr 29 23:37:37 2008
@@ -2,27 +2,15 @@
 Section: libdevel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: ocaml-nox (>= 3.09.2), debhelper (>> 4.0.0), ocaml-findlib, dpatch, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, xsltproc, docbook-xml, docbook-xsl, fop, chrpath, dpkg-dev (>= 1.13.19), camlidl
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.52), ocaml-nox (>= 3.10.1), debhelper (>> 5), ocaml-findlib, dpatch, libcamomile-ocaml-dev, libfileutils-ocaml-dev, xsltproc, docbook-xml, docbook-xsl, camlp4, camlp4-extra
+Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/
-
-Package: libgettext-ocaml-data
-Architecture: all
-Depends: libcamomile-ocaml-data
-Description: OCaml internationalization library data
- This library provides utilities and libraries to enable localization
- in OCaml programs. It is based on the same principle of GNU gettext.
- .
- The package provides two libraries to do effectively translation :
- - gettext-camomile : pure OCaml implementation of gettext
- - gettext-stub : implementation using the gettext library.
- .
- This package contains i18n data and documentation.
+Homepage: http://le-gall.net/sylvain+violaine/ocaml-gettext.html
 
 Package: libgettext-ocaml
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, libgettext-ocaml-data (= ${source:Version}), ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
 Description: OCaml internationalization shared library 
  This library provides utilities and libraries to enable localization
  in OCaml programs. It is based on the same principle of GNU gettext.
@@ -35,7 +23,7 @@
 
 Package: libgettext-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${binary:Version}), libgettext-ocaml-data (= ${source:Version}), camlidl
+Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${binary:Version})
 Description: OCaml internationalization library
  This library provides utilities and libraries to enable localization
  in OCaml programs. It is based on the same principle of GNU gettext.
@@ -44,6 +32,6 @@
  - gettext-camomile : pure OCaml implementation of gettext
  - gettext-stub : implementation using the gettext library.
  .
- This package contains header and OCaml library.
+ This package contains header, OCaml library and devel tools.
 
 

Modified: trunk/packages/ocaml-gettext/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/copyright?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/copyright (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/copyright Tue Apr 29 23:37:37 2008
@@ -1,15 +1,15 @@
 This package was debianized by Sylvain Le Gall <gildor at debian.org> on
-Mon, 11 Apr 2005 01:29:00 +0200.
+Tue, 29 Apr 2008 18:00:47 +0200.
 
 It was downloaded from :
 
-http://www.carva.org/sylvain.le-gall/download/
-
-
-Upstream Authors:
- Sylvain Le Gall <gildor at debian.org>
+http://le-gall.net/sylvain+violaine/download/
 
 Copyright:
+
+   Copyright (C) 2003-2008 Sylvain Le Gall 
+
+License:
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as 

Copied: trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs.in (from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs.in?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.dirs.in Tue Apr 29 23:37:37 2008
@@ -1,2 +1,1 @@
-usr/bin
-usr/share/doc/libgettext-ocaml-dev/html
+ at OCamlStdlibDir@

Copied: trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.1 (from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.1)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.1?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.1 (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.1 Tue Apr 29 23:37:37 2008
@@ -3,10 +3,8 @@
 Author: Sylvain Le Gall
 Abstract: This is the reference manual of the library ocaml-gettext, 
  an OCaml library for internationalization of OCaml program.
-Section: devel
+Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libgettext-ocaml-data/html/reference-manual/index.html
-Files: /usr/share/doc/libgettext-ocaml-data/html/reference-manual/*.html
-
-  
+Index: /usr/share/doc/libgettext-ocaml-dev/html/reference-manual/index.html
+Files: /usr/share/doc/libgettext-ocaml-dev/html/reference-manual/*.html

Copied: trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.2 (from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.2)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.2?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.2 (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.2 Tue Apr 29 23:37:37 2008
@@ -3,10 +3,8 @@
 Author: Sylvain Le Gall
 Abstract: This is the API manual of the library ocaml-gettext, 
  an OCaml library for internationalization of OCaml program.
-Section: devel
+Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libgettext-ocaml-data/html/gettext/index.html
-Files: /usr/share/doc/libgettext-ocaml-data/html/gettext/*.html
-
-  
+Index: /usr/share/doc/libgettext-ocaml-dev/html/api/index.html
+Files: /usr/share/doc/libgettext-ocaml-dev/html/api/*.html

Copied: trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.3 (from r5563, trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.3)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.3?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-data.doc-base.3 (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml-dev.doc-base.3 Tue Apr 29 23:37:37 2008
@@ -4,10 +4,8 @@
 Abstract: This is the extended API manual of the library ocaml-gettext, 
  an OCaml library for internationalization of OCaml program. It is aiming 
  at showing the low level implementation of ocaml-gettext library.
-Section: devel
+Section: Programming/OCaml
 
 Format: HTML
-Index: /usr/share/doc/libgettext-ocaml-data/html/gettext-ext/index.html
-Files: /usr/share/doc/libgettext-ocaml-data/html/gettext-ext/*.html
-
-  
+Index: /usr/share/doc/libgettext-ocaml-dev/html/api-ext/index.html
+Files: /usr/share/doc/libgettext-ocaml-dev/html/api-ext/*.html

Added: trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs.in?rev=5567&op=file
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs.in (added)
+++ trunk/packages/ocaml-gettext/trunk/debian/libgettext-ocaml.dirs.in Tue Apr 29 23:37:37 2008
@@ -1,0 +1,2 @@
+ at OCamlDllDir@
+/usr/share/locale/

Modified: trunk/packages/ocaml-gettext/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/rules?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/rules (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/rules Tue Apr 29 23:37:37 2008
@@ -1,78 +1,48 @@
 #!/usr/bin/make -f
+# debian/rules for ocaml-gettext package
+# Copyright (C) 2008 Sylvain Le Gall <gildor at debian.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
 
-include /usr/share/dpatch/dpatch.make 
-PACKAGE=ocaml-gettext
-OCAMLIBDIR=`ocamlc -where`
-OCAMLABI=$(shell ocamlc -version)
-DESTDIR=$(CURDIR)/debian/libgettext-ocaml
-DESTDIR_DEV=$(CURDIR)/debian/libgettext-ocaml-dev
-DESTDIR_DATA=$(CURDIR)/debian/libgettext-ocaml-data
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-debian/control: debian/control.in
-	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
-	
-configure: configure-stamp
-configure-stamp: patch-stamp
-	dh_testdir
-	./configure --prefix=$(DESTDIR_DEV)/usr \
-	 --with-docdir=$(DESTDIR_DATA)/usr/share/doc/libgettext-ocaml-data/ \
-	 --libdir=$(DESTDIR_DEV)/$(OCAMLIBDIR) \
-	 --mandir=$(DESTDIR_DEV)/usr/share/man
-	touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	env LC_ALL=C $(MAKE) all
-	touch build-stamp
+PACKAGE=libgettext-ocaml
+DESTDIR=$(CURDIR)/debian/$(PACKAGE)
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	-$(RM) build-stamp configure-stamp
-	-$(MAKE) distclean
-	dh_clean
+PACKAGE_DEV=libgettext-ocaml-dev
+DESTDIR_DEV=$(CURDIR)/debian/$(PACKAGE_DEV)
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	mkdir -p $(DESTDIR_DEV)/$(OCAMLIBDIR)
-	mkdir -p $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
-	make install LDCONF=ignore PODIR=$(DESTDIR_DATA)/usr/share/locale/
-	mv $(DESTDIR_DEV)/$(OCAMLIBDIR)/gettext-stub/*.so \
-	 $(DESTDIR)/$(OCAMLIBDIR)/stublibs/
-	chrpath -d $(DESTDIR)/$(OCAMLIBDIR)/stublibs/*.so
+DEB_MAKE_CLEAN_TARGET    := distclean
+DEB_MAKE_BUILD_TARGET    := all 
+DEB_MAKE_INSTALL_TARGET  := install 
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --prefix='$(DESTDIR_DEV)/usr'
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --docdir='$(DESTDIR_DEV)/usr/share/doc/$(PACKAGE_DEV)'
+DEB_CONFIGURE_EXTRA_FLAGS += \
+ --with-ocamlfind-install-flags="-destdir '$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)' -ldconf ignore"
 
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums -i
-	dh_builddeb -i
+install/$(PACKAGE_DEV):: install/$(PACKAGE)
+	mv $(DESTDIR_DEV)/usr/share/locale/* \
+	 $(DESTDIR)/usr/share/locale/
+	$(RM) -r $(DESTDIR_DEV)/usr/share/locale
+	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gettext-stub/*.so \
+	 $(DESTDIR)/$(OCAML_DLL_DIR)
 
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installchangelogs -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install debian/control

Modified: trunk/packages/ocaml-gettext/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/watch?rev=5567&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/watch (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/watch Tue Apr 29 23:37:37 2008
@@ -1,2 +1,2 @@
-version=2
-http://www.carva.org/sylvain.le-gall/download/ocaml-gettext-([0-9\.]*).tar.gz
+version=3
+http://le-gall.net/sylvain+violaine/download/ocaml-gettext-([0-9\.]*).tar.gz

More information about the Pkg-ocaml-maint-commits mailing list