Bug#500830: Misc packaging fixes
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
Reply to: