[Pkg-ocaml-maint-commits] [SCM] cameleon packaging branch, master, updated. debian/1.9.18.svn20090302+691-1
Sylvain Le Gall
gildor at debian.org
Tue Mar 10 13:38:52 UTC 2009
The following commit has been merged in the master branch:
commit bdfb2a735760d6d6dacad30328e9a8244fed05b9
Author: Sylvain Le Gall <gildor at debian.org>
Date: Tue Mar 10 14:20:56 2009 +0100
Fixes standing issue for OCaml 3.11 migration
* Remove Remi Vanicat, Sven Luther and Ralf Treinen from Uploaders
field. They are not DM and can act through Debian OCaml Maintainers
* Remove dpkg-dev build-dependency, now ${source:Version} is standard
* Tighten lablgtk2 build-dependency for OCaml 3.11 migration
* Ignore error for $(RM) in clean target
* Remove obsolete debian/control.in related variables and files
diff --git a/debian/changelog b/debian/changelog
index 762d474..ccaa282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cameleon (1.9.18.svn20090302+691-1) UNRELEASED; urgency=low
+cameleon (1.9.18.svn20090302+691-1) unstable; urgency=low
[ Stephane Glondu ]
* New upstream SVN snapshot (Closes: #462010, #514111):
@@ -10,7 +10,6 @@ cameleon (1.9.18.svn20090302+691-1) UNRELEASED; urgency=low
* Add README.source
* Remove deprecated Encoding entries in *.desktop
* Cleanup and wrap dependencies
- * Update ocaml-nox version in CDBS_BUILD_DEPENDS
* Bump Standards-Version to 3.8.0
* Bump debhelper compatibility level to 7
* Add dh-ocaml to Build-Depends (Closes: #517323)
@@ -22,6 +21,14 @@ cameleon (1.9.18.svn20090302+691-1) UNRELEASED; urgency=low
[ Mehdi Dogguy ]
* Fix a typo in description of libcameleon-ocaml-dev
+ [ Sylvain Le Gall ]
+ * Remove Remi Vanicat, Sven Luther and Ralf Treinen from Uploaders
+ field. They are not DM and can act through Debian OCaml Maintainers
+ * Remove dpkg-dev build-dependency, now ${source:Version} is standard
+ * Tighten lablgtk2 build-dependency for OCaml 3.11 migration
+ * Ignore error for $(RM) in clean target
+ * Remove obsolete debian/control.in related variables and files
+
-- Stephane Glondu <steph at glondu.net> Mon, 09 Mar 2009 14:32:11 +0100
cameleon (1.9.18.svn20070918-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e628528..c43819c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,26 @@ Source: cameleon
Section: devel
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stephane Glondu <steph at glondu.net>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
+Uploaders: Stephane Glondu <steph at glondu.net>,
+ Sylvain Le Gall <gildor at debian.org>,
+ Samuel Mimram <smimram at debian.org>,
+ Stefano Zacchiroli <zack at debian.org>
DM-Upload-Allowed: yes
-Build-Depends: cdbs (>= 0.4.23-1.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ocaml-nox (>= 3.11.0-5), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc,
+Build-Depends: cdbs (>= 0.4.23-1.1),
+ quilt,
+ patchutils (>= 0.2.25),
+ cdbs (>= 0.4.27),
+ ocaml-nox (>= 3.11.0-5),
+ po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc,
debhelper (>= 7),
- dh-ocaml,
+ dh-ocaml (>= 0.4.1),
camlp4,
ocaml-findlib,
- liblablgtk2-ocaml-dev,
+ liblablgtk2-ocaml-dev (>= 2.12.0-2),
libxml-light-ocaml-dev,
liblablgtksourceview-ocaml-dev,
libpcre-ocaml-dev,
imagemagick,
- dpkg-dev (>= 1.13.19),
docbook-ebnf
Standards-Version: 3.8.0
Homepage: http://home.gna.org/cameleon/
diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644
index 9fe02dd..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,107 +0,0 @@
-Source: cameleon
-Section: devel
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: @OCamlTeam@
-Build-Depends: @cdbs@,
- debhelper (>= 7),
- dh-ocaml,
- camlp4,
- ocaml-findlib,
- liblablgtk2-ocaml-dev,
- libxml-light-ocaml-dev,
- liblablgtksourceview-ocaml-dev,
- libpcre-ocaml-dev,
- imagemagick,
- dpkg-dev (>= 1.13.19),
- docbook-ebnf
-Standards-Version: 3.8.0
-Homepage: http://home.gna.org/cameleon/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cameleon.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cameleon.git
-
-Package: cameleon
-Architecture: any
-Depends:
- libcameleon-ocaml-dev (= ${binary:Version}),
- ocaml-base-nox-${F:OCamlABI},
- ${shlibs:Depends},
- ${misc:Depends}
-Suggests: cameleon-doc
-Provides: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy, ocaml-report, ocamlcvs, ocaml-dbforge
-Conflicts: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy, ocaml-report, ocamlcvs, ocaml-dbforge
-Replaces: mlchat, ocaml-omom, ocaml-ioxml, ocaml-zoggy, ocaml-report, ocamlcvs, ocaml-dbforge
-Description: integrated development environment for OCaml
- Cameleon is a set of tools and libraries put together to create an
- integrated development environment for the OCaml programming language.
- .
- Its main features are :
- - graphical user interface,
- - configuration management based on CVS,
- - easy access to and browsing of documentation,
- - various editors, according to customizable file types,
- - use of plug-ins to define new features,
- - highly customizable interface (menus, toolbar, keyboard shortcuts).
- .
- Tools shipped are :
- - Chamo, a source code editor based on the GtkSourceView widget with some
- emacs-like functionality,
- - DBforge, a tool to describe database schemas and generate OCaml code to
- access these databases,
- - OCamlCVS, a graphical front end for the CVS configuration management
- utility,
- - Report, a tool aims to make generation of XML documents from OCaml
- applications easier,
-
-Package: cameleon-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: documentation for Cameleon
- It contains documentation build with Cameleon:
- - Cameleon reference manual
- - Cameleon user manual,
- .
- Documentation can be in HTML, Postscript or odoc formats.
-
-Package: libcameleon-ocaml-dev
-Section: libdevel
-Architecture: any
-Depends:
- liblablgtk2-ocaml-dev,
- libxml-light-ocaml-dev,
- ${misc:Depends}
-Suggests: cameleon-doc
-Provides:
- libreport-ocaml-dev,
- libmlchat-ocaml-dev,
- libocamlcvs-ocaml-dev,
- libgpattern-ocaml-dev,
- liboptions-ocaml-dev,
- libokey-ocaml-dev,
- libconfigwin-ocaml-dev
-Conflicts:
- libreport-ocaml-dev,
- libmlchat-ocaml-dev,
- libocamlcvs-ocaml-dev,
- libgpattern-ocaml-dev,
- liboptions-ocaml-dev,
- libokey-ocaml-dev,
- libconfigwin-ocaml-dev
-Replaces:
- libreport-ocaml-dev,
- libmlchat-ocaml-dev,
- libocamlcvs-ocaml-dev,
- libgpattern-ocaml-dev,
- liboptions-ocaml-dev,
- libokey-ocaml-dev,
- libconfigwin-ocaml-dev
-Description: libraries from Cameleon
- It contains the libraries built with Cameleon:
- - Config_file, create configuration files,
- - Configwin, build configuration or input windows in LablGTK,
- - Odiff, print and parse differences between files or strings, in the diff
- utility format,
- - Odot, parse and print Graphviz dot files,
- - Okey, add handlers to key press events in LablGTK,
- - Tdl, represent, store and read TODO lists in XML files,
diff --git a/debian/rules b/debian/rules
index 54a3914..7e667c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,9 +17,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
# MA 02110-1301, USA.
-# Generate debian/control using
-# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/autotools.mk
@@ -76,29 +73,29 @@ DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/cam-config2.byte.xml \
DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml \
$(CURDIR)/debian/xml-man/en/refentryinfo.xml
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.11.0-5),$(CDBS_BUILD_DEPENDS))
-
OCAML_OCAMLDOC_PACKAGES_DOCBASE := cameleon-doc
# These cannot be erased by debian/clean mechanisms becore they are touched
# by upstream `make clean'
clean::
- $(RM) src/.depend src/odot/.depend src/custop/custop_installation.ml
+ -$(RM) '$(CURDIR)/src/.depend'
+ -$(RM) '$(CURDIR)/src/odot/.depend'
+ -$(RM) '$(CURDIR)/src/custop/custop_installation.ml'
install/cameleon install/cameleon-doc install/libcameleon-ocaml-dev:: cameleon-install-extra
cameleon-install-extra: common-install-indep common-install-arch
VERSION=$(DEB_NOEPOCH_VERSION); \
VERSION=$${VERSION%%-*}; \
- sed -i "s/@VERSION@/$$VERSION/g" $(CURDIR)/debian/META.cameleon
+ sed -i "s/@VERSION@/$$VERSION/g" '$(CURDIR)/debian/META.cameleon'
# Remove unused binaries
$(RM) $(DESTDIR)/usr/bin/*.x
# Move documentation (cameleon-doc)
mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/cameleon/*.odoc \
- $(DESTDIR_DOC)/$(OCAML_STDLIB_DIR)/cameleon
+ '$(DESTDIR_DOC)/$(OCAML_STDLIB_DIR)/cameleon'
# Install library (libcameleon-ocaml-dev)
- mv $(DESTDIR)/$(OCAML_STDLIB_DIR)/cameleon \
- $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)
+ mv '$(DESTDIR)/$(OCAML_STDLIB_DIR)/cameleon' \
+ '$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)'
.PHONY: cameleon-install-extra
diff --git a/debian/xml-man/en/cam-config2.byte.xml b/debian/xml-man/en/cam-config2.byte.xml
index c171f73..ea35691 100644
--- a/debian/xml-man/en/cam-config2.byte.xml
+++ b/debian/xml-man/en/cam-config2.byte.xml
@@ -171,7 +171,9 @@
<command>cameleon2.byte</command>
</refentrytitle>
<manvolnum>1</manvolnum>
- </citerefentry>,
+ </citerefentry>
+ </para>
+ <para>
<citerefentry>
<refentrytitle>
<command>tmpl_engine.byte</command>
diff --git a/debian/xml-man/po4a/po/cameleon-man.pot b/debian/xml-man/po4a/po/cameleon-man.pot
index c7354a7..37f1c4e 100644
--- a/debian/xml-man/po4a/po/cameleon-man.pot
+++ b/debian/xml-man/po4a/po/cameleon-man.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-05-24 14:40+0200\n"
+"POT-Creation-Date: 2009-03-10 14:05+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -212,12 +212,17 @@ msgid "SEE ALSO"
msgstr ""
# type: Content of: <refentry><refsect1><para>
-#: debian/xml-man/en/cam-config2.byte.xml:169
+#: debian/xml-man/en/cam-config2.byte.xml:169 debian/xml-man/en/ocamlcvs2.byte.xml:89
msgid ""
"<citerefentry> <refentrytitle> <command>cameleon2.byte</command> "
-"</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>, <citerefentry> "
-"<refentrytitle> <command>tmpl_engine.byte</command> </refentrytitle> "
-"<manvolnum>1</manvolnum> </citerefentry>"
+"</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>"
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#: debian/xml-man/en/cam-config2.byte.xml:177
+msgid ""
+"<citerefentry> <refentrytitle> <command>tmpl_engine.byte</command> "
+"</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>"
msgstr ""
# type: Content of the dhprg entity
@@ -495,13 +500,6 @@ msgstr ""
msgid "Display an help message."
msgstr ""
-# type: Content of: <refentry><refsect1><para>
-#: debian/xml-man/en/ocamlcvs2.byte.xml:89
-msgid ""
-"<citerefentry> <refentrytitle> <command>cameleon2.byte</command> "
-"</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>"
-msgstr ""
-
# type: Content of: <refentryinfo><copyright><holder>
#: debian/xml-man/en/refentryinfo.xml:38
msgid "Sylvain Le Gall"
--
cameleon packaging
More information about the Pkg-ocaml-maint-commits
mailing list