Bug#500830: Misc packaging fixes

[Loïc Minier-3]

Package: facile
Version: 1.1-6.1
Severity: normal
Tags: patch

        Hi there,

 I had a look at the facile source package today, and noticed some odd
 things in the packaging; I've cleaned it up a little in the attached
 debdiff.  (I'm filing this at normal severity because of the copyright
 issues.)

 Changelog:
  * 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.

 If you're happy with the changes, I can NMU this debdiff at your
 earliest convenience; woudln't hurt for lenny, but could as well be
 experimental or sit in usntable.

   Cheers,
--
Loïc Minier

diff -u facile-1.1/debian/rules facile-1.1/debian/rules
--- facile-1.1/debian/rules
+++ facile-1.1/debian/rules
@@ -3,20 +3,20 @@
-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
+
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: config_Makefile
+config_Makefile:
+ ./configure --faciledir debian/libfacile-ocaml-dev/$(FACILEDIR)
 
-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
-
 clean::
- make clean
+ # not cleaned upstream
  rm -f config_Makefile
- dpatch deapply-all
- rm -rf debian/patched
+
diff -u facile-1.1/debian/changelog facile-1.1/debian/changelog
--- facile-1.1/debian/changelog
+++ facile-1.1/debian/changelog
@@ -1,3 +1,32 @@
+facile (1.1-6.2) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- Loic Minier <lool@...>  Wed, 01 Oct 2008 21:17:11 +0200
+
 facile (1.1-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u facile-1.1/debian/copyright facile-1.1/debian/copyright
--- facile-1.1/debian/copyright
+++ facile-1.1/debian/copyright
@@ -6,14 +6,20 @@
-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 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 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.
+
+    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'.
diff -u facile-1.1/debian/control facile-1.1/debian/control
--- facile-1.1/debian/control
+++ facile-1.1/debian/control
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@...>
 Uploaders: Steffen Joeris <white@...>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.0), ocaml-nox (>= 3.09.2), dpatch
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.21), ocaml-nox (>= 3.09.2), dpatch
 Standards-Version: 3.7.2
 Section: libdevel
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/facile
@@ -11,7 +11,7 @@
 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
reverted:
--- facile-1.1/debian/libfacile-ocaml-dev.dirs.in
+++ facile-1.1.orig/debian/libfacile-ocaml-dev.dirs.in
@@ -1 +0,0 @@
-usr/lib/ocaml/#OcamlABI#/facile

[Julien Cristau-6]

On Wed, Oct  1, 2008 at 22:13:06 +0200, Loïc Minier wrote:

>  If you're happy with the changes, I can NMU this debdiff at your
>  earliest convenience; woudln't hurt for lenny, but could as well be
>  experimental or sit in usntable.
>
Looks good to me.  If nobody objects in the next days, I think you can
commit your changes to the pkg-ocaml-maint svn and upload.

Cheers,
Julien



--
To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[Stefano Zacchiroli]

clone 500830 -1
reassign -1 dh-ocaml
thanks

On Wed, Oct 01, 2008 at 10:13:06PM +0200, Loïc Minier wrote:
>   * Don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of -- to pass
>     args to dpkg-gencontrol in a safer manner.

This one applies also to the ocaml.mk CDBS class itself, cloning the
bug to dh-ocaml to remember this.

--
Stefano Zacchiroli -*- PhD in Computer Science \ PostDoc @ Univ. Paris 7
zack@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
I'm still an SGML person,this newfangled /\ All one has to do is hit the
XML stuff is so ... simplistic  -- Manoj \/ right keys at the right time

[Stefano Zacchiroli]

On Wed, Oct 01, 2008 at 10:13:06PM +0200, Loïc Minier wrote:

> Package: facile
> Version: 1.1-6.1
> Severity: normal
> Tags: patch
>
>         Hi there,
>
>  I had a look at the facile source package today, and noticed some odd
>  things in the packaging; I've cleaned it up a little in the attached
>  debdiff.  (I'm filing this at normal severity because of the copyright
>  issues.)

Thanks for this effort.

I do have a minimal objection though, given that facile is already
using CDBS, why is it _not_ using the ocaml.mk CDBS class provided by
dh-ocaml (new name, it was formerly provided by ocaml itself)?

At least some of the stuff which is being done in debian/rules is
already done in that class, and having that logic in a single
package/place is of course better for the sake of flexibility ...

Cheers.

--
Stefano Zacchiroli -*- PhD in Computer Science \ PostDoc @ Univ. Paris 7
zack@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
I'm still an SGML person,this newfangled /\ All one has to do is hit the
XML stuff is so ... simplistic  -- Manoj \/ right keys at the right time

[Debian Bug Tracking System]

Processing commands for control@...:

> clone 500830 -1
Bug#500830: Misc packaging fixes
Bug 500830 cloned as bug 500869.

> reassign -1 dh-ocaml
Bug#500869: Misc packaging fixes
Bug reassigned from package `facile' to `dh-ocaml'.

> thanks
Stopping processing here.

Please contact me if you need assistance.

Debian bug tracking system administrator
(administrator, Debian Bugs database)


--
To UNSUBSCRIBE, email to debian-ocaml-maint-REQUEST@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[Loïc Minier-3]

 I prepared these additional changes as well:
  * Set DEB_MAKE_CHECK_TARGET to check || true to not fail the build if the
    testsuite doesn't pass; NB: it does seem to pass currently.
  * Use Vcs-* headers instead of XS-Vcs-*.
  * Bump up Standards-Version to 3.8.0.

 Test suite can be run and cause the build to fail if it fails by
 removing the || true which might be what one wants.

 I am attaching the watch file.

--
Loïc Minier

version=3
http://www.recherche.enac.fr/opti/facile/distrib/ \
        facile-([\d.]+).tar.gz

[Debian Bug Tracking System]

Your message dated Tue, 07 Oct 2008 09:17:08 +0000
with message-id <E1Kn8gm-00070z-Ra@...>
and subject line Bug#500830: fixed in facile 1.1-6.2
has caused the Debian Bug report #500830,
regarding Misc packaging fixes
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@...
immediately.)


--
500830: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500830
Debian Bug Tracking System
Contact owner@... with problems

Package: facile
Version: 1.1-6.1
Severity: normal
Tags: patch

        Hi there,

 I had a look at the facile source package today, and noticed some odd
 things in the packaging; I've cleaned it up a little in the attached
 debdiff.  (I'm filing this at normal severity because of the copyright
 issues.)

 Changelog:
  * 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.

 If you're happy with the changes, I can NMU this debdiff at your
 earliest convenience; woudln't hurt for lenny, but could as well be
 experimental or sit in usntable.

   Cheers,
--
Loïc Minier

diff -u facile-1.1/debian/rules facile-1.1/debian/rules
--- facile-1.1/debian/rules
+++ facile-1.1/debian/rules
@@ -3,20 +3,20 @@
-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
+
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: config_Makefile
+config_Makefile:
+ ./configure --faciledir debian/libfacile-ocaml-dev/$(FACILEDIR)
 
-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
-
 clean::
- make clean
+ # not cleaned upstream
  rm -f config_Makefile
- dpatch deapply-all
- rm -rf debian/patched
+
diff -u facile-1.1/debian/changelog facile-1.1/debian/changelog
--- facile-1.1/debian/changelog
+++ facile-1.1/debian/changelog
@@ -1,3 +1,32 @@
+facile (1.1-6.2) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- Loic Minier <lool@...>  Wed, 01 Oct 2008 21:17:11 +0200
+
 facile (1.1-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u facile-1.1/debian/copyright facile-1.1/debian/copyright
--- facile-1.1/debian/copyright
+++ facile-1.1/debian/copyright
@@ -6,14 +6,20 @@
-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 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 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.
+
+    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'.
diff -u facile-1.1/debian/control facile-1.1/debian/control
--- facile-1.1/debian/control
+++ facile-1.1/debian/control
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@...>
 Uploaders: Steffen Joeris <white@...>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.0), ocaml-nox (>= 3.09.2), dpatch
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.21), ocaml-nox (>= 3.09.2), dpatch
 Standards-Version: 3.7.2
 Section: libdevel
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/facile
@@ -11,7 +11,7 @@
 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
reverted:
--- facile-1.1/debian/libfacile-ocaml-dev.dirs.in
+++ facile-1.1.orig/debian/libfacile-ocaml-dev.dirs.in
@@ -1 +0,0 @@
-usr/lib/ocaml/#OcamlABI#/facile

Source: facile
Source-Version: 1.1-6.2

We believe that the bug you reported is fixed in the latest version of
facile, which is due to be installed in the Debian FTP archive:

facile_1.1-6.2.diff.gz
  to pool/main/f/facile/facile_1.1-6.2.diff.gz
facile_1.1-6.2.dsc
  to pool/main/f/facile/facile_1.1-6.2.dsc
libfacile-ocaml-dev_1.1-6.2_amd64.deb
  to pool/main/f/facile/libfacile-ocaml-dev_1.1-6.2_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 500830@...,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Loic Minier <lool@...> (supplier of updated facile package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@...)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Thu, 02 Oct 2008 12:37:48 +0200
Source: facile
Binary: libfacile-ocaml-dev
Architecture: source amd64
Version: 1.1-6.2
Distribution: unstable
Urgency: low
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@...>
Changed-By: Loic Minier <lool@...>
Description:
 libfacile-ocaml-dev - functional constraint library implemented in objective caml
Closes: 446804 500830
Changes:
 facile (1.1-6.2) unstable; urgency=low
 .
   [ Stefano Zacchiroli ]
   * fix vcs-svn field to point just above the debian/ dir
 .
   [ Loic Minier ]
   * Non-maintainer upload to fix misc packaging bugs; closes: #500830.
   * 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.
   * Provide examples/*.ml and examples/*.dat as examples; closes: #446804.
Checksums-Sha1:
 8a66bef60e06acde66055836eb893cc5bad61d0a 1217 facile_1.1-6.2.dsc
 05503dd4f632044fd93758f9abd6788e13cb6b64 4166 facile_1.1-6.2.diff.gz
 39f299787142f79359e00c50a78a4f82991b6f3b 682734 libfacile-ocaml-dev_1.1-6.2_amd64.deb
Checksums-Sha256:
 1fca18902a22a7311b23bc98c83507b49a6e221e213dc0308fde7b857b332994 1217 facile_1.1-6.2.dsc
 0dc22cb044957d0066a3d769cb2aa059643abb0aa4a4bf1a174e25113fc121c0 4166 facile_1.1-6.2.diff.gz
 c856a8d22af6dd7cb1ac9105a2cfbd09d6e7226f90ec0871fae5ff9d1521aa15 682734 libfacile-ocaml-dev_1.1-6.2_amd64.deb
Files:
 05c309ff917db96f277b77d2c29176a6 1217 libdevel optional facile_1.1-6.2.dsc
 c0f7392f2adfd3384cda372e6e56c38c 4166 libdevel optional facile_1.1-6.2.diff.gz
 bf00c9c07bfefc516bced720d62259ed 682734 libdevel optional libfacile-ocaml-dev_1.1-6.2_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkjrJbkACgkQ4VUX8isJIMDqTQCdFDa7a8Va2GGuI5pLPhx8HIVM
GWgAn1OqgWODW6Wsyewl7VNo1pqr0pQT
=6nKl
-----END PGP SIGNATURE-----

[Stéphane Glondu]

Loïc Minier a écrit :
>   * Don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of -- to pass
>     args to dpkg-gencontrol in a safer manner.

Can you tell how it is safer to use -u instead of --? I agree with the
s/=/+=/, though.


Cheers,

--
Stéphane




--
To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[Stefano Zacchiroli]

On Sun, Nov 01, 2009 at 10:42:18PM +0100, Stéphane Glondu wrote:
> Loïc Minier a écrit :
> >   * Don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of -- to pass
> >     args to dpkg-gencontrol in a safer manner.
>
> Can you tell how it is safer to use -u instead of --? I agree with the
> s/=/+=/, though.

Generally speaking, using -- is dangerous in the sense that it can be
used only once as it denotes the end of dh_gencontrol arguments. So, if
an included Makefile snippet does that and if the Makefile author (not
knowing about that) adds _again_ a --, that gets delivered to
dpkg-gencontrol (which can either fail, or interpret is as the end of
getopt arguments, I haven't checked which is the case). In that sense, I
believe -u is safer too.

BTW, thanks for getting back to this bug log, I had a look at it a
couple of weeks ago, but ran out of time.

Cheers.

--
Stefano Zacchiroli -o- PhD in Computer Science \ PostDoc @ Univ. Paris 7
zack@{upsilon.cc,pps.jussieu.fr,debian.org} -<>- http://upsilon.cc/zack/
Dietro un grande uomo c'è ..|  .  |. Et ne m'en veux pas si je te tutoie
sempre uno zaino ...........| ..: |.... Je dis tu à tous ceux que j'aime

[Loïc Minier-3]

On Sun, Nov 01, 2009, Stéphane Glondu wrote:
> Loïc Minier a écrit :
> >   * Don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of -- to pass
> >     args to dpkg-gencontrol in a safer manner.
>
> Can you tell how it is safer to use -u instead of --? I agree with the
> s/=/+=/, though.

 It's been a while, but I think I disliked the lack of readability and
 extensibility of the -- approach.

 Readability:

DEB_DH_GENCONTROL_ARGS+=-- -VF:OCamlABI="$(OCAMLABI)"

 This line is relatively hard to parse, compare to:
DEB_DH_GENCONTROL_ARGS += -u-VF:OCamlABI="$(OCAMLABI)"


 Extensibility: if you do "DEB_DH_GENCONTROL_ARGS += -- foo" at some
 place of rules, or in an include, appending DEB_DH_GENCONTROL_ARGS has
 a different meaning than the expected one.  However if you use -u, it's
 relatively consistent.

--
Loïc Minier



--
To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...

[Debian Bug Tracking System]

Your message dated Tue, 03 Nov 2009 21:32:14 +0000
with message-id <E1N5Qz8-0004Eh-Hx@...>
and subject line Bug#500869: fixed in dh-ocaml 0.9.2
has caused the Debian Bug report #500869,
regarding Fixes for ocaml.mk
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@...
immediately.)


--
500869: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500869
Debian Bug Tracking System
Contact owner@... with problems

Package: facile
Version: 1.1-6.1
Severity: normal
Tags: patch

        Hi there,

 I had a look at the facile source package today, and noticed some odd
 things in the packaging; I've cleaned it up a little in the attached
 debdiff.  (I'm filing this at normal severity because of the copyright
 issues.)

 Changelog:
  * 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.

 If you're happy with the changes, I can NMU this debdiff at your
 earliest convenience; woudln't hurt for lenny, but could as well be
 experimental or sit in usntable.

   Cheers,
--
Loïc Minier

diff -u facile-1.1/debian/rules facile-1.1/debian/rules
--- facile-1.1/debian/rules
+++ facile-1.1/debian/rules
@@ -3,20 +3,20 @@
-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
+
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl:: config_Makefile
+config_Makefile:
+ ./configure --faciledir debian/libfacile-ocaml-dev/$(FACILEDIR)
 
-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
-
 clean::
- make clean
+ # not cleaned upstream
  rm -f config_Makefile
- dpatch deapply-all
- rm -rf debian/patched
+
diff -u facile-1.1/debian/changelog facile-1.1/debian/changelog
--- facile-1.1/debian/changelog
+++ facile-1.1/debian/changelog
@@ -1,3 +1,32 @@
+facile (1.1-6.2) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- Loic Minier <lool@...>  Wed, 01 Oct 2008 21:17:11 +0200
+
 facile (1.1-6.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u facile-1.1/debian/copyright facile-1.1/debian/copyright
--- facile-1.1/debian/copyright
+++ facile-1.1/debian/copyright
@@ -6,14 +6,20 @@
-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 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 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.
+
+    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'.
diff -u facile-1.1/debian/control facile-1.1/debian/control
--- facile-1.1/debian/control
+++ facile-1.1/debian/control
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@...>
 Uploaders: Steffen Joeris <white@...>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.0), ocaml-nox (>= 3.09.2), dpatch
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.21), ocaml-nox (>= 3.09.2), dpatch
 Standards-Version: 3.7.2
 Section: libdevel
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/facile
@@ -11,7 +11,7 @@
 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
reverted:
--- facile-1.1/debian/libfacile-ocaml-dev.dirs.in
+++ facile-1.1.orig/debian/libfacile-ocaml-dev.dirs.in
@@ -1 +0,0 @@
-usr/lib/ocaml/#OcamlABI#/facile

Source: dh-ocaml
Source-Version: 0.9.2

We believe that the bug you reported is fixed in the latest version of
dh-ocaml, which is due to be installed in the Debian FTP archive:

dh-ocaml_0.9.2.dsc
  to main/d/dh-ocaml/dh-ocaml_0.9.2.dsc
dh-ocaml_0.9.2.tar.gz
  to main/d/dh-ocaml/dh-ocaml_0.9.2.tar.gz
dh-ocaml_0.9.2_all.deb
  to main/d/dh-ocaml/dh-ocaml_0.9.2_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 500869@...,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Stéphane Glondu <glondu@...> (supplier of updated dh-ocaml package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@...)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Tue, 03 Nov 2009 20:35:55 +0100
Source: dh-ocaml
Binary: dh-ocaml
Architecture: source all
Version: 0.9.2
Distribution: unstable
Urgency: low
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@...>
Changed-By: Stéphane Glondu <glondu@...>
Description:
 dh-ocaml   - helper tools for maintaining OCaml-related Debian packages
Closes: 500869 552392
Changes:
 dh-ocaml (0.9.2) unstable; urgency=low
 .
   [ Stéphane Glondu ]
   * dom-new-git-repo: fail by default when executed out of a Git
     repository and without tarball argument; don't fail if explicitly
     given "--notifications"
   * dh_ocaml: also take into account OCaml objects in non-lib packages;
     don't assume all objects are in /usr/lib
   * ocaml.mk: don't overwrite DEB_DH_GENCONTROL_ARGS and use -u instead of
     -- to pass args to dpkg-gencontrol in a safer manner (thanks to Loïc
     Minier) (Closes: #500869)
 .
   [ Mehdi Dogguy ]
   * Use my debian address instead of the old ones, everywhere.
   * Handle relations between libXXXX-camlp4-dev and libXXXX-camlp4
     packages (Closes: #552392).
   * dh_ocamlinit: Do not generate a stamp file after cleaning
   * ocaml.mk: run dh_ocamldoc only on the current package
   * OCAML_OCAMLDOC_PACKAGES is not needed anymore. Thus, removing each
     occurence and reference to it.
 .
   [ Samuel Mimram ]
   * dom-git-checkout: add --no-ssh option
Checksums-Sha1:
 5a1352fbb1e6fb60906c52c2333a87d6f215db59 1771 dh-ocaml_0.9.2.dsc
 419f6441aef7a0a7c3109578183f9bb450ea87ca 49599 dh-ocaml_0.9.2.tar.gz
 f5f44b9ae84cfffbc15b3678c3952895da71c952 80536 dh-ocaml_0.9.2_all.deb
Checksums-Sha256:
 7063d115ac02911be806459cf861b09a249f9a0084bbb1b6f2b3a81f959206b5 1771 dh-ocaml_0.9.2.dsc
 7bc6b7876245aa77da02703252d52f20424b4854e9efc596015fe77e383b0803 49599 dh-ocaml_0.9.2.tar.gz
 a981e0bb40edd1342047ee2ea717030898bd87da270175069ac0eb6dc8f67634 80536 dh-ocaml_0.9.2_all.deb
Files:
 0746889aa7cca4e014e90f74f82212ad 1771 ocaml extra dh-ocaml_0.9.2.dsc
 2661b4bfaf4dc44a871cae07d9d37c15 49599 ocaml extra dh-ocaml_0.9.2.tar.gz
 4d23d3b67a6c94becddccecaf0fb306e 80536 ocaml extra dh-ocaml_0.9.2_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQIcBAEBCgAGBQJK8IaOAAoJEHhT2k1JiBrTI00P/3+JeQzurByJpeaUchWTI/6G
qQqgMFHpkcU7JI+4AViqeZU/zeo2DkSA4WqY8QnbZUJecwLcxkAbycbksTThOLli
p3e4qRfEdnAte8X5kdPTtrTl6GZoIjz0n2r3wLg5sBai5Wq7ruMGM0k3R9qFGYr6
Hu8mLGuR/hZvVkqC5/xhkeZXcSBj4C1L2Zy3w/a5H2OPTI+8ArsVbVV2Hul1FUOh
5VJWQlmFifUcmXQSDvOj4JXI6HDzSIiva17gBfIcQAJll6q216Kd/l/NKno7dysd
PchXFYULbSayt6NWKu6t9zze8b/ZjaHDeFB8OP2X4qe43q8M37W0K89lK57q+FtE
WZQVwT/sEz9D9rWQPYBgTRnSNtPUMmgnjX/f57gfgRCmtS6Lc4GGcWbINQ9PIKCR
BvoloXg/J/BxnzNkNeRbwbH2Tde29V2MAAEGFNj4M+MiYOfM4j0BkdxoRrvpQOlu
1xWEMWFtinKg8NpypNNzUfEwHYOWundLggKdNb6xMoAjEKKDAF1jfyqP6XNOY3tR
qfvO2eDlg+lWSHgOBwwfPZJmV/7PEK1k3am+Qxr85P6NY4VKqsHxPDXnJTdA2o95
XqNcg93QqMG5MIcuwA2tKtluKUbU+p6mm2oPmbdqXQIwCxK9rtXE9FfNYvY3nUZM
+4woxzHuVPf8sbs0ri32
=Xt70
-----END PGP SIGNATURE-----