[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, experimental/master, updated. debian/0.94-2-15-gf4ba249

Ralf Treinen treinen at pps.univ-paris-diderot.fr
Thu Apr 4 12:17:41 UTC 2013


The following commit has been merged in the experimental/master branch:
commit f4ba2498ba8415b5f40e3bc948fcfa33d385503d
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Thu Apr 4 14:12:59 2013 +0200

    simply invokations of upstream Makefile by debian/rules

diff --git a/debian/changelog b/debian/changelog
index e9d4606..6ab1191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,14 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
      0006-PRECM-O-X-is-needed-to-link-altgr-ergo
      0007-Fix-all-target
      0008-Split-install-pack-into-two-separate-targets-opt-and
-     0009-fix-install-gui-target
+     0009-fix-install-gui-target, renamed to  0009-fix-install-target
+  * simplify debian/rules:
+     - dh_auto-build: don't call "make altgr-ergo.$(OCAML_BEST)" sicne this
+       is now subsumed by "make all"
+     - dh_auto_install: only call "make install" since thsi subsumes the
+       other targets
   
- -- Ralf Treinen <treinen at debian.org>  Thu, 04 Apr 2013 14:06:25 +0200
+ -- Ralf Treinen <treinen at debian.org>  Thu, 04 Apr 2013 14:12:29 +0200
 
 alt-ergo (0.94-2) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index cafc500..7d0b094 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_build:
 	for i in $(BACKUP); do \
 		cp -ax $$i $$i.debian; \
 	done
-	$(MAKE) all altgr-ergo.$(OCAML_BEST)
+	$(MAKE) all
 
 override_dh_auto_clean:
 	if [ -f Makefile ]; then \
@@ -34,7 +34,7 @@ override_dh_auto_install:
 		LIBDIR=$(CURDIR)/debian/alt-ergo/$(OCAML_STDLIB_DIR)/alt-ergo \
 		MANDIR=$(CURDIR)/debian/alt-ergo/usr/share/man \
 		prefix=$(CURDIR)/debian/alt-ergo/usr \
-		install-$(OCAML_BEST) install-gui install-pack-$(OCAML_BEST)
+		install
 	sed "s/@VERSION@/$(VERSION)/" debian/META.in > $(CURDIR)/debian/alt-ergo/$(OCAML_STDLIB_DIR)/alt-ergo/META
 
 %:

-- 
alt-ergo packaging



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