r53112 - in /packages/unstable/gnome-builder/debian: changelog control control.in gnome-builder.install not-installed patches/ rules
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Wed Aug 30 15:50:51 UTC 2017
Author: ah
Date: Wed Aug 30 15:50:51 2017
New Revision: 53112
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53112
Log:
* New upstream beta release.
* Update build-dependencies according to upstream changes.
* Drop debian/patches/revert-require-libgit2-glib25.patches
* Use C.UTF-8 locale when building as C is not supported.
* Switch configure flags to meson option defines.
* Install python gi overrides file from dist-packages path.
* Stop installing dropped ide-* binaries (internals moved to libdazzle).
Added:
packages/unstable/gnome-builder/debian/not-installed
Removed:
packages/unstable/gnome-builder/debian/patches/
Modified:
packages/unstable/gnome-builder/debian/changelog
packages/unstable/gnome-builder/debian/control
packages/unstable/gnome-builder/debian/control.in
packages/unstable/gnome-builder/debian/gnome-builder.install
packages/unstable/gnome-builder/debian/rules
Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=53112&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog [utf-8] Wed Aug 30 15:50:51 2017
@@ -1,10 +1,17 @@
-gnome-builder (3.24.2-2) UNRELEASED; urgency=medium
+gnome-builder (3.25.91-1) experimental; urgency=medium
* Only build-dep and enable flatpak plugin on linux
* Use dh_missing --fail-missing instead of obsolete dh_install....
* Bump Standards-Version to 4.1.0
-
- -- Andreas Henriksson <andreas at fatal.se> Wed, 30 Aug 2017 14:33:09 +0200
+ * New upstream beta release.
+ * Update build-dependencies according to upstream changes.
+ * Drop debian/patches/revert-require-libgit2-glib25.patches
+ * Use C.UTF-8 locale when building as C is not supported.
+ * Switch configure flags to meson option defines.
+ * Install python gi overrides file from dist-packages path.
+ * Stop installing dropped ide-* binaries (internals moved to libdazzle).
+
+ -- Andreas Henriksson <andreas at fatal.se> Wed, 30 Aug 2017 15:52:07 +0200
gnome-builder (3.24.2-1) unstable; urgency=medium
Modified: packages/unstable/gnome-builder/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/control?rev=53112&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/control [utf-8] (original)
+++ packages/unstable/gnome-builder/debian/control [utf-8] Wed Aug 30 15:50:51 2017
@@ -15,24 +15,29 @@
gnome-pkg-tools,
gobject-introspection (>= 1.48.0),
libclang-dev [!armel],
+ libdazzle-1.0-dev (>= 3.25.91),
libdevhelp-dev (>= 3.20.0),
+ libenchant-dev (>= 1.6.0),
libflatpak-dev (>= 0.6.9) [linux-any],
- libgit2-glib-1.0-dev (>= 0.24.0),
+ libgit2-glib-1.0-dev (>= 0.25.0),
+ libjsonrpc-glib-1.0-dev (>= 3.25.3),
libsoup2.4-dev,
libgjs-dev (>= 1.42.0),
- libglib2.0-dev (>= 2.50.0),
+ libglib2.0-dev (>= 2.53.2),
libgspell-1-dev (>= 1.2.0),
libgtk-3-dev (>= 3.22.1),
libgtksourceview-3.0-dev (>= 3.22.0),
libjson-glib-dev (>= 0.1.0),
libpango1.0-dev (>= 1.38.0),
libpcre3-dev,
- libpeas-dev (>= 1.18.0-2~),
+ libpeas-dev (>= 1.21.0),
+ libtemplate-glib-1.0-dev (>= 3.25.3),
libvala-0.36-dev,
libvte-2.91-dev (>= 0.46),
libwebkit2gtk-4.0-dev (>= 2.8.4),
libxml2-dev (>= 2.9.0),
llvm [!armel],
+ meson (>= 0.40.1),
mm-common,
python-gi-dev (>= 3.22.0),
python3-dev,
Modified: packages/unstable/gnome-builder/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/control.in?rev=53112&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/control.in [utf-8] (original)
+++ packages/unstable/gnome-builder/debian/control.in [utf-8] Wed Aug 30 15:50:51 2017
@@ -11,24 +11,29 @@
gnome-pkg-tools,
gobject-introspection (>= 1.48.0),
libclang-dev [!armel],
+ libdazzle-1.0-dev (>= 3.25.91),
libdevhelp-dev (>= 3.20.0),
+ libenchant-dev (>= 1.6.0),
libflatpak-dev (>= 0.6.9) [linux-any],
- libgit2-glib-1.0-dev (>= 0.24.0),
+ libgit2-glib-1.0-dev (>= 0.25.0),
+ libjsonrpc-glib-1.0-dev (>= 3.25.3),
libsoup2.4-dev,
libgjs-dev (>= 1.42.0),
- libglib2.0-dev (>= 2.50.0),
+ libglib2.0-dev (>= 2.53.2),
libgspell-1-dev (>= 1.2.0),
libgtk-3-dev (>= 3.22.1),
libgtksourceview-3.0-dev (>= 3.22.0),
libjson-glib-dev (>= 0.1.0),
libpango1.0-dev (>= 1.38.0),
libpcre3-dev,
- libpeas-dev (>= 1.18.0-2~),
+ libpeas-dev (>= 1.21.0),
+ libtemplate-glib-1.0-dev (>= 3.25.3),
libvala-0.36-dev,
libvte-2.91-dev (>= 0.46),
libwebkit2gtk-4.0-dev (>= 2.8.4),
libxml2-dev (>= 2.9.0),
llvm [!armel],
+ meson (>= 0.40.1),
mm-common,
python-gi-dev (>= 3.22.0),
python3-dev,
Modified: packages/unstable/gnome-builder/debian/gnome-builder.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/gnome-builder.install?rev=53112&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/gnome-builder.install [utf-8] (original)
+++ packages/unstable/gnome-builder/debian/gnome-builder.install [utf-8] Wed Aug 30 15:50:51 2017
@@ -1,15 +1,14 @@
usr/bin/gnome-builder
usr/bin/gnome-builder-cli
+#usr/include/gnome-builder/gstyle/
+#usr/include/gnome-builder/libide/
usr/lib/*/gnome-builder-worker
usr/lib/*/gnome-builder/*.so
usr/lib/*/gnome-builder/*.so*
usr/lib/*/gnome-builder/girepository-1.0/*.typelib
-usr/lib/*/gnome-builder/ide-*
-usr/lib/*/gnome-builder/plugins/*.plugin
-usr/lib/*/gnome-builder/plugins/*.py
-usr/lib/*/gnome-builder/plugins/*.so
-usr/lib/*/gnome-builder/plugins/*/*.py
-usr/lib/python3.5/site-packages/gi/overrides
+#usr/lib/*/gnome-builder/pkgconfig/
+usr/lib/*/gnome-builder/plugins/
+usr/lib/*/python3*/dist-packages/gi/overrides/
usr/share/appdata/org.gnome.Builder.*
usr/share/applications/org.gnome.Builder.*
usr/share/dbus-1/services/org.gnome.Builder.*
Added: packages/unstable/gnome-builder/debian/not-installed
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/not-installed?rev=53112&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/not-installed (added)
+++ packages/unstable/gnome-builder/debian/not-installed [utf-8] Wed Aug 30 15:50:51 2017
@@ -0,0 +1,3 @@
+usr/include/gnome-builder
+usr/lib/*/pkgconfig
+usr/share/gnome-builder/gir-1.0
Modified: packages/unstable/gnome-builder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/rules?rev=53112&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/rules [utf-8] (original)
+++ packages/unstable/gnome-builder/debian/rules [utf-8] Wed Aug 30 15:50:51 2017
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+export LC_ALL=C.UTF-8
# output every command that modifies files on the build system.
#DH_VERBOSE = 1
@@ -22,74 +24,74 @@
# unless we're on the limited set of architectures that has sysprof.
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifneq (,$(filter amd64 arm64 armel armhf i386 mips64el mipsel ppc64el alpha powerpcspe x32,$(DEB_HOST_ARCH)))
-SYSPROF_PLUGIN = --enable-sysprof-plugin
+SYSPROF_PLUGIN = -Dwith_sysprof=true
else
-SYSPROF_PLUGIN = --disable-sysprof-plugin
+SYSPROF_PLUGIN = -Dwith_sysprof=false
endif
ifneq (,$(filter amd64 arm64 armhf i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el s390x x32,$(DEB_HOST_ARCH)))
-VALGRIND_PLUGIN = --enable-valgrind-plugin
+VALGRIND_PLUGIN = -Dwith_valgrind=true
else
-VALGRIND_PLUGIN = --disable-valgrind-plugin
+VALGRIND_PLUGIN = -Dwith_valgrind=false
endif
ifeq (armel,$(DEB_HOST_ARCH))
-CLANG_PLUGIN = --disable-clang-plugin
+CLANG_PLUGIN = -Dwith_clang=false
else
-CLANG_PLUGIN = --enable-clang-plugin
+CLANG_PLUGIN = -Dwith_clang=true
endif
ifneq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
-FLATPAK_PLUGIN = --enable-flatpak-plugin
+FLATPAK_PLUGIN = -Dwith_flatpak=true
else
-FLATPAK_PLUGIN = --disable-flatpak-plugin
+FLATPAK_PLUGIN = -Dwith_flatpak=false
endif
%:
dh $@ --with gir,gnome,python3
override_dh_auto_configure:
- dh_auto_configure -- --disable-static \
- --enable-autotools-plugin \
- --enable-autotools-templates \
- --enable-beautifier-plugin \
- --enable-cargo-plugin \
- --enable-cmake-plugin \
- --enable-color-picker-plugin \
- --enable-command-bar-plugin \
- --enable-comment-code-plugin \
- --enable-create-project-plugin \
- --enable-c-pack-plugin \
- --enable-ctags-plugin \
- --enable-eslint-plugin \
- --enable-file-search-plugin \
- --enable-fpaste-plugin \
- --enable-gcc-plugin \
- --enable-gettext-plugin \
- --enable-git-plugin \
- --enable-gnome-code-assistance-plugin \
- --enable-html-completion-plugin \
- --enable-html-preview-plugin \
- --enable-jedi-plugin \
- --enable-jhbuild-plugin \
- --enable-make-plugin \
- --enable-meson-plugin \
- --enable-mono-plugin \
- --disable-meson-templates \
- --disable-mingw-plugin \
- --enable-phpize-plugin \
- --enable-project-tree-plugin \
- --enable-python-gi-imports-completion-plugin \
- --enable-python-pack-plugin \
- --enable-quick-highlight-plugin \
- --enable-rust-langserv-plugin \
- --enable-support-plugin \
- --enable-symbol-tree-plugin \
- --enable-sysmon-plugin \
- --enable-terminal-plugin \
- --enable-todo-plugin \
- --enable-vala-pack-plugin \
- --enable-xml-pack-plugin \
+ dh_auto_configure -- \
+ -Dwith_autotools=true \
+ -Dwith_autotools_templates=true \
+ -Dwith_beautifier=true \
+ -Dwith_cargo=true \
+ -Dwith_cmake=true \
+ -Dwith_color_picker=true \
+ -Dwith_command_bar=true \
+ -Dwith_comment_code=true \
+ -Dwith_create_project=true \
+ -Dwith_c_pack=true \
+ -Dwith_ctags=true \
+ -Dwith_eslint=true \
+ -Dwith_file_search=true \
+ -Dwith_fpaste=true \
+ -Dwith_gcc=true \
+ -Dwith_gettext=true \
+ -Dwith_git=true \
+ -Dwith_gnome-code-assistance=true \
+ -Dwith_html-completion=true \
+ -Dwith_html-preview=true \
+ -Dwith_jedi=true \
+ -Dwith_jhbuild=true \
+ -Dwith_make=true \
+ -Dwith_meson=true \
+ -Dwith_mono=true \
+ -Dwith_meson_templates=false \
+ -Dwith_mingw=false \
+ -Dwith_phpize=true \
+ -Dwith_project-tree=true \
+ -Dwith_python-gi-imports-completion=true \
+ -Dwith_python-pack=true \
+ -Dwith_quick-highlight=true \
+ -Dwith_rust-langserv=true \
+ -Dwith_support=true \
+ -Dwith_symbol-tree=true \
+ -Dwith_sysmon=true \
+ -Dwith_terminal=true \
+ -Dwith_todo=true \
+ -Dwith_vala-pack=true \
+ -Dwith_xml-pack=true \
$(CLANG_PLUGIN) \
$(FLATPAK_PLUGIN) \
$(SYSPROF_PLUGIN) \
@@ -111,10 +113,14 @@
dh_install -Xgtk-doc -Xpkgconfig -Xgir-1.0 -Xusr/share/doc/gnome-builder/html
override_dh_missing:
- dh_missing --fail-missing
+ # see debian/not-installed and bgo#758266 + #804769
+ dh_missing --fail-missing -Xpkgconfig
override_dh_makeshlibs:
dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-builder
+
+override_dh_shlibdeps:
+ LD_LIBRARY_PATH="debian/gnome-builder/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-builder/" dh_shlibdeps
override_dh_girepository:
dh_girepository -ldebian/tmp/usr/share/gnome-builder/gir-1.0 \
More information about the pkg-gnome-commits
mailing list