This is an automated email from the git hooks/post-receive script.

josch pushed a commit to tag debian/3.3-3
in repository dose3.

commit 6e0cf55c492365ce2d08dca35f3f2cfd0d71ceee
Author: josch <j.scha...@email.de>
Date:   Fri Nov 21 07:34:37 2014 +0100

    new upstream version. Adapt patches, remove applied patches
---
 debian/changelog                         |  7 +++-
 debian/patches/build-cmx                 | 30 ---------------
 debian/patches/doc-target                | 55 ---------------------------
 debian/patches/installcudf-target        | 25 ------------
 debian/patches/manpages-typos            | 65 --------------------------------
 debian/patches/multiarch-accept-value-no | 20 ----------
 debian/patches/series                    |  6 ---
 7 files changed, 5 insertions(+), 203 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f17662..71289d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-dose3 (3.3~beta1-3) UNRELEASED; urgency=medium
+dose3 (3.3-1) UNRELEASED; urgency=medium
 
   [ Johannes Schauer ]
+  * new upstream version
+    - dropped patches that were integrated upstream: build-cmx, doc-target,
+      installcudf-target, manpages-typos, multiarch-accept-value-no
   * fix debian/watch (add uversionmangle) 
 
- --
+ -- Johannes Schauer <j.scha...@email.de>  Fri, 21 Nov 2014 07:30:23 +0100
 
 dose3 (3.3~beta1-2) experimental; urgency=low
 
diff --git a/debian/patches/build-cmx b/debian/patches/build-cmx
deleted file mode 100644
index 0603b0d..0000000
--- a/debian/patches/build-cmx
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Pietro Abate <pietro.ab...@pps.jussieu.fr>
-Description: Now really build cmx cmxs a
-Upstream commit: 3a9505c436d3e13f699b8e73e3671cca60def2ae
-
-diff --git a/Makefile b/Makefile
-index b4f4957..d068d76 100644
---- a/Makefile
-+++ b/Makefile
-@@ -138,7 +138,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/debian.% 
$(DOSELIBS)/eclipse.%
- 
- clean:
-       $(OCAMLBUILD) -clean
--      rm -f applications/apps.itarget applications/.itarget
-+      rm -f applications/apps.itarget
-       cd doc && $(MAKE) clean
- 
- distclean: clean
-diff --git a/Makefile.config.in b/Makefile.config.in
-index 446d124..b0277db 100644
---- a/Makefile.config.in
-+++ b/Makefile.config.in
-@@ -95,7 +95,7 @@ uninstallcudf:
- endif
- 
- ifeq ("@OCAMLEXT@","native")
--      SUFFIX += cmxa cmxs a
-+  SUFFIX += cmxa cmxs a
-   OPTLIBS += $(BYTELIBS:%.cma=%.cmxa) 
-   CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
-   ALIBS = $(BYTELIBS:%.cma=%.a)
diff --git a/debian/patches/doc-target b/debian/patches/doc-target
deleted file mode 100644
index 4293d33..0000000
--- a/debian/patches/doc-target
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Pietro Abate <pietro.ab...@pps.jussieu.fr>
-Description: fix doc target
-Upstream commit: d55cf3a0902b1b50e14a9a2dd714029cf6a9e2f4 (partially)
-
-diff --git a/Makefile b/Makefile
-index 866604a..b4f4957 100644
---- a/Makefile
-+++ b/Makefile
-@@ -216,8 +216,8 @@ changelog:
- credits:
-       @git log --pretty=format:'%aN        %aE' | LC_ALL=C sort -u | awk 
-F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';
- 
--doc: fast
--      $(OCAMLBUILD) $(OBFLAGS) dose3.docdir/index.html dose3.docdir/index.dot
-+doc: all
-+      $(OCAMLBUILD) dose3.docdir/index.html dose3.docdir/index.dot
-       dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
-       (cd doc && $(MAKE) all)
- 
-@@ -230,4 +230,4 @@ upload: doc
- 
- .PHONY: \
-       common algo debian eclipse rpm cws doseparseNoRpm doseparse \
--      all fast opt clean top-level headers test tags install uninstall dist 
doc man
-+      all clean top-level headers test tags install uninstall dist doc man
-diff --git a/doc/apt-external-solvers.primer/apt-external-solvers.tex 
b/doc/apt-external-solvers.primer/apt-external-solvers.tex
-index 726595f..3597ada 100644
---- a/doc/apt-external-solvers.primer/apt-external-solvers.tex
-+++ b/doc/apt-external-solvers.primer/apt-external-solvers.tex
-@@ -11,7 +11,7 @@
- 
- \documentclass{article}
- \usepackage[utf8]{inputenc}
--%\usepackage{hevea}
-+\usepackage{hevea}
- \usepackage{alltt}
- 
- \input{version}
-diff --git a/dose3.odocl.in b/dose3.odocl.in
-index d24bd73..7f1a3ec 100644
---- a/dose3.odocl.in
-+++ b/dose3.odocl.in
-@@ -22,7 +22,10 @@ applications/Ceve
- applications/Apt-cudf
- applications/Outdated
- applications/Challenged
--doseparse/BoilerplateNoRpm
--doseparse/Boilerplate
-+doseparse/StdDebian
-+doseparse/StdDebug
-+doseparse/StdLoaders
-+doseparse/StdOptions
-+doseparse//StdUtils
- @DOC_OCAMLGRAPH@
- @DOC_RPM@
diff --git a/debian/patches/installcudf-target 
b/debian/patches/installcudf-target
deleted file mode 100644
index 73a02ca..0000000
--- a/debian/patches/installcudf-target
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Pietro Abate <pietro.ab...@pps.jussieu.fr>
-Description: restore installcudf target
-Upstream-commit: f5815f90db7fe92380e9361e0ca862943957523e
-
-diff --git a/Makefile.config.in b/Makefile.config.in
-index acbe883..446d124 100644
---- a/Makefile.config.in
-+++ b/Makefile.config.in
-@@ -84,6 +84,16 @@ LIBNAMES += doseparseNoRpm/doseparseNoRpm \
- BYTELIBNAMES=$(notdir $(LIBNAMES))
- BYTELIBS=$(BYTELIBNAMES:%=$(DOSELIBS)/%.cma)
- 
-+ifeq ("@HAS_LIBCUDF@","no")
-+installcudf:
-+      $(MAKE) -C cudf all @OCAMLBEST@ install
-+uninstallcudf:
-+      $(MAKE) -C cudf uninstall
-+else
-+installcudf:
-+uninstallcudf:
-+endif
-+
- ifeq ("@OCAMLEXT@","native")
-       SUFFIX += cmxa cmxs a
-   OPTLIBS += $(BYTELIBS:%.cma=%.cmxa) 
diff --git a/debian/patches/manpages-typos b/debian/patches/manpages-typos
deleted file mode 100644
index 085772e..0000000
--- a/debian/patches/manpages-typos
+++ /dev/null
@@ -1,65 +0,0 @@
-Author:  Johannes Schauer <j.scha...@email.de>
-Description: fix some typos in manpages
-Upstream-commit: 21fde33b3c6ff2a30dc29e65095d5ab9883700bc
-
-diff --git a/doc/manpages/apt-cudf-get.pod b/doc/manpages/apt-cudf-get.pod
-index 991cde3..48f98b3 100644
---- a/doc/manpages/apt-cudf-get.pod
-+++ b/doc/manpages/apt-cudf-get.pod
-@@ -13,7 +13,7 @@ apt-cudf-get - wrapper for calling apt-get with external 
solvers
- 
- =head1 DESCRIPTION
- 
--B<apt-cudf-get> is a wrapper that allows to invoke B<apt-get> with
-+B<apt-cudf-get> is a wrapper that allows one to invoke B<apt-get> with
- external solvers while ignoring apt's pinning.
- 
- All options are passed on to apt-get.
-@@ -48,7 +48,7 @@ Pietro Abate and Roberto Di Cosmo
- 
- =head1 BUGS
- 
--Not all types of arguements to apt are correctly treated by this wrapper,
-+Not all types of arguments to apt are correctly treated by this wrapper,
- in particular not the +I<pkg> and -I<pkg> shorthands for installation and 
removal requests.
- 
- =head1 SEE ALSO
-diff --git a/doc/manpages/apt-cudf.pod b/doc/manpages/apt-cudf.pod
-index f1fb101..6f2dbed 100644
---- a/doc/manpages/apt-cudf.pod
-+++ b/doc/manpages/apt-cudf.pod
-@@ -14,7 +14,7 @@ apt-cudf - CUDF solver integration for APT
- 
- apt-cudf translates back and forth among a CUDF-based dependency solver and 
the
- protocol used by APT to talk with external dependency solvers. apt-cudf
--therefore allows to use any CUDF solver as an external solver for APT.
-+therefore allows one to use any CUDF solver as an external solver for APT.
- 
- apt-cudf relies on its C<argv[0]> name to find the CUDF solver to invoke.  In
- common setups, you should have a CUDF solver specification file under
-diff --git a/doc/manpages/ceve.pod b/doc/manpages/ceve.pod
-index 8db8182..45900a3 100644
---- a/doc/manpages/ceve.pod
-+++ b/doc/manpages/ceve.pod
-@@ -83,7 +83,7 @@ with the option B<-T >I<dot|gml|grml>. Possible values are:
- =item .
- 
- B<syn> for the syntactic graph where disjunctions nodes and conflicts are
--explicitely added to the graph. 
-+explicitly added to the graph. 
- 
- =item .
- 
-diff --git a/doc/manpages/distcheck.pod b/doc/manpages/distcheck.pod
-index 958d393..9f3b180 100644
---- a/doc/manpages/distcheck.pod
-+++ b/doc/manpages/distcheck.pod
-@@ -194,7 +194,7 @@ List all packages that are found not to be installable.
- 
- List all packages that are found to be installable. May be used together
- with B<--failures>, in this case the value of the status field in the output
--allows to distinguish installable from non-installable packages.
-+allows one to distinguish installable from non-installable packages.
- 
- =item B<-e>, B<--explain> 
- 
diff --git a/debian/patches/multiarch-accept-value-no 
b/debian/patches/multiarch-accept-value-no
deleted file mode 100644
index 4a442b5..0000000
--- a/debian/patches/multiarch-accept-value-no
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Pietro Abate <pietro.ab...@pps.jussieu.fr>
-Debian-bug: #759372
-Description: when parsing debian package data, accept "no" as alias
-            for "none" as value for Multiarch
-Upstream-commit: f453cd423c181e4549742fbcb12b54377938f601
-
-
-Index: dose3/deb/packages_parser.mly
-===================================================================
---- dose3.orig/deb/packages_parser.mly 2014-09-14 19:57:40.833179444 +0200
-+++ dose3/deb/packages_parser.mly      2014-09-14 19:57:40.829179444 +0200
-@@ -13,7 +13,7 @@
-   | _ -> assert false   (* lexer shouldn't have returned such a RELOP! *)
- 
- let parse_multiarch = function
--  |("None"|"none") -> `None
-+  |("None"|"none"|"no") -> `None
-   |("Allowed"|"allowed") -> `Allowed
-   |("Foreign"|"foreign") -> `Foreign
-   |("Same"|"same") -> `Same
diff --git a/debian/patches/series b/debian/patches/series
index 15b4802..2e270a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
 binaries-prefix-edos
 coinstall-binary-name
-doc-target
-installcudf-target
-build-cmx
-manpages-typos
-fixMETA
-fixDebPrinter

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to