r51879 - in /packages/unstable/balsa/debian: balsa.install changelog compat control control.in patches/ rules

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Thu Jan 5 15:59:11 UTC 2017


Author: bigon
Date: Thu Jan  5 15:59:10 2017
New Revision: 51879

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51879
Log:
* New Major upstream release:
  - Use GTK+3 instead of GTK+2 and old GNOME2 libs
  - Use libsecret instead of gnome-keyring directly
  - Use GSpell instead of GTKSpell
  - Use Webkit2GTK instead of WebkitGTK
  - No more deprecated GNOME macro's in the configure (Closes: #829850)
* debian/control.in:
  - Drop cdbs build-dependency, we are using dh7 sequences now
  - Bump debhelper build-dependency
  - Bump Standards-Version to 3.9.8 (no further changes)
  - Adjusts build-dependencies
  - Bump ca-certificates to recommends
  - Add python3-html2text to the recommends and build-dependencies, this is
    needed to quote HTML only mails
  - Drop gnome-icon-theme, not needed anymore with GTK3 applications
  - Add pinentry-gnome3 | pinentry-x11 to the dependencies (Closes: #464818)
  - Build-depends against libssl1.0-dev instead of libssl-dev
  - Drop balsa-dbg package and rely on the automatically build one.
* debian/rules:
  - Switch to dh7 sequences
  - Drop deprecated configure flags
  - Build with the S/MIME support
  - Build with GSpell instead of GTKSpell
  - Build with webkit2 instead of webkit
  - Do not override GTK_UPDATE_ICON_CACHE anymore, upstream build system is
    not calling it anymore
  - Pass --as-needed to dh_autoreconf
  - Enable all hardening flags
* debian/compat: Bump debhelper compatibility to 9 
* Drop debian/patches/99_ltmain_as-needed.patch and pass --as-needed to
  dh_autoreconf instead

Removed:
    packages/unstable/balsa/debian/balsa.install
    packages/unstable/balsa/debian/patches/
Modified:
    packages/unstable/balsa/debian/changelog
    packages/unstable/balsa/debian/compat
    packages/unstable/balsa/debian/control
    packages/unstable/balsa/debian/control.in
    packages/unstable/balsa/debian/rules

Modified: packages/unstable/balsa/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/changelog?rev=51879&op=diff
==============================================================================
--- packages/unstable/balsa/debian/changelog	[utf-8] (original)
+++ packages/unstable/balsa/debian/changelog	[utf-8] Thu Jan  5 15:59:10 2017
@@ -1,8 +1,42 @@
-balsa (2.4.12-4) UNRELEASED; urgency=medium
-
+balsa (2.5.3-1) UNRELEASED; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
   * Switch libgpgme11-dev build-dependency to libgpgme-dev.
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 05 Dec 2016 18:53:31 +0100
+  [ Laurent Bigonville ]
+  * New Major upstream release:
+    - Use GTK+3 instead of GTK+2 and old GNOME2 libs
+    - Use libsecret instead of gnome-keyring directly
+    - Use GSpell instead of GTKSpell
+    - Use Webkit2GTK instead of WebkitGTK
+    - No more deprecated GNOME macro's in the configure (Closes: #829850)
+  * debian/control.in:
+    - Drop cdbs build-dependency, we are using dh7 sequences now
+    - Bump debhelper build-dependency
+    - Bump Standards-Version to 3.9.8 (no further changes)
+    - Adjusts build-dependencies
+    - Bump ca-certificates to recommends
+    - Add python3-html2text to the recommends and build-dependencies, this is
+      needed to quote HTML only mails
+    - Drop gnome-icon-theme, not needed anymore with GTK3 applications
+    - Add pinentry-gnome3 | pinentry-x11 to the dependencies (Closes: #464818)
+    - Build-depends against libssl1.0-dev instead of libssl-dev
+    - Drop balsa-dbg package and rely on the automatically build one.
+  * debian/rules:
+    - Switch to dh7 sequences
+    - Drop deprecated configure flags
+    - Build with the S/MIME support
+    - Build with GSpell instead of GTKSpell
+    - Build with webkit2 instead of webkit
+    - Do not override GTK_UPDATE_ICON_CACHE anymore, upstream build system is
+      not calling it anymore
+    - Pass --as-needed to dh_autoreconf
+    - Enable all hardening flags
+  * debian/compat: Bump debhelper compatibility to 9 
+  * Drop debian/patches/99_ltmain_as-needed.patch and pass --as-needed to
+    dh_autoreconf instead
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 05 Jan 2017 16:29:50 +0100
 
 balsa (2.4.12-3) unstable; urgency=medium
 

Modified: packages/unstable/balsa/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/compat?rev=51879&op=diff
==============================================================================
--- packages/unstable/balsa/debian/compat	[utf-8] (original)
+++ packages/unstable/balsa/debian/compat	[utf-8] Thu Jan  5 15:59:10 2017
@@ -1 +1 @@
-5
+9

Modified: packages/unstable/balsa/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/control?rev=51879&op=diff
==============================================================================
--- packages/unstable/balsa/debian/control	[utf-8] (original)
+++ packages/unstable/balsa/debian/control	[utf-8] Thu Jan  5 15:59:10 2017
@@ -6,42 +6,33 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Build-Depends: autotools-dev,
-               cdbs (>= 0.4.37),
-               debhelper (>= 5.0),
+Build-Depends: debhelper (>= 9.20160114~),
                dh-autoreconf,
                gnome-pkg-tools,
-               gnome-icon-theme,
-               rarian-compat,
+               pkg-config,
                libesmtp-dev,
                libgmime-2.6-dev,
-               libnm-glib-dev [linux-any],
                libcompfaceg1-dev,
                libgpgme-dev,
-               libgtkspell-dev,
+               libgspell-1-dev,
                libkrb5-dev,
                libldap2-dev,
-               libltdl-dev,
-               libpcre3-dev,
-               libpspell-dev (>= 0.50),
-               libsqlite3-dev,
-               libssl-dev (>= 0.9.8),
-               libxml-parser-perl,
-               libgtksourceview2.0-dev,
-               libgnome2-dev,
-               libgnomeui-dev,
-               libunique-dev,
-               libglib2.0-dev (>= 2.16.0),
-               libgtk2.0-dev (>= 2.18.0),
-               liborbit2-dev,
+               libsqlite3-dev (>= 2.8),
+               libssl1.0-dev (>= 0.9.8),
+               libgtksourceview-3.0-dev (>= 3.2.0),
+               libglib2.0-dev (>= 2.40.0),
+               libgtk-3-dev (>= 3.10.0),
                libnotify-dev,
-               libwebkitgtk-dev,
+               libwebkit2gtk-4.0-dev,
                libxml2-dev,
                intltool,
-               libcanberra-gtk-dev,
-               gnome-doc-utils
-Uploaders: Alan Baghumian <alan at technotux.org>, Alberto Garcia <berto at igalia.com>, Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Standards-Version: 3.9.3
+               libcanberra-gtk3-dev,
+               yelp-tools,
+               zlib1g-dev,
+               libsecret-1-dev,
+               python3-html2text,
+Uploaders: Alan Baghumian <alan at technotux.org>, Alberto Garcia <berto at igalia.com>, Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Loic Minier <lool at dooz.org>, Michael Biebl <biebl at debian.org>
+Standards-Version: 3.9.8
 Homepage: https://pawsa.fedorapeople.org/balsa/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/balsa/
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/balsa/
@@ -51,11 +42,10 @@
 Provides: mail-reader, imap-client
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gnome-icon-theme
-Recommends: aspell | ispell,
-            yelp
-Suggests: ca-certificates,
-          lbdb
+         pinentry-gnome3 | pinentry-x11
+Recommends: yelp,
+            ca-certificates,
+            python3-html2text, gpgsm
 Description: e-mail client for GNOME
  Balsa is a highly configurable and robust mail client for the GNOME desktop.
  It supports both POP3 and IMAP servers as well as the mbox, maildir and mh
@@ -74,17 +64,3 @@
    * GPG/OpenPGP mail signing and encryption
  .
  Support for Kerberos and SSL has been enabled in this package.
-
-Package: balsa-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: balsa (= ${binary:Version}),
-         ${misc:Depends}
-Description: e-mail client for GNOME - debugging symbols
- Balsa is a highly configurable and robust mail client for the GNOME desktop.
- It supports both POP3 and IMAP servers as well as the mbox, maildir and mh
- local mailbox formats. Balsa also supports SMTP and/or the use of a local MTA
- such as Sendmail.
- .
- This package contains the debugging symbols for balsa.

Modified: packages/unstable/balsa/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/control.in?rev=51879&op=diff
==============================================================================
--- packages/unstable/balsa/debian/control.in	[utf-8] (original)
+++ packages/unstable/balsa/debian/control.in	[utf-8] Thu Jan  5 15:59:10 2017
@@ -2,42 +2,33 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Build-Depends: autotools-dev,
-               cdbs (>= 0.4.37),
-               debhelper (>= 5.0),
+Build-Depends: debhelper (>= 9.20160114~),
                dh-autoreconf,
                gnome-pkg-tools,
-               gnome-icon-theme,
-               rarian-compat,
+               pkg-config,
                libesmtp-dev,
                libgmime-2.6-dev,
-               libnm-glib-dev [linux-any],
                libcompfaceg1-dev,
                libgpgme-dev,
-               libgtkspell-dev,
+               libgspell-1-dev,
                libkrb5-dev,
                libldap2-dev,
-               libltdl-dev,
-               libpcre3-dev,
-               libpspell-dev (>= 0.50),
-               libsqlite3-dev,
-               libssl-dev (>= 0.9.8),
-               libxml-parser-perl,
-               libgtksourceview2.0-dev,
-               libgnome2-dev,
-               libgnomeui-dev,
-               libunique-dev,
-               libglib2.0-dev (>= 2.16.0),
-               libgtk2.0-dev (>= 2.18.0),
-               liborbit2-dev,
+               libsqlite3-dev (>= 2.8),
+               libssl1.0-dev (>= 0.9.8),
+               libgtksourceview-3.0-dev (>= 3.2.0),
+               libglib2.0-dev (>= 2.40.0),
+               libgtk-3-dev (>= 3.10.0),
                libnotify-dev,
-               libwebkitgtk-dev,
+               libwebkit2gtk-4.0-dev,
                libxml2-dev,
                intltool,
-               libcanberra-gtk-dev,
-               gnome-doc-utils
+               libcanberra-gtk3-dev,
+               yelp-tools,
+               zlib1g-dev,
+               libsecret-1-dev,
+               python3-html2text,
 Uploaders: Alan Baghumian <alan at technotux.org>, @GNOME_TEAM@
-Standards-Version: 3.9.3
+Standards-Version: 3.9.8
 Homepage: https://pawsa.fedorapeople.org/balsa/
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/balsa/
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/balsa/
@@ -47,11 +38,10 @@
 Provides: mail-reader, imap-client
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gnome-icon-theme
-Recommends: aspell | ispell,
-            yelp
-Suggests: ca-certificates,
-          lbdb
+         pinentry-gnome3 | pinentry-x11
+Recommends: yelp,
+            ca-certificates,
+            python3-html2text, gpgsm
 Description: e-mail client for GNOME
  Balsa is a highly configurable and robust mail client for the GNOME desktop.
  It supports both POP3 and IMAP servers as well as the mbox, maildir and mh
@@ -70,17 +60,3 @@
    * GPG/OpenPGP mail signing and encryption
  .
  Support for Kerberos and SSL has been enabled in this package.
-
-Package: balsa-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: balsa (= ${binary:Version}),
-         ${misc:Depends}
-Description: e-mail client for GNOME - debugging symbols
- Balsa is a highly configurable and robust mail client for the GNOME desktop.
- It supports both POP3 and IMAP servers as well as the mbox, maildir and mh
- local mailbox formats. Balsa also supports SMTP and/or the use of a local MTA
- such as Sendmail.
- .
- This package contains the debugging symbols for balsa.

Modified: packages/unstable/balsa/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/balsa/debian/rules?rev=51879&op=diff
==============================================================================
--- packages/unstable/balsa/debian/rules	[utf-8] (original)
+++ packages/unstable/balsa/debian/rules	[utf-8] Thu Jan  5 15:59:10 2017
@@ -2,41 +2,38 @@
 
 GNOME_DOWNLOAD_URL = http://pawsa.fedorapeople.org/balsa/$(GNOME_TARBALL)
 TARBALL_EXT := tar.bz2
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols, and speed up loading.
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --with gnome,autoreconf
 
 # Compile options
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-smime \
-			--with-compface \
+override_dh_auto_configure:
+	dh_auto_configure -- --with-compface \
 			--with-gpgme \
 			--with-gss \
-			--with-gtkspell \
+			--with-spell-checker=gspell \
 			--with-ldap \
 			--with-sqlite \
-			--with-ssl \
-			--with-gtksourceview=2 \
+			--with-gtksourceview \
 			--enable-extra-mimeicons \
 			--with-libnotify \
 			--with-rubrica \
 			--with-canberra \
-			--with-unique \
-			--enable-threads \
-			--with-html-widget=webkit
+			--with-libsecret \
+			--with-gnome \
+			--with-html-widget=webkit2
 
-ifneq ($(DEB_BUILD_ARCH_OS),linux)
-  DEB_CONFIGURE_EXTRA_FLAGS += --without-nm
-endif
-
-DEB_CONFIGURE_SCRIPT_ENV += GTK_UPDATE_ICON_CACHE=/bin/true
+override_dh_strip:
+	dh_strip --dbgsym-migration='balsa-dbg (<< 2.5.3-1)'
 
 # Ensure that .gmo files are gone before package building
-cleanbuilddir/balsa::
+override_dh_clean:
+	dh_clean
 	rm -f po/*.gmo
 	rm -f balsa.desktop




More information about the pkg-gnome-commits mailing list