The following commit has been merged in the master branch:
commit 9515fb1ed1d7cd0c9d3a9fc342f11fa8349dc52c
Merge: 24433f19902e9615308cdceaf9dac7c6c5230627
401a680e11f3c6bc1b34b39d310c71aa558118b8
Author: Prach Pongpanich <prach...@gmail.com>
Date: Thu Mar 21 13:21:36 2013 +0700
Imported Debian patch 2.1.0-1
diff --combined debian/changelog
index e0d352a,0000000..b49ffd9
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,6 @@@
- ocamlrss (2.0-1) UNRELEASED; urgency=low
++ocamlrss (2.1.0-1) experimental; urgency=low
+
- * Initial packaging (Closes: #678218)
++ * Initial release (Closes: #678218)
++ * Adopt an initial package from Sylvain Le Gal <gil...@debian.org>
+
- -- Sylvain Le Gall <gil...@debian.org> Tue, 19 Jun 2012 22:19:41 +0000
++ -- Prach Pongpanich <prach...@gmail.com> Thu, 21 Mar 2013 13:21:36 +0700
diff --combined debian/compat
index 45a4fb7,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 8
++9
diff --combined debian/control
index 2160f5e,0000000..3c934a1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,51 -1,0 +1,53 @@@
+Source: ocamlrss
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Uploaders:
- Sylvain Le Gall <gil...@debian.org>
++ Prach Pongpanich <prach...@gmail.com>
+Build-Depends:
- debhelper (>= 8),
++ debhelper (>= 9),
+ ocaml-nox (>= 3.11.1-3~),
+ ocaml-findlib (>= 1.2.5),
+ dh-ocaml (>= 0.9),
- libxmlm-ocaml-dev (>= 1.1.0)
- Conflicts: libcameleon-ocaml-dev
- Standards-Version: 3.9.2
++ libxmlm-ocaml-dev (>= 1.1.0),
++ libocamlnet-ocaml-dev
++Build-Conflicts: libcameleon-ocaml-dev
++Standards-Version: 3.9.4
+Section: ocaml
++Vcs-Git: git://github.com/prachpub/ocamlrss.git
++Vcs-Browser: https://github.com/prachpub/ocamlrss
+Homepage: http://zoggy.github.com/ocamlrss
- Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlrss.git
- Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlrss.git
+
+Package: librss-ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Conflicts: libcameleon-ocaml-dev
- Description: RSS 2.0 parser and printer for OCaml
++Description: RSS 2.0 parser and printer for OCaml (runtime)
+ OCaml-RSS is a small OCaml library providing functions to parse and print RSS
+ 2.0 files. The parser can also parse some RDF files, but some fields are not
+ taken into account. There is still some work to do (add missing RSS 2.0
+ attributes, add convenient functions).
+ .
+ OCaml-RSS was previously part of Cameleon but is now developed separately
+ and is findlib compatible.
+
+Package: librss-ocaml-dev
+Architecture: any
+Depends:
+ ${ocaml:Depends},
- ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Recommends: ocaml-findlib
- Description: RSS 2.0 parser and printer for OCaml
++Description: RSS 2.0 parser and printer for OCaml (development)
+ This package is a small OCaml library providing functions to parse and print
+ RSS 2.0 files. The parser can also parse some RDF files, but some fields are
+ not taken into account. There is still some work to do (add missing RSS 2.0
+ attributes, add convenient functions).
+ .
+ OCaml-RSS was previously part of Cameleon but is now developed separately
+ and is findlib compatible.
++ .
++ This is the development package for librss-ocaml
diff --combined debian/copyright
index bc193a0,0000000..61b0a1a
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,39 -1,0 +1,71 @@@
- Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
- Upstream-Author: Maxence Guesdon
- Packaged-By: Sylvain Le Gall <gil...@debian.org>
- Packaged-Date: Tue, 19 Jun 2012 22:07:15 +0000
- Original-Source-Location: http://zoggy.github.com/ocamlrss/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: OCaml-RSS
++Upstream-Contact: Maxence Guesdon <maxence.gues...@inria.fr>
++Source: http://zoggy.github.com/ocamlrss/
+
+Files: *
- Copyright: (C) 2004-2012 Institut National de Recherche en Informatique et en
Automatique
- License: LGPL-3
++Copyright: 2004-2013 Institut National de Recherche en Informatique et en
Automatique
++License: LGPL-3+
+
- The Library is distributed under the terms of the GNU Lesser General Public
- License version 3, with the special exception to it reported above.
++Files: debian/*
++Copyright: 2012 Sylvain Le Gall <gil...@debian.org>,
++ 2013 Prach Pongpanich <prach...@gmail.com>
++License: LGPL-3+
+
- The full text of the GNU Lessere General Public License version 3 can be
- found in `/usr/share/common-licenses/LGPL-3'.
++License: LGPL-3+
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License version
++ 3 as published by the Free Software Foundation.
++ .
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Library General Public License for more details.
++ .
++ You should have received a copy of the GNU Library General Public
++ License along with this program; if not, write to Free Software Foundation,
Inc.,
++ 51 Franklin St, Fifth Floor, Boston,MA 02110-1301, USA.
++ .
++ On Debian systems, the complete text of the GNU Lesser General Public
++ License version 3 can be found in `/usr/share/common-licenses/LGPL-3'.
+
+Files: rss_date.*
- Copyright: (C) 2001 Patrick Doane and Gerd Stolpmann
- License: BSD3
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must
- not claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product documentation
- would be appreciated but is not required.
-
- 2. Altered source versions must be plainly marked as such, and must
- not be misrepresented as being the original software.
-
- 3. This notice may not be removed or altered from any source
- distribution.
++Copyright: 2001 Patrick Doane
++ 2001 Gerd Stolpmann
++ 2004-2012 Institut National de Recherche en Informatique et en
Automatique
++License: LGPL-3+ and BSD-3-clause
++ This software is provided 'as-is', without any express or implied
++ warranty. In no event will the authors be held liable for any damages
++ arising from the use of this software.
++ .
++ Permission is granted to anyone to use this software for any purpose,
++ including commercial applications, and to alter it and redistribute it
++ freely, subject to the following restrictions:
++ .
++ 1. The origin of this software must not be misrepresented; you must
++ not claim that you wrote the original software. If you use this
++ software in a product, an acknowledgment in the product documentation
++ would be appreciated but is not required.
++ .
++ 2. Altered source versions must be plainly marked as such, and must
++ not be misrepresented as being the original software.
++ .
++ 3. This notice may not be removed or altered from any source
++ distribution.
+
++License: LGPL-3+
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU Lesser General Public License version
++ 3 as published by the Free Software Foundation.
++ .
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU Library General Public License for more details.
++ .
++ You should have received a copy of the GNU Library General Public
++ License along with this program; if not, write to Free Software Foundation,
Inc.,
++ 51 Franklin St, Fifth Floor, Boston,MA 02110-1301, USA.
++ .
++ On Debian systems, the complete text of the GNU Lesser General Public
++ License version 3 can be found in `/usr/share/common-licenses/LGPL-3'.
diff --combined debian/librss-ocaml.lintian-overrides
index 0000000,0000000..0699ace
new file mode 100644
--- /dev/null
+++ b/debian/librss-ocaml.lintian-overrides
@@@ -1,0 -1,0 +1,2 @@@
++#lintian overrides for missing hardening that have no meaning for Ocaml
++librss-ocaml: hardening-no-relro
diff --combined debian/rules
index 675e87b,0000000..7e880c7
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,25 -1,0 +1,25 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/ocaml/ocamlvars.mk
+
++
+DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
+
++
+export OCAMLFIND_DESTDIR=$(DESTDIR)
+%:
+ dh $@ --with ocaml
+
- .PHONY: override_dh_auto_build
+override_dh_auto_build:
+ $(MAKE) byte doc
+ifneq ($(OCAML_OPT_ARCH),)
- $(MAKE) opt rss.cmxs
++ $(MAKE) opt
+endif
+
- .PHONY: override_dh_auto_install
+override_dh_auto_install:
+ mkdir -p $(DESTDIR)
+ $(MAKE) install
diff --combined debian/watch
index 9292b87,0000000..d078556
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- http://zoggy.github.com/ocamlrss/ ocamlrss-(.*)\.tar\.gz
++https://github.com/zoggy/ocamlrss/tags .*/release-(\d[\d\.]+)\.(?:zip|tar\.gz)
--
ocamlrss packaging
_______________________________________________
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
