[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. upstream/20081201-6-g6f96705

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 6f96705e49dfa7cd2c629e6b4dbf37da54ab41be
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Thu May 14 13:09:53 2009 +0200

    Shorten debian/rules

diff --git a/debian/control b/debian/control
index a7c66aa..cdc8df4 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  docbook-xml,
  xsltproc,
  libxml2-utils,
- quilt
+ quilt (>= 0.46-7)
 DM-Upload-Allowed: yes
 Standards-Version: 3.8.1
 Homepage: http://frama-c.cea.fr/
diff --git a/debian/patches/0003-Correctly-detect-jessie-plugin.patch b/debian/patches/0003-Correctly-detect-jessie-plugin.patch
index 7690188..1612c10 100644
--- a/debian/patches/0003-Correctly-detect-jessie-plugin.patch
+++ b/debian/patches/0003-Correctly-detect-jessie-plugin.patch
@@ -3,8 +3,9 @@ Date: Tue, 12 May 2009 14:16:32 +0200
 Subject: [PATCH] Correctly detect jessie plugin
 
 ---
- configure |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/configure b/configure
 index 54a40f7..45df560 100755
@@ -26,4 +27,24 @@ index 54a40f7..45df560 100755
      ;;
    *)
      { echo "$as_me:$LINENO: WARNING: Unexpected location for why tool: $SELECTED_WHYJC" >&5
+diff --git a/configure.in b/configure.in
+index 611dcd9..7281e40 100644
+--- a/configure.in
++++ b/configure.in
+@@ -936,11 +936,11 @@ if test "$HAS_WHYJC" == "yes" -a "$REQUIRE_WHYJC" != ""; then
+        INFO_JESSIE=" (configuration of Why failed)"
+     fi
+     ;;
+-  $OCAMLLIB/jessie)
+-    JCCMO=$SELECTED_WHYJC/jc.cmo
+-    JCCMX=$SELECTED_WHYJC/jc.cmx
++  $OCAMLLIB/jessie/*)
++    JCCMO=$OCAMLLIB/jessie/jc.cmo
++    JCCMX=$OCAMLLIB/jessie/jc.cmx
+     JESSIE_LOCAL=no
+-    JESSIE_INCLUDES="-I $SELECTED_WHYJC"
++    JESSIE_INCLUDES="-I +jessie"
+     ;;
+   *)
+     AC_MSG_WARN([Unexpected location for why tool: $SELECTED_WHYJC])
 -- 
diff --git a/debian/rules b/debian/rules
index 629635d..05c46e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,7 @@ include /usr/share/quilt/quilt.make
 include /usr/share/ocaml/ocamlvars.mk
 include /usr/share/ocaml/ocamlinit.mk
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
+override_dh_auto_configure:
 	mkdir -p lib/plugins
 	touch .depend .make-clean
 	./configure $(CROSS) --prefix=/usr       \
@@ -21,80 +19,24 @@ configure-stamp:
 		CFLAGS="$(CFLAGS)"               \
 		LDFLAGS="-Wl,-z,defs"
 
-patch-stamp: patch
-	touch $@
-
-build: patch-stamp build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-	$(MAKE)
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-
-	[ ! -f Makefile ] || $(MAKE) clean
-	$(RM) -rf lib
-
-	dh_clean 
-
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_prep -i 
-	dh_installdirs -i
-	dh_install -i
-
-install-arch:
-	dh_testdir
-	dh_testroot
-	dh_prep -s 
-	dh_installdirs -s
+override_dh_auto_install:
 	$(MAKE) prefix=$(CURDIR)/debian/frama-c/usr install
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c.byte
 	$(RM) -f $(CURDIR)/debian/frama-c/usr/bin/frama-c-gui.byte
-	dh_install -s
 ifeq ($(OCAML_OPT_ARCH),)
 	echo 'F:FramaCRuntime=liblablgtk2-gnome-ocaml,liblablgtksourceview-ocaml,$(OCAML_RUNTIME)' >> debian/frama-c.substvars
 endif
 
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep: build-indep install-indep
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+override_dh_auto_clean:
+	[ ! -f Makefile ] || $(MAKE) clean
+	$(RM) -rf lib
 
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch redo-patches
+%:
+	dh --with quilt $@
 
 redo-patches:
 	rm -f debian/patches/*
 	git format-patch -N -o debian/patches upstream...patches | \
           sed -e 's%debian/patches/%%' > debian/patches/series
 	sed -i 1d debian/patches/*.patch
-	sed -i -n -e :a -e '1,3!{P;N;D;};N;ba' debian/patches/*.patch
+	sed -i -n -e :a -e '1,2!{P;N;D;};N;ba' debian/patches/*.patch

-- 
frama-c packaging