[Pkg-ocaml-maint-commits] [SCM] alt-ergo packaging branch, experimental/master, updated. debian/0.94-2-37-g7010c52
Ralf Treinen
treinen at debian.org
Sat Apr 13 06:37:04 UTC 2013
The following commit has been merged in the experimental/master branch:
commit 7010c528d6faa42e1d6b728a0e900f92dae49974
Author: Ralf Treinen <treinen at debian.org>
Date: Fri Apr 12 15:21:58 2013 +0200
Add patch to have "make clean" remove META. Drop debian/clean.
diff --git a/debian/changelog b/debian/changelog
index 6400b30..79f0411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ alt-ergo (0.95.1-1) experimental; urgency=low
* 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
is now subsumed by "make all"
@@ -27,8 +28,8 @@ alt-ergo (0.95.1-1) experimental; urgency=low
the debian package.
* update clean target:
- invoke dist-clean instead of clean in debian/rules
- - debian/clean: add META and gui. Drop version.sh, Makefile, *.output
- as these are now cleaned by upstream's Makefile.
+ - drop debian/clean which is no longer necessary (with patch
+ 0009-clean-remove-META.patch applied)
* Rewrite long package description.
* debian/watch: add extra directory per release.
* debian/copyright:
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 29e324e..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,2 +0,0 @@
-gui
-META
diff --git a/debian/patches/0009-clean-remove-META.patch b/debian/patches/0009-clean-remove-META.patch
new file mode 100644
index 0000000..18eed6c
--- /dev/null
+++ b/debian/patches/0009-clean-remove-META.patch
@@ -0,0 +1,16 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: "make clean" must also remove META
+
+Index: alt-ergo/Makefile.in
+===================================================================
+--- alt-ergo.orig/Makefile.in 2013-04-12 15:17:04.000000000 +0200
++++ alt-ergo/Makefile.in 2013-04-12 15:18:19.000000000 +0200
+@@ -417,7 +417,7 @@
+ @rm -f $(GUINAME) $(GUINAME).opt $(GUINAME).byte
+ @rm -f unittest/*.cm[iox] unittest/*.o unittest/*.annot
+ @rm -f *.aux *.log $(NAME).tex $(NAME).dvi $(NAME).ps
+- @rm -f version.ml
++ @rm -f version.ml META
+ @rm -f *.$(REVISIONSUFFIX)
+
+ dist-clean distclean:: clean
diff --git a/debian/patches/series b/debian/patches/series
index b5ec904..a005b10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
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