[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, experimental/master, updated. debian/0.94-2-30-gcba5d6b
Ralf Treinen
treinen at pps.univ-paris-diderot.fr
Tue Apr 9 13:36:31 UTC 2013
The following commit has been merged in the experimental/master branch:
commit 567adfdec72be1b20f1ffbe00fb32aac23a31749
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date: Tue Apr 9 15:18:11 2013 +0200
merge patch 0009-fix-install-gui-target into 0004-Add-rules-and-targets-for-gui.byte.patch
diff --git a/debian/changelog b/debian/changelog
index b554482..fbf5471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ alt-ergo (0.95.1-1) UNRELEASED; urgency=low
* New upstream release.
* debian/watch: add extra directory per release.
- * Adapted all patches to new upstream.
- Patch 0009-fix-install-gui-target renamed to 0009-fix-install-target
+ * Adapted all patches to new upstream. Merge patch
+ 0009-fix-install-gui-target into
+ 0004-Add-rules-and-targets-for-gui.byte.patch.
* simplify debian/rules:
- dh_auto-build: don't call "make altgr-ergo.$(OCAML_BEST)" sicne this
is now subsumed by "make all"
diff --git a/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch b/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
index 9d00a61..2bcc1d0 100644
--- a/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
+++ b/debian/patches/0004-Add-rules-and-targets-for-gui.byte.patch
@@ -5,8 +5,8 @@ Subject: Add rules and targets for gui.byte
Index: alt-ergo/Makefile.in
===================================================================
---- alt-ergo.orig/Makefile.in 2013-04-04 12:04:54.000000000 +0200
-+++ alt-ergo/Makefile.in 2013-04-04 12:16:54.000000000 +0200
+--- alt-ergo.orig/Makefile.in 2013-04-09 15:13:30.000000000 +0200
++++ alt-ergo/Makefile.in 2013-04-09 15:13:57.000000000 +0200
@@ -70,6 +70,7 @@
#############
@@ -50,6 +50,15 @@ Index: alt-ergo/Makefile.in
test: $(NAME).$(OCAMLBEST)
[ ! -f test.mlw ] || ./$^ test.mlw
+@@ -244,7 +246,7 @@
+ mkdir -p $(BINDIR)
+ cp -f $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
+ ifeq ($(ENABLEGUI),yes)
+- cp -f altgr-ergo.opt $(BINDIR)/altgr-ergo$(EXE)
++ cp -f $(GUINAME).$(OCAMLBEST) $(BINDIR)/$(GUINAME)$(EXE)
+ mkdir -p $(DATADIR)/gtksourceview-2.0/language-specs
+ cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
+ endif
@@ -399,6 +401,7 @@
@rm -f *.cm[ioxt] *.cmti *.o *~ *.annot *.owz *mlocamlwizard_tmp_file*
@rm -f $(GENERATED) *.output
diff --git a/debian/patches/0009-fix-install-gui-target.patch b/debian/patches/0009-fix-install-gui-target.patch
deleted file mode 100644
index be49da3..0000000
--- a/debian/patches/0009-fix-install-gui-target.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Mehdi Dogguy <mehdi at dogguy.org>
-Date: Wed, 14 Dec 2011 16:04:05 +0100
-Subject: 'fix' install-gui target
-
-Index: alt-ergo/Makefile.in
-===================================================================
---- alt-ergo.orig/Makefile.in 2013-04-04 14:07:55.000000000 +0200
-+++ alt-ergo/Makefile.in 2013-04-04 14:08:05.000000000 +0200
-@@ -252,7 +252,7 @@
- mkdir -p $(BINDIR)
- cp -f $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
- ifeq ($(ENABLEGUI),yes)
-- cp -f altgr-ergo.opt $(BINDIR)/altgr-ergo$(EXE)
-+ cp -f $(GUINAME).$(OCAMLBEST) $(BINDIR)/$(GUINAME)$(EXE)
- mkdir -p $(DATADIR)/gtksourceview-2.0/language-specs
- cp -f util/gtk-lang/alt-ergo.lang $(DATADIR)/gtksourceview-2.0/language-specs/alt-ergo.lang
- endif
diff --git a/debian/patches/series b/debian/patches/series
index 834f7f1..b5ec904 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
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-fix-install-gui-target.patch
--
alt-ergo packaging
More information about the Pkg-ocaml-maint-commits
mailing list