[Pkg-ocaml-maint-commits] r6000 - in /trunk/packages/facile/trunk/debian: changelog control copyright libfacile-ocaml-dev.dirs.in rules watch

lool at users.alioth.debian.org lool at users.alioth.debian.org
Mon Oct 6 13:45:15 UTC 2008 

Author: lool
Date: Mon Oct  6 13:45:14 2008
New Revision: 6000

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=6000
Log:
* Only compute OCAML_ABI once by using := instead of =.
* Don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of -- to pass
  args to dpkg-gencontrol in a safer manner.
* Include dpatch.mk instead of calling dpatch manually; NB: this will cause
  the patches to be applied before running configure which is more useful,
  but doesn't change anything with the current patches; bump up cdbs bdep to
  >= 0.4.21.
* Use the makefile.mk cdbs class instead of the autotools one.
  - Move the configure flag to a new custom common-configure-impl /
    config_Makefile rule.
  - Drop --disable-maintainer-mode exclusion hack.
  - Don't call make clean in clean; cdbs does that for us.
  - Set DEB_MAKE_INSTALL_TARGET to install.
* Drop redundant setting of FACILEDIR with the echo >config_Makefile
  construct; the configure flag works fine.
* Replace debian/libfacile-ocaml-dev.dirs.in template and logic with
  DEB_INSTALL_DIRS_ALL; fixes lack of cleanup of
  debian/libfacile-ocaml-dev.dirs.
* Set OCAMLC OCAMLMLI via DEB_MAKE_INVOKE instead of DEB_MAKE_BUILD_TARGET;
  this sets the same environment for all make runs.
* Add year 2004 to copyright.
* Point at common-licenses for the full text of the LGPL and include the
  full licensing header.
* Depend on ${misc:Depends} as recommended in debhelper 5.
* Set DEB_MAKE_CHECK_TARGET to check to run the testsuite during package
  build.
* Use Vcs-* headers instead of XS-Vcs-*.
* Bump up Standards-Version to 3.8.0.

Added:
    trunk/packages/facile/trunk/debian/watch
Removed:
    trunk/packages/facile/trunk/debian/libfacile-ocaml-dev.dirs.in
Modified:
    trunk/packages/facile/trunk/debian/changelog
    trunk/packages/facile/trunk/debian/control
    trunk/packages/facile/trunk/debian/copyright
    trunk/packages/facile/trunk/debian/rules

Modified: trunk/packages/facile/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/changelog?rev=6000&op=diff
==============================================================================
--- trunk/packages/facile/trunk/debian/changelog (original)
+++ trunk/packages/facile/trunk/debian/changelog Mon Oct  6 13:45:14 2008
@@ -1,8 +1,39 @@
-facile (1.1-6.2) UNRELEASED; urgency=low
+facile (1.1-6.2) unstable; urgency=low
 
+  [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 31 Dec 2007 16:49:58 +0100
+  [ Loic Minier ]
+  * Only compute OCAML_ABI once by using := instead of =.
+  * Don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of -- to pass
+    args to dpkg-gencontrol in a safer manner.
+  * Include dpatch.mk instead of calling dpatch manually; NB: this will cause
+    the patches to be applied before running configure which is more useful,
+    but doesn't change anything with the current patches; bump up cdbs bdep to
+    >= 0.4.21.
+  * Use the makefile.mk cdbs class instead of the autotools one.
+    - Move the configure flag to a new custom common-configure-impl /
+      config_Makefile rule.
+    - Drop --disable-maintainer-mode exclusion hack.
+    - Don't call make clean in clean; cdbs does that for us.
+    - Set DEB_MAKE_INSTALL_TARGET to install.
+  * Drop redundant setting of FACILEDIR with the echo >config_Makefile
+    construct; the configure flag works fine.
+  * Replace debian/libfacile-ocaml-dev.dirs.in template and logic with
+    DEB_INSTALL_DIRS_ALL; fixes lack of cleanup of
+    debian/libfacile-ocaml-dev.dirs.
+  * Set OCAMLC OCAMLMLI via DEB_MAKE_INVOKE instead of DEB_MAKE_BUILD_TARGET;
+    this sets the same environment for all make runs.
+  * Add year 2004 to copyright.
+  * Point at common-licenses for the full text of the LGPL and include the
+    full licensing header.
+  * Depend on ${misc:Depends} as recommended in debhelper 5.
+  * Set DEB_MAKE_CHECK_TARGET to check to run the testsuite during package
+    build.
+  * Use Vcs-* headers instead of XS-Vcs-*.
+  * Bump up Standards-Version to 3.8.0.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 02 Oct 2008 12:37:48 +0200
 
 facile (1.1-6.1) unstable; urgency=low
 

Modified: trunk/packages/facile/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/control?rev=6000&op=diff
==============================================================================
--- trunk/packages/facile/trunk/debian/control (original)
+++ trunk/packages/facile/trunk/debian/control Mon Oct  6 13:45:14 2008
@@ -2,16 +2,16 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Steffen Joeris <white at debian.org>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.0), ocaml-nox (>= 3.09.2), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.21), ocaml-nox (>= 3.09.2), dpatch
+Standards-Version: 3.8.0
 Section: libdevel
-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/facile/trunk
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/facile
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/
 
 Package: libfacile-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI} 
+Depends: ocaml-nox-${F:OCamlABI}, ${misc:Depends}
 Description: functional constraint library implemented in objective caml
  FaCiLe is a constraint programming library over integer finite domain
  written in Objective Caml. It offers all usual facilities to create

Modified: trunk/packages/facile/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/copyright?rev=6000&op=diff
==============================================================================
--- trunk/packages/facile/trunk/debian/copyright (original)
+++ trunk/packages/facile/trunk/debian/copyright Mon Oct  6 13:45:14 2008
@@ -3,17 +3,23 @@
 
 It was downloaded from http://www.recherche.enac.fr/opti/facile/distrib/
 
-Copyright Holder: Copyright (C) 2001, CENA 
+Copyright Holder: Copyright (C) 2001, 2004, CENA
 
 License:
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
 
-This library 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
-Lesser General Public License for more details.
+    This library 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
+    Lesser General Public License for more details.
 
+    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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.

Modified: trunk/packages/facile/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/rules?rev=6000&op=diff
==============================================================================
--- trunk/packages/facile/trunk/debian/rules (original)
+++ trunk/packages/facile/trunk/debian/rules Mon Oct  6 13:45:14 2008
@@ -1,22 +1,23 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
-DEB_CONFIGURE_NORMAL_ARGS = --faciledir debian/libfacile-ocaml-dev/`ocamlc -where`/facile
-DEB_MAKE_BUILD_TARGET=OCAMLC="ocamlc -g" OCAMLMLI=ocamlc
-exclude=--disable-maintainer-mode
-DEB_CONFIGURE_INVOKE:=$(filter-out $(exclude),$(DEB_CONFIGURE_INVOKE))
-OCAMLABI = ${shell ocamlc -version}
-DEB_DH_GENCONTROL_ARGS=-- -VF:OCamlABI="$(OCAMLABI)"
+OCAMLABI := $(shell ocamlc -version)
+FACILEDIR := $(shell ocamlc -where)/facile
+DEB_INSTALL_DIRS_ALL += $(FACILEDIR)
+DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INVOKE += OCAMLC="ocamlc -g" OCAMLMLI=ocamlc
+DEB_MAKE_INSTALL_TARGET := install
+DEB_MAKE_CHECK_TARGET := check
 
-common-configure-arch::  
-	echo FACILEDIR=debian/libfacile-ocaml-dev/`ocamlc -where`/facile >config_Makefile
-	sed -e 's%#OcamlABI#%$(OCAMLABI)%' debian/libfacile-ocaml-dev.dirs.in >debian/libfacile-ocaml-dev.dirs
-	dpatch apply-all
-	
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: config_Makefile
+config_Makefile:
+	./configure --faciledir debian/libfacile-ocaml-dev/$(FACILEDIR)
+
 clean::
-	make clean
+	# not cleaned upstream
 	rm -f config_Makefile
-	dpatch deapply-all
-	rm -rf debian/patched
+

Added: trunk/packages/facile/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/facile/trunk/debian/watch?rev=6000&op=file
==============================================================================
--- trunk/packages/facile/trunk/debian/watch (added)
+++ trunk/packages/facile/trunk/debian/watch Mon Oct  6 13:45:14 2008
@@ -1,0 +1,3 @@
+version=3
+http://www.recherche.enac.fr/opti/facile/distrib/ \
+        facile-([\d.]+).tar.gz

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