[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, experimental/master, updated. debian/0.94-2-41-gdd26091
Ralf Treinen
treinen at pps.univ-paris-diderot.fr
Tue Apr 16 11:37:22 UTC 2013
The following commit has been merged in the experimental/master branch:
commit 72d7542d77c1faa65c2afeb3db801c91fd9a183e
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date: Tue Apr 16 11:56:28 2013 +0200
drop patch 0006-PRECM-O-X-is-needed-to-link-altgr-ergo
diff --git a/debian/changelog b/debian/changelog
index 79f0411..75bcff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,19 +2,22 @@ alt-ergo (0.95.1-1) experimental; urgency=low
* New upstream release.
* Split off a package for the development libraries.
- * Adapted all patches to new upstream. Merge patch
- 0009-fix-install-gui-target into
- 0004-Add-rules-and-targets-for-gui.byte.patch.
- * Add patch 0009-clean-remove-META.patch
- * simplify debian/rules:
- - dh_auto-build: don't call "make altgr-ergo.$(OCAML_BEST)" sicne this
+ * Patches:
+ - Adapted all patches to new upstream.
+ - Merge patch 0009-fix-install-gui-target into
+ 0004-Add-rules-and-targets-for-gui.byte
+ - Add patch 0009-clean-remove-META.patch
+ - Drop patch 0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch as
+ upstream's makefile is doingthe right thing.
+ * debian/rules:
+ - dh_auto-build: don't call "make altgr-ergo.$(OCAML_BEST)" since this
is now subsumed by "make all"
- drop the dh_install override since upstream's Makefile does the
right thing
- * debian/rules configure target: remove the "alt_ergo" from the libdir flag
- as this is added in upstream's Makefile.
- * Drop creation of the META file by debian/rules as this is now done by
- upstream's Makefile.
+ - configure target: remove the "alt_ergo" from the libdir flag
+ as this is added in upstream's Makefile.
+ - Drop creation of the META file by debian/rules as this is now done by
+ upstream's Makefile.
* Drop debian/alt-ergo.dirs.in as all needed directories are created by
upstream's Makefile.
* Source-format 3.0 (quilt):
diff --git a/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch b/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
deleted file mode 100644
index 9d7dbb5..0000000
--- a/debian/patches/0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Mehdi Dogguy <mehdi at dogguy.org>
-Date: Wed, 14 Dec 2011 14:05:46 +0100
-Subject: PRECM{O,X} is needed to link altgr-ergo
-
-Index: alt-ergo/Makefile.in
-===================================================================
---- alt-ergo.orig/Makefile.in 2013-04-04 14:06:41.000000000 +0200
-+++ alt-ergo/Makefile.in 2013-04-04 14:06:46.000000000 +0200
-@@ -116,7 +116,7 @@
-
-
- ifeq ($(ENABLEGUI),yes)
-- GUICMO = $(CMO) $(CMOFRONT) gui_session.cmo why_annoted.cmo \
-+ GUICMO = $(PRECMO) $(CMO) $(CMOFRONT) gui_session.cmo why_annoted.cmo \
- why_connected.cmo gui_replay.cmo gui.cmo
- else
- GUICMO =
diff --git a/debian/patches/series b/debian/patches/series
index a005b10..776f52c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
0003-Fix-a-typo.patch
0004-Add-rules-and-targets-for-gui.byte.patch
0005-Look-for-cma-instead-of-cmxa-for-lablgtksourceview2.patch
-0006-PRECM-O-X-is-needed-to-link-altgr-ergo.patch
0007-Fix-all-target.patch
0008-Split-install-pack-into-two-separate-targets-opt-and.patch
0009-clean-remove-META.patch
--
alt-ergo packaging
More information about the Pkg-ocaml-maint-commits
mailing list