[Pkg-cli-libs-commits] [webkitgtk-sharp] 01/04: Merge branch 'upstream'
Andrew Shadura
andrewsh at debian.org
Sun Sep 3 17:16:52 UTC 2017
This is an automated email from the git hooks/post-receive script.
andrewsh pushed a commit to branch master
in repository webkitgtk-sharp.
commit 30040032a404b468277b5eb0aba0f6b4ecc281f8
Merge: 7a5ba28 2c3ef9d
Author: Andrew Shadura <andrewsh at debian.org>
Date: Sun Sep 3 17:31:32 2017 +0200
Merge branch 'upstream'
.gitignore | 108 -
AUTHORS | 3 +-
COPYING | 186 +-
Makefile.am | 12 +-
README.md | 21 +-
configure.ac | 109 +-
debian/changelog | 6 +
debian/control | 73 +-
...nstall => libwebkit2-sharp-4.0-cil-dev.install} | 0
debian/libwebkit2-sharp-4.0-cil.install | 2 +
debian/libwebkit2-sharp-4.0-cil.installcligac | 1 +
debian/libwebkitgtk3.0-cil.install | 2 -
debian/libwebkitgtk3.0-cil.installcligac | 1 -
...ll => monodoc-webkit2-sharp-4.0-manual.install} | 0
doc/Makefile.am | 16 +-
doc/en/.gitkeep | 1 -
m4.custom | 5 +-
m4/GDK_SHARP.m4 | 6 +
m4/GIO_SHARP.m4 | 6 +
m4/GLIB_SHARP.m4 | 6 +
m4/cairo.m4 | 5 -
m4/soup.m4 | 5 -
out/webkitgtk-sharp.dll.config | 6 -
sources/Makefile.am | 104 +-
sources/csproj.xslt | 30 +
sources/custom.sources | 2 +
sources/glue/Makefile.am | 18 +-
sources/webkit2-sharp-V_2_10.csproj | 50 +
sources/webkit2-sharp-api.raw | 4062 ++++++
sources/webkit2-sharp.dll.config | 3 +
...itgtk-sharp.metadata => webkit2-sharp.metadata} | 6 +-
sources/webkit2-sharp.snk | Bin 0 -> 596 bytes
sources/webkitgtk-sharp-api.raw | 13746 -------------------
sources/webkitgtk-sharp.snk | Bin 596 -> 0 bytes
webkit2-sharp-4.0.pc.in | 9 +
webkit2-sharp.sln | 13 +
webkitgtk-sharp-3.0.pc.in | 12 -
37 files changed, 4411 insertions(+), 14224 deletions(-)
diff --cc debian/changelog
index 9bb605a,0000000..c316eb3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,0 +1,33 @@@
++webkit2-sharp (2.10.9+git20160917-1) UNRELEASED; urgency=medium
++
++ * New upstream, new upstream version.
++
++ -- Andrew Shadura <andrewsh at debian.org> Sun, 03 Sep 2017 17:30:38 +0200
++
+webkitgtk-sharp3 (2.0.0+git20151221-3) unstable; urgency=medium
+
+ * Clean up patch headers.
+ * Unbreak parallel build.
+
+ -- Andrew Shadura <andrewsh at debian.org> Mon, 18 Jan 2016 19:23:48 +0100
+
+webkitgtk-sharp3 (2.0.0+git20151221-2) unstable; urgency=medium
+
+ * Patch the DLL map to tell the loader where the glue library is.
+
+ -- Andrew Shadura <andrewsh at debian.org> Mon, 18 Jan 2016 13:21:58 +0100
+
+webkitgtk-sharp3 (2.0.0+git20151221-1) unstable; urgency=low
+
+ [ Thanh Tung Nguyen ]
+ * Initial packaging of 1.10.2 release.
+
+ [ Neil McGovern ]
+ * Update the packaging to 2.0.0.
+
+ [ Andrew Shadura ]
+ * Update to the latest Git snapshot (closes: #807913).
+ * Update the copyright file.
+ * Use mdoc instead of monodocer.
+
+ -- Andrew Shadura <andrewsh at debian.org> Tue, 22 Dec 2015 18:59:59 +0100
diff --cc debian/control
index e8c6162,0000000..3591c28
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,70 -1,0 +1,59 @@@
- Source: webkitgtk-sharp3
++Source: webkit2-sharp
+Section: cli-mono
+Priority: optional
+Maintainer: Debian CLI Libraries Team <pkg-cli-libs-team at lists.alioth.debian.org>
+Uploaders: Andrew Shadura <andrewsh at debian.org>
- Homepage: https://github.com/stsundermann/webkitgtk-sharp
++Homepage: https://github.com/hbons/webkit2-sharp
+Standards-Version: 3.9.6
- Build-Depends: cli-common-dev (>= 0.8~), debhelper (>= 9), dh-autoreconf,
- gtk-sharp3 (>= 2.99.2), libsoup2.4-cil-dev, libtool, libwebkitgtk-3.0-dev (>= 2.0),
- mono-devel (>= 1.0.0), mono-mcs, mono-gac, monodoc-base, pkg-config
++Build-Depends:
++ cli-common-dev (>= 0.8~),
++ debhelper (>= 9),
++ dh-autoreconf,
++ dos2unix,
++ gtk-sharp3 (>= 2.99.2),
++ libsoup2.4-cil-dev,
++ libtool,
++ libwebkit2gtk-4.0-dev,
++ mono-devel (>= 1.0.0),
++ mono-gac,
++ mono-mcs,
++ monodoc-base,
++ pkg-config,
++ xsltproc
+
- Package: libwebkitgtk2.0-cil
- Architecture: all
- Priority: extra
- Section: oldlibs
- Depends: libwebkitgtk3.0-cil, ${misc:Depends}
- Description: CLI bindings for WebKitGTK+ 3.0 (transitional package)
- This is a transitional package. You can safely remove it.
-
- Package: libwebkitgtk2.0-cil-dev
- Architecture: all
- Priority: extra
- Section: oldlibs
- Depends: libwebkitgtk3.0-cil-dev, ${misc:Depends}
- Description: CLI bindings for WebKitGTK+ 3.0 (transitional development package)
- This is a transitional package. You can safely remove it.
-
- Package: libwebkitgtk3.0-cil
++Package: libwebkit2-sharp-4.0-cil
+Architecture: any
+Depends: ${cli:Depends}, ${shlibs:Depends}, ${misc:Depends}
- Breaks: libwebkitgtk-3.0-cil
- Replaces: libwebkitgtk-3.0-cil
- Description: CLI bindings for WebKitGTK+ 3.0 using GObject Introspection
++Description: CLI bindings for WebKitGTK+ 4.0 using GObject Introspection
+ WebKit is a web content engine, derived from KHTML and KJS from KDE, and
+ used primarily in Apple's Safari browser. It is made to be embedded in
+ other applications, such as mail readers, or web browsers.
+ .
- This package provides the webkitgtk-sharp assembly that allows CLI programs to
- use the WebKitGTK+ 3.0 library.
++ This package provides the webkit2-sharp assembly that allows CLI programs to
++ use the WebKitGTK+ 4.0 library.
+
- Package: libwebkitgtk3.0-cil-dev
++Package: libwebkit2-sharp-4.0-cil-dev
+Architecture: any
- Depends: libwebkitgtk3.0-cil (= ${binary:Version}), libsoup2.4-cil-dev, ${misc:Depends}
- Description: CLI bindings for WebKitGTK+ 3.0 using GObject Introspection - development
++Depends:
++ libsoup2.4-cil-dev,
++ libwebkit2-sharp-4.0-cil (= ${binary:Version}),
++ ${misc:Depends}
++Description: CLI bindings for WebKitGTK+ 4.0 using GObject Introspection - development
+ WebKit is a web content engine, derived from KHTML and KJS from KDE, and
+ used primarily in Apple's Safari browser. It is made to be embedded in
+ other applications, such as mail readers, or web browsers.
+ .
- This package provides development files for the WebKit# assembly,
++ This package provides development files for the WebKit# 4.0 assembly,
+ and should be used for compilation.
+
- Package: monodoc-webkitgtk2.0-manual
- Architecture: all
- Priority: extra
- Section: oldlibs
- Depends: monodoc-webkitgtk3.0-manual, ${misc:Depends}
- Description: compiled XML documentation for WebKit# (transitional package)
- This is a transitional package. You can safely remove it.
-
- Package: monodoc-webkitgtk3.0-manual
++Package: monodoc-webkit2-sharp-4.0-manual
+Architecture: all
+Section: doc
+Priority: extra
+Depends: monodoc-manual, ${misc:Depends}
- Description: compiled XML documentation for WebKit#
++Description: compiled XML documentation for WebKit# 4.0
+ The MonoDoc Project is the documentation framework of the Mono project which
+ provides detailed API documentation for all Mono components and the Mono CLI
+ implementation.
+ .
- This package contains the compiled XML documentation for WebKit#.
++ This package contains the compiled XML documentation for WebKit# 4.0.
diff --cc debian/libwebkit2-sharp-4.0-cil-dev.install
index 7103a0c,0000000..7103a0c
mode 100644,000000..100644
--- a/debian/libwebkit2-sharp-4.0-cil-dev.install
+++ b/debian/libwebkit2-sharp-4.0-cil-dev.install
diff --cc debian/libwebkit2-sharp-4.0-cil.install
index 0000000,0000000..010b3c9
new file mode 100644
--- /dev/null
+++ b/debian/libwebkit2-sharp-4.0-cil.install
@@@ -1,0 -1,0 +1,2 @@@
++usr/lib/mono/gac/webkit2-sharp/2.10.*/* usr/lib/cli/webkit2-sharp-4.0
++usr/lib/libwebkit2sharpglue-2.10.*.so usr/lib/cli/webkit2-sharp-4.0
diff --cc debian/libwebkit2-sharp-4.0-cil.installcligac
index 0000000,0000000..5d5f3d8
new file mode 100644
--- /dev/null
+++ b/debian/libwebkit2-sharp-4.0-cil.installcligac
@@@ -1,0 -1,0 +1,1 @@@
++/usr/lib/cli/webkit2-sharp-4.0/webkit2-sharp.dll
diff --cc debian/monodoc-webkit2-sharp-4.0-manual.install
index b4721fc,0000000..b4721fc
mode 100644,000000..100644
--- a/debian/monodoc-webkit2-sharp-4.0-manual.install
+++ b/debian/monodoc-webkit2-sharp-4.0-manual.install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-libs/packages/webkitgtk-sharp.git
More information about the Pkg-cli-libs-commits
mailing list