callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Require e-d-s >= 3.4.

Browse Source 
* Bump to debhelper compatibility v9.
* Replace hardening-includes.mk with buildflags.mk, and adjust rules
  to currently recommended practice.

git-svn-id: file:///svn/pkg-evolution/experimental/evolution@2177 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Jordi Mallach
2012-05-18 12:56:17 +00:00
parent 23e9ff089a
commit 77efcdf366
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -13,13 +13,17 @@ evolution (3.4.1-1) experimental; urgency=low
* Build-Depend on libchamplain-0.12-dev and enable the contacts map * Build-Depend on libchamplain-0.12-dev and enable the contacts map
plugin again. plugin again.
* evo-addressbook-clean is gone, adjust .install file accordingly. * evo-addressbook-clean is gone, adjust .install file accordingly.
* Require e-d-s >= 3.4.
* Format NEWS file just like lintian likes it. * Format NEWS file just like lintian likes it.
* Remove obsolete lintian overrides. * Remove obsolete lintian overrides.
* Replace manual dh_bugfiles call with a bump to cdbs (>= 0.4.90). * Replace manual dh_bugfiles call with a bump to cdbs (>= 0.4.90).
* Update Standards-Version to 3.9.3, with no changes needed. * Update Standards-Version to 3.9.3, with no changes needed.
* Replace evolution.gconf-defaults with equivalent * Replace evolution.gconf-defaults with equivalent
evolution-common.gsettings-override file. evolution-common.gsettings-override file.
* Bump to debhelper compatibility v9.
* Strip leading debian/tmp/ from .install files. * Strip leading debian/tmp/ from .install files.
* Replace hardening-includes.mk with buildflags.mk, and adjust rules
to currently recommended practice.
-- Jordi Mallach <jordi@debian.org> Thu, 17 May 2012 23:05:13 +0200 -- Jordi Mallach <jordi@debian.org> Thu, 17 May 2012 23:05:13 +0200

2
debian/compat vendored
View File

@ -1 +1 @@
5 9

7
debian/control vendored
View File

@ -15,11 +15,10 @@ Dm-Upload-Allowed: yes
Homepage: http://projects.gnome.org/evolution/ Homepage: http://projects.gnome.org/evolution/
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-evolution/unstable/evolution Vcs-Svn: svn://anonscm.debian.org/svn/pkg-evolution/unstable/evolution
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-evolution/unstable/evolution
Build-Depends: debhelper (>= 7.2.3~), Build-Depends: debhelper (>= 9),
cdbs (>= 0.4.90), cdbs (>= 0.4.90),
dh-autoreconf, dh-autoreconf,
dpkg-dev (>= 1.16.1), dpkg-dev (>= 1.16.1),
hardening-includes,
libglib2.0-dev (>= 2.30), libglib2.0-dev (>= 2.30),
libgtk-3-dev (>= 3.2.0), libgtk-3-dev (>= 3.2.0),
libgail-3-dev (>= 3.0.2), libgail-3-dev (>= 3.0.2),
@ -78,8 +77,8 @@ Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
evolution-common (= ${source:Version}), evolution-common (= ${source:Version}),
evolution-data-server (>= 3.2), evolution-data-server (>= 3.4),
evolution-data-server (<< 3.3), evolution-data-server (<< 3.5),
gnome-icon-theme (>= 2.30.2.1), gnome-icon-theme (>= 2.30.2.1),
dbus, dbus,
psmisc psmisc

4
debian/rules vendored
View File

@ -8,7 +8,6 @@ include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/hardening-includes/hardening.make
ELIBDIR := usr/lib/evolution/3.4 ELIBDIR := usr/lib/evolution/3.4
@ -18,7 +17,8 @@ DEB_DH_MAKESHLIBS_ARGS_evolution += -V
DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow export DEB_BUILD_MAINT_OPTIONS=hardening=+all
include /usr/share/dpkg/buildflags.mk
DEB_REVISION := $(shell echo $(DEB_VERSION) | awk -F- '{ print $$NF }') DEB_REVISION := $(shell echo $(DEB_VERSION) | awk -F- '{ print $$NF }')