--- Begin Message ---
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@dooz.org> 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@lists.debian.org>
Uploaders: Steffen Joeris <white@debian.org>
-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
--- End Message ---
--- Begin Message ---
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@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Loic Minier <lool@dooz.org> (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@debian.org)
-----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@lists.debian.org>
Changed-By: Loic Minier <lool@dooz.org>
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-----
--- End Message ---