[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.1-1
Sylvain Le Gall
gildor at debian.org
Mon Jul 6 20:56:36 UTC 2009
The following commit has been merged in the master branch:
commit 22b24b2eea1107000e6331c517b77808605a2342
Author: Sylvain Le Gall <gildor at debian.org>
Date: Mon Jul 6 20:50:19 2009 +0000
Clean and restore files to come back to pristine-tar state after clean
diff --git a/debian/changelog b/debian/changelog
index a1cc31d..3675cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
ocamlgraph (1.1-1) unstable; urgency=low
+ [ Mehdi Dogguy ]
* New Upstream Version
* Update some build-dependencies versions
* Upgrade Standards-Version to 3.8.2, no changes needed.
* Update patch 01_makefile
- -- Mehdi Dogguy <dogguy at pps.jussieu.fr> Wed, 24 Jun 2009 13:07:24 +0200
+ [ Sylvain Le Gall ]
+ * Clean and restore files to come back to pristine-tar state after
+ clean
+
+ -- Mehdi Dogguy <dogguy at pps.jussieu.fr> Mon, 06 Jul 2009 20:50:04 +0000
ocamlgraph (1.0-2) unstable; urgency=low
diff --git a/debian/clean b/debian/clean
index 91411b8..c890b92 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,4 @@
debian/xml-man/en/ocamlgraph-editor.1
+debian/xml-man/en/ocamlgraph-viewer.1
view_graph/.depend
view_graph/viewGraph.annot
diff --git a/debian/patches/00list b/debian/patches/00list
index e9bae84..3fabe09 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,3 @@
-01_makefile.dpatch
-03_hide_b0rken_icon.dpatch
+01_makefile
+03_hide_b0rken_icon
+04_more_clean
diff --git a/debian/patches/04_more_clean.dpatch b/debian/patches/04_more_clean.dpatch
new file mode 100755
index 0000000..be6e5e0
--- /dev/null
+++ b/debian/patches/04_more_clean.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_more_clean.dpatch by Sylvain Le Gall <gildor at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Really clean source before release.
+
+ at DPATCH@
+diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
+--- ocamlgraph~/Makefile.in 2009-07-06 20:23:50.000000000 +0000
++++ ocamlgraph/Makefile.in 2009-07-06 20:24:13.000000000 +0000
+@@ -326,7 +326,7 @@
+
+ export: source export-doc export-web export-delaunay
+
+-source:
++source: svn-clean
+ mkdir -p export
+ cd export; rm -rf $(EXPORTDIR)
+ mkdir -p export/$(EXPORTDIR)/bin
+@@ -335,10 +335,10 @@
+ cp export/$(TAR).gz $(FTP)
+ cp README FAQ CREDITS COPYING LICENSE CHANGES $(EXAMPLES) $(FTP)
+
+-# Build and install the .tar.gz requiered by Frama-C
++# Build and install the .tar.gz required by Frama-C
+ framac: EXPORTDIR=ocamlgraph
+ framac: FTP=$$HOME/frama-c
+-framac:
++framac: svn-clean
+ mkdir -p export
+ cd export; rm -rf $(EXPORTDIR)
+ mkdir -p export/$(EXPORTDIR)/bin
+@@ -431,20 +431,22 @@
+ #######
+
+ clean:
+- rm -f *~
++ -$(RM) *~
+ for d in $(SRCDIR) $(LIBDIR) $(ED_DIR) $(VIEWER_DIR) tests examples; \
+ do \
+- rm -f $$d/*.cm[iox] $$d/*$(OBJEXT) $$d/*~; \
++ $(RM) $$d/*.cm[iox] $$d/*$(OBJEXT) $$d/*~; \
+ done
+- rm -f $(GENERATED) $(SRCDIR)/dot_parser.output
+- rm -f graph.*a graph.cm* graph.o graph$(LIBEXT)
+- rm -f $(ED_DIR)/editor.byte $(ED_DIR)/editor.opt
+- rm -f $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.opt
+- rm -f *.haux *.aux *.log $(NAME).tex $(NAME).dvi $(DOCFILES)
+- rm -f $(EXAMPLESBIN)
++ -$(RM) $(GENERATED) $(SRCDIR)/dot_parser.output
++ -$(RM) graph.*a graph.cm* graph.o graph$(LIBEXT)
++ -$(RM) $(ED_DIR)/editor.byte $(ED_DIR)/editor.opt
++ -$(RM) $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.opt
++ -$(RM) *.haux *.aux *.log $(NAME).tex $(NAME).dvi $(DOCFILES)
++ -$(RM) $(EXAMPLESBIN)
+
+ dist-clean distclean:: clean
+- rm -f Makefile config.cache config.log config.status *.byte *.opt
++ -$(RM) Makefile config.cache config.log config.status *.byte *.opt
++ -$(RM) src/version.ml
++ -$(RM) .depend
+
+ svnclean svn-clean:: dist-clean
+ rm -f config.* configure configure.lineno
diff --git a/debian/rules b/debian/rules
index 60af55c..d31f097 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,17 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-clean::
- -cp '$(CURDIR)/src/imperative.mli~' '$(CURDIR)/src/imperative.mli~.old'
- -cp '$(CURDIR)/src/imperative.ml~' '$(CURDIR)/src/imperative.ml~.old'
- -cp '$(CURDIR)/src/persistent.mli~' '$(CURDIR)/src/persistent.mli~.old'
- -cp '$(CURDIR)/src/persistent.ml~' '$(CURDIR)/src/persistent.ml~.old'
- -cp '$(CURDIR)/src/dot_parser.ml' '$(CURDIR)/src/dot_parser.ml.old'
- -cp '$(CURDIR)/src/dot_lexer.ml' '$(CURDIR)/src/dot_lexer.ml.old'
- -cp '$(CURDIR)/src/dot_parser.mli' '$(CURDIR)/src/dot_parser.mli.old'
- -cp '$(CURDIR)/src/version.ml' '$(CURDIR)/src/version.ml.old'
- -cp '$(CURDIR)/src/gml.ml' '$(CURDIR)/src/gml.ml.old'
-
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
@@ -63,22 +52,8 @@ DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml \
$(CURDIR)/debian/xml-man/en/refentryinfo.xml
clean::
- # Restore file deleted; to be removed when upstream will correct this
- -cp '$(CURDIR)/src/imperative.mli~.old' '$(CURDIR)/src/imperative.mli~'
- -cp '$(CURDIR)/src/imperative.ml~.old' '$(CURDIR)/src/imperative.ml~'
- -cp '$(CURDIR)/src/persistent.mli~.old' '$(CURDIR)/src/persistent.mli~'
- -cp '$(CURDIR)/src/persistent.ml~.old' '$(CURDIR)/src/persistent.ml~'
- -cp '$(CURDIR)/src/dot_parser.ml.old' '$(CURDIR)/src/dot_parser.ml'
- -cp '$(CURDIR)/src/dot_lexer.ml.old' '$(CURDIR)/src/dot_lexer.ml'
- -cp '$(CURDIR)/src/dot_parser.mli.old' '$(CURDIR)/src/dot_parser.mli'
- -cp '$(CURDIR)/src/version.ml.old' '$(CURDIR)/src/version.ml'
- -cp '$(CURDIR)/src/gml.ml.old' '$(CURDIR)/src/gml.ml'
- -$(RM) '$(CURDIR)/src/imperative.mli~.old'
- -$(RM) '$(CURDIR)/src/imperative.ml~.old'
- -$(RM) '$(CURDIR)/src/persistent.mli~.old'
- -$(RM) '$(CURDIR)/src/persistent.ml~.old'
- -$(RM) '$(CURDIR)/src/dot_parser.ml.old'
- -$(RM) '$(CURDIR)/src/dot_lexer.ml.old'
- -$(RM) '$(CURDIR)/src/dot_parser.mli.old'
- -$(RM) '$(CURDIR)/src/version.ml.old'
- -$(RM) '$(CURDIR)/src/gml.ml.old'
+ # Fix deletion of sourcefile, can be deleted as soon as upstream
+ # doesn't ship this file anymore
+ -git checkout -- .depend src/imperative.mli~ src/imperative.ml~ \
+ src/persistent.mli~ src/persistent.ml~ src/version.ml \
+ src/dot_lexer.ml src/dot_parser.ml src/dot_parser.mli src/gml.ml
--
ocamlgraph packaging
More information about the Pkg-ocaml-maint-commits
mailing list