[Pkg-ocaml-maint-commits] r2929 - in /trunk/packages/ocaml-gettext/trunk/debian: changelog control control.in copyright rules

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Tue Jul 11 21:53:12 UTC 2006


Author: gildor
Date: Tue Jul 11 21:53:12 2006
New Revision: 2929

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2929
Log:
* Made architecture of not yet released package more compliant -- SLG

Added:
    trunk/packages/ocaml-gettext/trunk/debian/control.in
      - copied, changed from r2809, trunk/packages/ocaml-gettext/trunk/debian/control
Modified:
    trunk/packages/ocaml-gettext/trunk/debian/changelog
    trunk/packages/ocaml-gettext/trunk/debian/control
    trunk/packages/ocaml-gettext/trunk/debian/copyright
    trunk/packages/ocaml-gettext/trunk/debian/rules

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=2929&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/changelog Tue Jul 11 21:53:12 2006
@@ -1,17 +1,5 @@
 ocaml-gettext (0.2.0-3) unstable; urgency=low
-
-  * Remove direct reference to ocaml library dir
-
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Wed,  9 Nov 2005 17:05:53 +0100
-
-ocaml-gettext (0.2.0-2) unstable; urgency=low
-
-  * Transition to svn-buildpackage
-
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 22 Aug 2005 23:51:28 +0200
-
-ocaml-gettext (0.2.0-1) unstable; urgency=low
 
   * Initial upload ( Closes: #305743 )
 
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 11 Apr 2005 02:05:00 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Wed,  9 Nov 2005 17:05:53 +0100

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=2929&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/control (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/control Tue Jul 11 21:53:12 2006
@@ -1,9 +1,9 @@
 Source: ocaml-gettext
 Section: libdevel
 Priority: optional
-Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org> 
-Build-Depends: ocaml-nox-3.08.3, debhelper (>> 4.0.0), ocaml-findlib, dpatch, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, xsltproc, docbook-xml, docbook-xsl, fop, chrpath
-Standards-Version: 3.6.1
+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)
+Standards-Version: 3.7.2
 
 Package: libgettext-ocaml-data
 Architecture: all
@@ -20,7 +20,7 @@
 
 Package: libgettext-ocaml
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, libgettext-ocaml-data (= ${Source-Version}), ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, libgettext-ocaml-data (= ${source:Version}), ${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.
@@ -33,7 +33,7 @@
 
 Package: libgettext-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-3.08.3, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${Source-Version}), libgettext-ocaml-data (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${binary:Version}), libgettext-ocaml-data (= ${source: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.

Copied: trunk/packages/ocaml-gettext/trunk/debian/control.in (from r2809, trunk/packages/ocaml-gettext/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-gettext/trunk/debian/control.in?rev=2929&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/control (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/control.in Tue Jul 11 21:53:12 2006
@@ -1,9 +1,9 @@
 Source: ocaml-gettext
 Section: libdevel
 Priority: optional
-Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org> 
-Build-Depends: ocaml-nox-3.08.3, debhelper (>> 4.0.0), ocaml-findlib, dpatch, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, xsltproc, docbook-xml, docbook-xsl, fop, chrpath
-Standards-Version: 3.6.1
+Maintainer: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: ocaml-nox (>= #OCamlABI#), 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)
+Standards-Version: 3.7.2
 
 Package: libgettext-ocaml-data
 Architecture: all
@@ -20,7 +20,7 @@
 
 Package: libgettext-ocaml
 Architecture: any
-Depends: ocaml-base-nox-3.08.3, libgettext-ocaml-data (= ${Source-Version}), ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, libgettext-ocaml-data (= ${source:Version}), ${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.
@@ -33,7 +33,7 @@
 
 Package: libgettext-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-3.08.3, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${Source-Version}), libgettext-ocaml-data (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libcamomile-ocaml-dev, libast-analyze-ocaml-dev, libfileutils-ocaml-dev, libgettext-ocaml (= ${binary:Version}), libgettext-ocaml-data (= ${source: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.

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=2929&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/copyright (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/copyright Tue Jul 11 21:53:12 2006
@@ -23,8 +23,8 @@
 
    You should have received a copy of the GNU Lesser General Public License
    along with this package; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 
+   USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.

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=2929&op=diff
==============================================================================
--- trunk/packages/ocaml-gettext/trunk/debian/rules (original)
+++ trunk/packages/ocaml-gettext/trunk/debian/rules Tue Jul 11 21:53:12 2006
@@ -1,12 +1,16 @@
 #!/usr/bin/make -f
 
+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/dpatch/dpatch.make 
-
+debian/control: debian/control.in
+	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+	
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
@@ -50,7 +54,7 @@
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_gencontrol -i
+	dh_gencontrol -i -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums -i
 	dh_builddeb -i
 
@@ -66,9 +70,9 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_gencontrol -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 
+.PHONY: build clean binary-indep binary-arch binary install debian/control




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