r54459 - in /packages/unstable/meld/debian: changelog compat control control.in docs rules
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Sun Oct 15 18:23:22 UTC 2017
Author: jbicha
Date: Sun Oct 15 18:23:22 2017
New Revision: 54459
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54459
Log:
Switch from cdbs to dh and pybuild
Added:
packages/unstable/meld/debian/docs
Modified:
packages/unstable/meld/debian/changelog
packages/unstable/meld/debian/compat
packages/unstable/meld/debian/control
packages/unstable/meld/debian/control.in
packages/unstable/meld/debian/rules
Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=54459&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog [utf-8] (original)
+++ packages/unstable/meld/debian/changelog [utf-8] Sun Oct 15 18:23:22 2017
@@ -1,7 +1,12 @@
meld (3.18.0-2) UNRELEASED; urgency=medium
+ [ Balint Reczey ]
* Drop excessive spaces and unsupported version control systems from
description (Closes: #878120)
+
+ [ Jeremy Bicha ]
+ * Switch from cdbs to dh and pybuild
+ * Bump debhelper compat to 10
-- Balint Reczey <rbalint at ubuntu.com> Tue, 10 Oct 2017 10:29:28 +0200
Modified: packages/unstable/meld/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/compat?rev=54459&op=diff
==============================================================================
--- packages/unstable/meld/debian/compat [utf-8] (original)
+++ packages/unstable/meld/debian/compat [utf-8] Sun Oct 15 18:23:22 2017
@@ -1 +1 @@
-9
+10
Modified: packages/unstable/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control?rev=54459&op=diff
==============================================================================
--- packages/unstable/meld/debian/control [utf-8] (original)
+++ packages/unstable/meld/debian/control [utf-8] Sun Oct 15 18:23:22 2017
@@ -6,8 +6,7 @@
Section: gnome
Priority: optional
Maintainer: Balint Reczey <rbalint at ubuntu.com>
-Build-Depends: debhelper (>= 9),
- cdbs (>= 0.4.90~),
+Build-Depends: debhelper (>= 10),
python3 (>=3.3~),
dh-python,
itstool,
@@ -15,12 +14,12 @@
gnome-pkg-tools
Build-Depends-Indep: intltool,
scrollkeeper
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Ross Burton <ross at debian.org>
Standards-Version: 3.9.8
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/meld
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/meld/
Homepage: http://meldmerge.org
-X-Python-Version: >= 3.3
+X-Python3-Version: >= 3.3
Package: meld
Architecture: all
@@ -35,8 +34,8 @@
patch
Recommends: yelp
Description: graphical tool to diff and merge files
- Meld is a graphical diff viewer and merge application for the GNOME
- desktop. It supports 2 and 3-file diffs, recursive directory diffs,
- diffing of directories under version control (Bazaar, Git, Mercurial,
- Subversion), as well as the ability to manually and automatically
- merge file differences.
+ Meld is a graphical diff viewer and merge application for the GNOME
+ desktop. It supports 2 and 3-file diffs, recursive directory diffs,
+ diffing of directories under version control (Bazaar, Codeville, CVS,
+ Darcs, Fossil SCM, Git, Mercurial, Monotone, Subversion), as well as
+ the ability to manually and automatically merge file differences.
Modified: packages/unstable/meld/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/control.in?rev=54459&op=diff
==============================================================================
--- packages/unstable/meld/debian/control.in [utf-8] (original)
+++ packages/unstable/meld/debian/control.in [utf-8] Sun Oct 15 18:23:22 2017
@@ -2,8 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Balint Reczey <rbalint at ubuntu.com>
-Build-Depends: debhelper (>= 9),
- cdbs (>= 0.4.90~),
+Build-Depends: debhelper (>= 10),
python3 (>=3.3~),
dh-python,
itstool,
@@ -16,7 +15,7 @@
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/meld
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/meld/
Homepage: http://meldmerge.org
-X-Python-Version: >= 3.3
+X-Python3-Version: >= 3.3
Package: meld
Architecture: all
Added: packages/unstable/meld/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/docs?rev=54459&op=file
==============================================================================
--- packages/unstable/meld/debian/docs (added)
+++ packages/unstable/meld/debian/docs [utf-8] Sun Oct 15 18:23:22 2017
@@ -0,0 +1,2 @@
+NEWS
+README
Modified: packages/unstable/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/rules?rev=54459&op=diff
==============================================================================
--- packages/unstable/meld/debian/rules [utf-8] (original)
+++ packages/unstable/meld/debian/rules [utf-8] Sun Oct 15 18:23:22 2017
@@ -1,15 +1,12 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-DEB_PYTHON3_MODULE_PACKAGES=meld
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+export PYBUILD_NAME=meld
-binary-post-install/meld::
- rm -rf debian/$(cdbs_curpkg)/usr/share/doc/meld-* \
- debian/$(cdbs_curpkg)/usr/share/meld/icons/COPYING \
- debian/$(cdbs_curpkg)/usr/share/pyshared/meld/vc/COPYING \
- debian/$(cdbs_curpkg)/usr/lib/python*/dist-packages/meld/vc/COPYING
+%:
+ dh $@ --with gnome,python3 --buildsystem=pybuild
+override_dh_install:
+ find debian/meld -name 'COPYING' -delete
+ rm -rf debian/meld/usr/share/doc/meld-*
+ dh_install
More information about the pkg-gnome-commits
mailing list