=== modified file 'debian/anjuta.install' --- debian/anjuta.install 2016-09-22 16:11:20 +0000 +++ debian/anjuta.install 2016-09-22 16:11:28 +0000 @@ -1,9 +1,9 @@ usr/share/man usr/share/doc usr/bin -usr/lib/anjuta/*.plugin -usr/lib/anjuta/*.py -usr/lib/anjuta/*.so +usr/lib/*/anjuta/*.plugin +usr/lib/*/anjuta/*.py +usr/lib/*/anjuta/*.so usr/share/appdata usr/share/applications usr/lib/glade/modules/*.so === modified file 'debian/changelog' --- debian/changelog 2016-09-22 16:11:20 +0000 +++ debian/changelog 2016-09-22 16:13:20 +0000 @@ -1,3 +1,28 @@ +anjuta (2:3.22.0-1ubuntu1) UNRELEASED; urgency=medium + + * Sync with Debian (LP: #1626636) + * Lower vala dependency to 0.32 since Ubuntu doesn't have 0.34 yet + + -- Jeremy Bicha Thu, 22 Sep 2016 12:11:51 -0400 + +anjuta (2:3.22.0-1) unstable; urgency=medium + + [ Andreas Henriksson ] + * Bump Standards-Version to 3.9.8 + + [ Michael Biebl ] + * New upstream release. + * Drop debian/patches/workaround_python_config_bug.patch, no longer needed. + * Build against vala 0.34. + * Convert from cdbs to dh. + * Bump debhelper compat level to 10. + * Drop anjuta-dbg and switch to automatich dbgsym packages. + * Add Build-Depends on gnome-common, required by autoreconf. + (Closes: #837818) + * Convert library packages to multiarch. + + -- Michael Biebl Wed, 21 Sep 2016 18:00:52 +0200 + anjuta (2:3.20.0-1) unstable; urgency=medium * New upstream release. === modified file 'debian/compat' --- debian/compat 2016-09-22 16:11:20 +0000 +++ debian/compat 2016-09-22 16:11:28 +0000 @@ -1,1 +1,1 @@ -9 +10 === modified file 'debian/control' --- debian/control 2016-09-22 16:11:20 +0000 +++ debian/control 2016-09-22 16:14:34 +0000 @@ -7,11 +7,10 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Michael Biebl -Build-Depends: debhelper (>= 9), - cdbs (>= 0.4.90), - dh-autoreconf, +Build-Depends: debhelper (>= 10), flex, bison, + gnome-common, gnome-pkg-tools (>= 0.11), libglib2.0-dev (>= 2.34.0), libgtk-3-dev (>= 3.10.0), @@ -37,7 +36,7 @@ python-dev Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/anjuta Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/anjuta Homepage: http://www.anjuta.org/ @@ -72,6 +71,7 @@ Package: anjuta-common Architecture: all +Multi-Arch: foreign Section: devel Suggests: anjuta Depends: ${misc:Depends}, @@ -86,6 +86,7 @@ Package: libanjuta-3-0 Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -100,6 +101,7 @@ Package: libanjuta-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libanjuta-3-0 (= ${binary:Version}), gir1.2-anjuta-3.0 (= ${binary:Version}), @@ -114,22 +116,9 @@ . This package provides the development files for Anjuta. -Package: anjuta-dbg -Architecture: any -Section: debug -Priority: extra -Depends: anjuta (= ${binary:Version}), - ${misc:Depends} -Description: GNOME development IDE, for C/C++ - debug files - This IDE for C/C++ and GNOME/Gtk+ applications has features that enable easy - debugging, management of code and GUI design by providing a simple and - usable user interface. It also integrates with version control systems - like CVS, Git or Subversion. - . - This package provides the debug files for Anjuta. - Package: gir1.2-anjuta-3.0 Architecture: any +Multi-Arch: same Section: introspection Depends: ${gir:Depends}, ${misc:Depends} === modified file 'debian/control.in' --- debian/control.in 2016-09-22 16:11:20 +0000 +++ debian/control.in 2016-09-22 16:14:22 +0000 @@ -3,11 +3,10 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 9), - cdbs (>= 0.4.90), - dh-autoreconf, +Build-Depends: debhelper (>= 10), flex, bison, + gnome-common, gnome-pkg-tools (>= 0.11), libglib2.0-dev (>= 2.34.0), libgtk-3-dev (>= 3.10.0), @@ -33,7 +32,7 @@ python-dev Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/anjuta Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/anjuta Homepage: http://www.anjuta.org/ @@ -68,6 +67,7 @@ Package: anjuta-common Architecture: all +Multi-Arch: foreign Section: devel Suggests: anjuta Depends: ${misc:Depends}, @@ -82,6 +82,7 @@ Package: libanjuta-3-0 Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -96,6 +97,7 @@ Package: libanjuta-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libanjuta-3-0 (= ${binary:Version}), gir1.2-anjuta-3.0 (= ${binary:Version}), @@ -110,22 +112,9 @@ . This package provides the development files for Anjuta. -Package: anjuta-dbg -Architecture: any -Section: debug -Priority: extra -Depends: anjuta (= ${binary:Version}), - ${misc:Depends} -Description: GNOME development IDE, for C/C++ - debug files - This IDE for C/C++ and GNOME/Gtk+ applications has features that enable easy - debugging, management of code and GUI design by providing a simple and - usable user interface. It also integrates with version control systems - like CVS, Git or Subversion. - . - This package provides the debug files for Anjuta. - Package: gir1.2-anjuta-3.0 Architecture: any +Multi-Arch: same Section: introspection Depends: ${gir:Depends}, ${misc:Depends} === modified file 'debian/copyright' --- debian/copyright 2016-09-22 16:11:20 +0000 +++ debian/copyright 2016-09-22 16:11:28 +0000 @@ -1,7 +1,7 @@ This package was debianized by Rob Bradford on Fri, 6 Jul 2001 17:05:47 +0100. -It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/anjuta/ +It was downloaded from https://download.gnome.org/sources/anjuta/ Copyright (C) 2000 Kh. Naba Kumar Singh @@ -23,4 +23,3 @@ On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2'. - === modified file 'debian/gir1.2-anjuta-3.0.install' --- debian/gir1.2-anjuta-3.0.install 2016-09-22 16:11:20 +0000 +++ debian/gir1.2-anjuta-3.0.install 2016-09-22 16:11:28 +0000 @@ -1,1 +1,1 @@ -usr/lib/girepository-1.0/Anjuta-3.0.typelib +usr/lib/*/girepository-1.0/Anjuta-3.0.typelib === modified file 'debian/libanjuta-3-0.install' --- debian/libanjuta-3-0.install 2016-09-22 16:11:20 +0000 +++ debian/libanjuta-3-0.install 2016-09-22 16:11:28 +0000 @@ -1,1 +1,1 @@ -usr/lib/*.so.* +usr/lib/*/*.so.* === modified file 'debian/libanjuta-dev.install' --- debian/libanjuta-dev.install 2016-09-22 16:11:20 +0000 +++ debian/libanjuta-dev.install 2016-09-22 16:11:28 +0000 @@ -1,6 +1,6 @@ usr/include -usr/lib/pkgconfig -usr/lib/*.so +usr/lib/*/pkgconfig +usr/lib/*/*.so usr/share/gtk-doc usr/share/gir-1.0/Anjuta-3.0.gir usr/share/glade === added file 'debian/patches/03_vala-0.34.patch' --- debian/patches/03_vala-0.34.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/03_vala-0.34.patch 2016-09-22 16:11:28 +0000 @@ -0,0 +1,15 @@ +Description: Add support for vala 0.34 +Author: Michael Biebl +Bug: debian/patches/workaround_python_config_bug.patch + +--- anjuta-3.22.0.orig/configure.ac ++++ anjuta-3.22.0/configure.ac +@@ -329,7 +329,7 @@ if test "$user_disabled_vala" = 1; then + else + AC_MSG_RESULT(no) + AC_MSG_CHECKING(if libvala is available) +- m4_foreach([VERSION], [[0.18], [0.20], [0.22], [0.24], [0.26], [0.28], [0.30], [0.32]], ++ m4_foreach([VERSION], [[0.18], [0.20], [0.22], [0.24], [0.26], [0.28], [0.30], [0.32], [0.34]], + [PKG_CHECK_EXISTS([ libvala-VERSION ], + [ valaver="-VERSION" ]) + ]) === modified file 'debian/patches/series' --- debian/patches/series 2016-09-22 16:11:20 +0000 +++ debian/patches/series 2016-09-22 16:11:28 +0000 @@ -1,2 +1,2 @@ 02_no_gnu_gettext.patch -workaround_python_config_bug.patch +03_vala-0.34.patch === removed file 'debian/patches/workaround_python_config_bug.patch' --- debian/patches/workaround_python_config_bug.patch 2016-09-22 16:11:20 +0000 +++ debian/patches/workaround_python_config_bug.patch 1970-01-01 00:00:00 +0000 @@ -1,31 +0,0 @@ ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: anjuta-3.18.0/configure.ac -=================================================================== ---- anjuta-3.18.0.orig/configure.ac 2015-10-07 19:21:51.041957943 +0200 -+++ anjuta-3.18.0/configure.ac 2015-10-07 19:21:51.029957818 +0200 -@@ -362,7 +362,7 @@ - - if test x$have_python = xyes; then - if test -x $PYTHON-config; then -- PYTHON_CFLAGS=`$PYTHON-config --cflags` -+ PYTHON_CFLAGS=`unset CFLAGS; $PYTHON-config --cflags` - PYTHON_LIBS=`$PYTHON-config --libs` - AC_SUBST(PYTHON_CFLAGS) - AC_SUBST(PYTHON_LIBS) -Index: anjuta-3.18.0/configure -=================================================================== ---- anjuta-3.18.0.orig/configure 2015-10-07 19:21:51.041957943 +0200 -+++ anjuta-3.18.0/configure 2015-10-07 19:21:51.037957902 +0200 -@@ -18496,7 +18496,7 @@ - - if test x$have_python = xyes; then - if test -x $PYTHON-config; then -- PYTHON_CFLAGS=`$PYTHON-config --cflags` -+ PYTHON_CFLAGS=`unset CFLAGS; $PYTHON-config --cflags` - PYTHON_LIBS=`$PYTHON-config --libs` - - === modified file 'debian/rules' --- debian/rules 2016-09-22 16:11:20 +0000 +++ debian/rules 2016-09-22 16:11:28 +0000 @@ -1,29 +1,30 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/class/autotools-files.mk -include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -include /usr/share/cdbs/1/rules/autoreconf.mk - -DEB_DH_AUTORECONF_ARGS += --as-needed - -LDFLAGS += -Wl,-O1 -Wl,--as-needed - -DEB_CONFIGURE_EXTRA_FLAGS += --enable-glade-catalog - -DEB_MAKE_CHECK_TARGET := check - -DEB_DH_INSTALLMIME_ARGS += mime/anjuta.xml - -DEB_DH_MAKESHLIBS_ARGS_anjuta += --no-act + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed LIB_PKG := $(shell sed -nr 's/^Package:[[:space:]]*(libanjuta[-0-9]+)[[:space:]]*$$/\1/p' debian/control) -SHVER = 2:3.2.0 -DEB_DH_MAKESHLIBS_ARGS_$(LIB_PKG) = -V '$(LIB_PKG) (>= $(SHVER))' - -install/anjuta:: +SHVER := 2:3.2.0 + +%: + dh $@ --with gir,gnome + +override_dh_autoreconf: + dh_autoreconf --as-needed + +override_dh_auto_configure: + dh_auto_configure -- \ + --enable-glade-catalog + +override_dh_makeshlibs: + dh_makeshlibs -V '$(LIB_PKG) (>= $(SHVER))' + +override_dh_install: rm -f debian/tmp/usr/share/doc/anjuta/INSTALL rm -f debian/tmp/usr/share/doc/anjuta/COPYING rm -f debian/tmp/usr/share/doc/anjuta/ChangeLog + dh_install -X.la --list-missing + +override_dh_strip: + dh_strip --dbgsym-migration='anjuta-dbg (<< 2:3.22.0-1~)' === modified file 'debian/watch' --- debian/watch 2016-09-22 16:11:20 +0000 +++ debian/watch 2016-09-22 16:11:28 +0000 @@ -1,3 +1,3 @@ -version=3 -http://ftp.gnome.org/pub/gnome/sources/anjuta/([\d\.]+[02468])/ \ - anjuta-([\d\.]+)\.tar\.xz +version=4 +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz