[Pkg-ocaml-maint-commits] [ceve] 02/03: integrate last changes for version 1.4-3
Ralf Treinen
treinen at moszumanska.debian.org
Thu Jun 18 18:47:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository ceve.
commit 50d78469ec98222b09a66cdd3dd33451b85b697b
Author: Ralf Treinen <treinen at free.fr>
Date: Thu Jun 18 20:46:16 2015 +0200
integrate last changes for version 1.4-3
---
debian/changelog | 23 ++++++++++++++--------
debian/control | 36 ++++++++--------------------------
debian/patches/Makefile | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 +++---
5 files changed, 79 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e27c1b6..996ab30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,18 @@
-ceve (1.4-3) UNRELEASED; urgency=low
-
- * Make this a transitional package:
- * Downgraded priority to extra
- * remove debian/ceve.manpages, debian/patches
- * debian/rules: build target does nothing
-
- -- Ralf Treinen <treinen at debian.org> Tue, 03 Apr 2012 09:14:10 +0200
+ceve (1:1.4-3) unstable; urgency=low
+
+ * make this a transitional package to dose-extra:
+ - Section: oldlibs
+ - Architecture: all
+ - reduce Build-dependencies to debhelper
+ - drop dependencies ocaml:Depends, misc:Depends, add dose-extra
+ - debian/rules: do nothing
+ - drop stuff from debian/: watch, ceve.manpages
+ - update package description
+ - use an epoch in the version as a ceve binary package with version
+ 2.* used to be produced by the dose3 source package.
+ * Standards-Version 3.9.4 (no change)
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 09 May 2013 20:04:51 +0200
ceve (1.4-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 9e7cf6a..32766b3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,39 +1,19 @@
Source: ceve
-Section: devel
+Section: oldlibs
Priority: extra
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Stefano Zacchiroli <zack at debian.org>,
Ralf Treinen <treinen at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~),
- ocaml-nox (>= 3.11.1-3~), ocaml-findlib,
- libdose2-ocaml-dev (>= 1.4.2),
- libexpat-ocaml-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.9.4
Homepage: http://sodiac.gforge.inria.fr/
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ceve.git
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ceve.git
Package: ceve
-Architecture: any
-Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: utility to parse package dependencies as set of constraints
- Ceve is a command line utility used to parse package metadata
- information (in particular package interrelationships such as
- dependencies) and convert them to set of constraints that need to
- be satisfied by a proper package installation.
- .
- Supported input formats for package metadata are:
- * .deb packages
- * Debian package lists (i.e. as in Packages.gz)
- * .rpm packages
- * RPM package lists
- * EGraph (XML based format, derived from GraphML)
- .
- Supported output formats for set of constraints are:
- * pretty printed format for human consumption
- * EGraph
- * Dose base, suitable as input for the Pkglab tool
- * Oz (a programming language supporting constraint programming)
- * Graphviz
- * Tart, suitable as input for the Tart media partitioner
+Architecture: all
+Depends: ${misc:Depends}, dose-extra
+Description: package dependency parser (transitional package)
+ This is a transitional package which can be safely removed, its only
+ purpose is to pull in the dependency on dose-extra.
diff --git a/debian/patches/Makefile b/debian/patches/Makefile
new file mode 100644
index 0000000..21b4837
--- /dev/null
+++ b/debian/patches/Makefile
@@ -0,0 +1,52 @@
+Description: Various fixes to upstream makefile
+Author: Stefano Zacchiroli <zack at debian.org>
+Reviewed-By: Ralf Treinen <treinen at debian.org>
+
+--- ceve-1.4.orig/Makefile
++++ ceve-1.4/Makefile
+@@ -20,7 +20,7 @@ egraph_writer.mli dose_writer.mli depend
+ cnf_writer.mli graphviz_writer.mli oz_writer.mli
+ OBJS = $(OCAML_SOURCES:.ml=.cmo)
+ XBJS = $(OCAML_SOURCES:.ml=.cmx)
+-CMIS = $(OCAML_MLIS:.mli=.cmi)
++CMIS = $(OCAML_MLIS:.mli=.cmi) ceve.cmi
+
+ PACKAGES = -package dose2.lifetime,dose2.ocamlpkgsrc,dose2.ocamlrpm,dose2.ocamldeb,dose2.dosebase,str,$(CAMLZIP_NAME)
+ #ifdef USE_OCAMLDUCE
+@@ -28,8 +28,11 @@ PACKAGES = -package dose2.lifetime,dose2
+ #DUCEDIR=$(shell ocamlfind query ocamlduce)
+ #endif
+
++all: ceve
++opt: ceve.opt
++
+ ceve: $(OBJS)
+- $(OCAMLFIND) ocamlc -I $(DUCEDIR) -thread -custom -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(OBJS)
++ $(OCAMLFIND) ocamlc -thread -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(OBJS)
+
+ ceve.opt: $(XBJS)
+ # bug in ocamlducefind
+@@ -60,7 +63,7 @@ endif
+ $(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
+
+ %.cmi: %.mli
+- $(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
++ $(OCAMLFIND) ocamlc $(PACKAGES) -c $<
+
+ doc: $(CMIS)
+ @rm -rf doc
+@@ -72,8 +75,12 @@ clean:
+ @rm -rf ceve ceve.opt doc $(OBJS) $(XBJS) $(CMIS) $(OCAML_SOURCES:.ml=.o)
+
+ install: ceve
+- { test ! -f ceve.opt || install ceve.opt $(BINDIR); }; \
+- install ceve $(BINDIR)
++ mkdir -p $(BINDIR)
++ if [ -f ceve.opt ] ; then \
++ cp ceve.opt $(BINDIR)/ceve ; \
++ else \
++ cp ceve $(BINDIR)/ceve ; \
++ fi
+
+ depend:
+ $(OCAMLFIND) ocamldep $(OCAML_SOURCES) $(OCAML_MLIS) > .depend
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Makefile
diff --git a/debian/rules b/debian/rules
index 1045d25..270cb43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
#!/usr/bin/make -f
-OPTCOMPILER=/usr/bin/ocamlopt
-
%:
- dh $@ --with ocaml
+ dh $@
override_dh_auto_build:
true
+override_dh_auto_install:
+ true
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ceve.git
More information about the Pkg-ocaml-maint-commits
mailing list