diff -Nru libgnome-2.32.1/debian/changelog libgnome-2.32.1/debian/changelog --- libgnome-2.32.1/debian/changelog 2017-09-04 01:28:35.000000000 +0000 +++ libgnome-2.32.1/debian/changelog 2021-05-06 15:10:02.000000000 +0000 @@ -1,16 +1,21 @@ -libgnome (2.32.1-6) unstable; urgency=medium +libgnome (2.32.1-5.3) hirsute; urgency=medium - * Cherry-pick 05_fix_invalid_utf8.patch to fix build with latest glib2.0 - (Closes: #870742) - * Modernize packaging: - - Convert to dh - - Bump debhelper compat to 10 - - Bump Standards-Version to 4.1.0 - - Convert to automatic dbgsym package - - Update package description to mention that this is the deprecated - GNOME 2 library + * Non-maintainer upload. - -- Jeremy Bicha Sun, 03 Sep 2017 21:28:35 -0400 + -- Christopher Hoskin Thu, 06 May 2021 16:10:02 +0100 + +libgnome (2.32.1-5.2) groovy; urgency=medium + + * Non-maintainer upload. + + -- Christopher Hoskin Wed, 05 Aug 2020 11:19:36 +0100 + +libgnome (2.32.1-5.1) focal; urgency=medium + + * Non-maintainer upload. + * Disable gtk-docs for focal build + + -- Christopher Hoskin Wed, 05 Aug 2020 11:19:29 +0100 libgnome (2.32.1-5) unstable; urgency=low diff -Nru libgnome-2.32.1/debian/compat libgnome-2.32.1/debian/compat --- libgnome-2.32.1/debian/compat 2017-09-04 01:26:48.000000000 +0000 +++ libgnome-2.32.1/debian/compat 2011-10-05 08:28:06.000000000 +0000 @@ -1 +1 @@ -10 +8 diff -Nru libgnome-2.32.1/debian/control libgnome-2.32.1/debian/control --- libgnome-2.32.1/debian/control 2017-09-04 01:28:35.000000000 +0000 +++ libgnome-2.32.1/debian/control 2021-05-06 15:10:02.000000000 +0000 @@ -1,14 +1,15 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: libgnome Section: oldlibs Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Emilio Pozuelo Monfort , Jeremy Bicha , Josselin Mouette , Michael Biebl -Standards-Version: 4.1.0 -Build-Depends: debhelper (>= 10), +Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Michael Biebl +Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8.1.3), + dh-autoreconf, libgnomevfs2-dev (>= 2.7.91-3), libbonobo2-dev (>= 2.32.1-3~), libpopt-dev, @@ -16,14 +17,13 @@ libgconf2-dev (>= 2.7.92), libcanberra-dev, libglib2.0-dev (>= 2.16.0), + cdbs (>= 0.4.93~), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), gtk-doc-tools (>= 1.0), gnome-common, docbook-xml -Build-Depends-Indep: libglib2.0-doc -Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/libgnome -Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/attic/libgnome +Build-Depends-Indep: libglib2.0-doc Package: libgnome2-0 Architecture: any @@ -32,7 +32,7 @@ ${shlibs:Depends}, libgnome-2-0 (= ${binary:Version}), libgnome2-bin (= ${binary:Version}) -Description: Deprecated GNOME 2 library - transition package +Description: The GNOME library - transition package This convenience package is for upgrades. Package: libgnome2-bin @@ -42,9 +42,9 @@ ${shlibs:Depends} Breaks: libgnome2-0 (<< 2.32.1-5) Replaces: libgnome2-0 (<< 2.32.1-5) -Description: Deprecated GNOME 2 library - binary files +Description: The GNOME library - binary files This package contains gnome-open, a utility that exposes functionality from - the deprecated GNOME 2 library. + the base GNOME library. Package: libgnome-2-0 Architecture: any @@ -55,8 +55,8 @@ libgnome2-common (= ${source:Version}) Breaks: libgnome2-0 (<< 2.32.1-5) Replaces: libgnome2-0 (<< 2.32.1-5) -Description: Deprecated GNOME 2 library - runtime files - This package contains the shared library for the deprecated GNOME 2 library +Description: The GNOME library - runtime files + This package contains the shared library for the base GNOME library functions. Package: libgnome2-dev @@ -73,9 +73,9 @@ libcanberra-dev, libpopt-dev Suggests: libgnome2-doc -Description: Deprecated GNOME 2 library - development files +Description: The GNOME library - development files This package contains the static library and development headers for - the deprecated GNOME 2 library functions. + the base GNOME library functions. Package: libgnome2-common Architecture: all @@ -83,16 +83,25 @@ Depends: ${misc:Depends} Breaks: gnome-panel (<< 2.28) Suggests: desktop-base (>= 0.3.16) -Description: Deprecated GNOME 2 library - common files - This package contains internationalization files for the deprecated GNOME 2 +Description: The GNOME library - common files + This package contains internationalization files for the base GNOME library functions. Package: libgnome2-doc Architecture: all Section: doc -Build-Profiles: Depends: ${misc:Depends} Suggests: devhelp -Description: Deprecated GNOME 2 library - documentation files - This package contains documentation files for the deprecated GNOME 2 library +Description: The GNOME library - documentation files + This package contains documentation files for the base GNOME library functions. + +Package: libgnome2-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libgnome-2-0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: The GNOME library - debugging symbols + This package contains the debugging symbols. diff -Nru libgnome-2.32.1/debian/control.in libgnome-2.32.1/debian/control.in --- libgnome-2.32.1/debian/control.in 2017-09-04 01:26:48.000000000 +0000 +++ libgnome-2.32.1/debian/control.in 2013-12-27 11:05:47.000000000 +0000 @@ -1,10 +1,11 @@ Source: libgnome Section: oldlibs Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Josselin Mouette Uploaders: @GNOME_TEAM@ -Standards-Version: 4.1.0 -Build-Depends: debhelper (>= 10), +Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 8.1.3), + dh-autoreconf, libgnomevfs2-dev (>= 2.7.91-3), libbonobo2-dev (>= 2.32.1-3~), libpopt-dev, @@ -12,14 +13,13 @@ libgconf2-dev (>= 2.7.92), libcanberra-dev, libglib2.0-dev (>= 2.16.0), + cdbs (>= 0.4.93~), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), gtk-doc-tools (>= 1.0), gnome-common, docbook-xml -Build-Depends-Indep: libglib2.0-doc -Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/attic/libgnome -Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/attic/libgnome +Build-Depends-Indep: libglib2.0-doc Package: libgnome2-0 Architecture: any @@ -28,7 +28,7 @@ ${shlibs:Depends}, libgnome-2-0 (= ${binary:Version}), libgnome2-bin (= ${binary:Version}) -Description: Deprecated GNOME 2 library - transition package +Description: The GNOME library - transition package This convenience package is for upgrades. Package: libgnome2-bin @@ -38,9 +38,9 @@ ${shlibs:Depends} Breaks: libgnome2-0 (<< 2.32.1-5) Replaces: libgnome2-0 (<< 2.32.1-5) -Description: Deprecated GNOME 2 library - binary files +Description: The GNOME library - binary files This package contains gnome-open, a utility that exposes functionality from - the deprecated GNOME 2 library. + the base GNOME library. Package: libgnome-2-0 Architecture: any @@ -51,8 +51,8 @@ libgnome2-common (= ${source:Version}) Breaks: libgnome2-0 (<< 2.32.1-5) Replaces: libgnome2-0 (<< 2.32.1-5) -Description: Deprecated GNOME 2 library - runtime files - This package contains the shared library for the deprecated GNOME 2 library +Description: The GNOME library - runtime files + This package contains the shared library for the base GNOME library functions. Package: libgnome2-dev @@ -69,9 +69,9 @@ libcanberra-dev, libpopt-dev Suggests: libgnome2-doc -Description: Deprecated GNOME 2 library - development files +Description: The GNOME library - development files This package contains the static library and development headers for - the deprecated GNOME 2 library functions. + the base GNOME library functions. Package: libgnome2-common Architecture: all @@ -79,16 +79,25 @@ Depends: ${misc:Depends} Breaks: gnome-panel (<< 2.28) Suggests: desktop-base (>= 0.3.16) -Description: Deprecated GNOME 2 library - common files - This package contains internationalization files for the deprecated GNOME 2 +Description: The GNOME library - common files + This package contains internationalization files for the base GNOME library functions. Package: libgnome2-doc Architecture: all Section: doc -Build-Profiles: Depends: ${misc:Depends} Suggests: devhelp -Description: Deprecated GNOME 2 library - documentation files - This package contains documentation files for the deprecated GNOME 2 library +Description: The GNOME library - documentation files + This package contains documentation files for the base GNOME library functions. + +Package: libgnome2-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libgnome-2-0 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: The GNOME library - debugging symbols + This package contains the debugging symbols. diff -Nru libgnome-2.32.1/debian/copyright libgnome-2.32.1/debian/copyright --- libgnome-2.32.1/debian/copyright 2017-09-04 01:26:48.000000000 +0000 +++ libgnome-2.32.1/debian/copyright 2007-04-11 12:29:45.000000000 +0000 @@ -1,7 +1,7 @@ This package was debianized by Christian Marillat on Mon, 19 Nov 2001 20:15:01 +0100. -It was downloaded from https://download.gnome.org/sources/libgnome +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgnome Copyright: 1998,99,2000,01,2002 Free Software Foundation, Inc. @@ -22,5 +22,5 @@ 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 can be found in `/usr/share/common-licenses/LGPL-2'. +Public License can be found in `/usr/share/common-licenses/LGPL'. diff -Nru libgnome-2.32.1/debian/libgnome-2-0.docs libgnome-2.32.1/debian/libgnome-2-0.docs --- libgnome-2.32.1/debian/libgnome-2-0.docs 2017-09-04 01:26:48.000000000 +0000 +++ libgnome-2.32.1/debian/libgnome-2-0.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -AUTHORS -NEWS -README diff -Nru libgnome-2.32.1/debian/patches/05_fix_invalid_utf8.patch libgnome-2.32.1/debian/patches/05_fix_invalid_utf8.patch --- libgnome-2.32.1/debian/patches/05_fix_invalid_utf8.patch 2017-09-04 00:37:11.000000000 +0000 +++ libgnome-2.32.1/debian/patches/05_fix_invalid_utf8.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Mon, 7 Aug 2017 12:57:43 -0400 -Subject: gnome-config.h: Fix invalid UTF-8 in header - -This breaks the new Python `glib-mkenums`. ---- - libgnome/gnome-config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h -index 0c3dfe6..b9d659d 100644 ---- a/libgnome/gnome-config.h -+++ b/libgnome/gnome-config.h -@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboolean priv); - #define gnome_config_private_clean_key(path) \ - (gnome_config_clean_key_((path),TRUE)) - --/* returns the true filename of the config file */ -+/* returns the true filename of the config file */ - #define gnome_config_get_real_path(path) \ - (g_build_filename (gnome_user_dir_get(),(path),NULL)) - #define gnome_config_private_get_real_path(path) \ diff -Nru libgnome-2.32.1/debian/patches/series libgnome-2.32.1/debian/patches/series --- libgnome-2.32.1/debian/patches/series 2017-09-04 00:37:11.000000000 +0000 +++ libgnome-2.32.1/debian/patches/series 2013-12-27 10:54:05.000000000 +0000 @@ -1,4 +1,3 @@ 02_path_max.patch 03_multiarch.patch 04_disable_deprecated.patch -05_fix_invalid_utf8.patch diff -Nru libgnome-2.32.1/debian/rules libgnome-2.32.1/debian/rules --- libgnome-2.32.1/debian/rules 2017-09-04 01:26:48.000000000 +0000 +++ libgnome-2.32.1/debian/rules 2020-07-25 07:51:53.000000000 +0000 @@ -1,21 +1,24 @@ #!/usr/bin/make -f -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk TARBALL_EXT = tar.bz2 -export DEB_LDFLAGS_MAINT_APPEND := -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -export DEB_CFLAGS_MAINT_APPEND = -include debian.h +include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -%: - dh $@ --with gnome +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -override_dh_auto_configure: - echo '#define MULTIARCH "$(DEB_HOST_MULTIARCH)"' >debian.h - dh_auto_configure -- --enable-gtk-doc +CFLAGS += -include debian.h -override_dh_clean: - dh_clean - rm -f debian.h +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + +makebuilddir:: + echo '#define MULTIARCH "${DEB_HOST_MULTIARCH}"' >debian.h -override_dh_strip: - dh_strip --dbgsym-migration='libgnome2-dbg (<< 2.32.1-6~)' +clean:: + dh_clean intltool-extract intltool-merge intltool-update \ + po/.intltool-merge-cache + rm -f debian.h diff -Nru libgnome-2.32.1/debian/watch libgnome-2.32.1/debian/watch --- libgnome-2.32.1/debian/watch 2017-09-04 01:26:48.000000000 +0000 +++ libgnome-2.32.1/debian/watch 2011-10-06 21:52:32.000000000 +0000 @@ -1,3 +1,3 @@ -version=4 -https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ - @PACKAGE@@ANY_VERSION@\.tar\.bz2 +version=3 +http://ftp.gnome.org/pub/GNOME/sources/libgnome/([\d\.]+[02468])/ \ + libgnome-(.*)\.tar\.bz2