r36926 - in /desktop/experimental/gedit/debian: changelog control control.in patches/01_gedit-bugreport-location.patch rules
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Fri Mar 8 22:33:37 UTC 2013
Author: jbicha-guest
Date: Fri Mar 8 22:33:37 2013
New Revision: 36926
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36926
Log:
* Merge with Ubuntu
* New upstream release.
* debian/control:
- Use standards version 3.9.4
- Bump build-depends on libglib2.0-dev, libgtk-3-dev, libpeas-dev, and
libgtksourceview-3.0-dev
* debian/control.in, debian/rules:
- Use Python 3
* debian/patches/01_gedit-bugreport-location.patch: Refreshed
Modified:
desktop/experimental/gedit/debian/changelog
desktop/experimental/gedit/debian/control
desktop/experimental/gedit/debian/control.in
desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
desktop/experimental/gedit/debian/rules
Modified: desktop/experimental/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/changelog?rev=36926&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/changelog [utf-8] (original)
+++ desktop/experimental/gedit/debian/changelog [utf-8] Fri Mar 8 22:33:37 2013
@@ -1,3 +1,17 @@
+gedit (3.7.5-1) UNRELEASED; urgency=low
+
+ * Merge with Ubuntu
+ * New upstream release.
+ * debian/control:
+ - Use standards version 3.9.4
+ - Bump build-depends on libglib2.0-dev, libgtk-3-dev, libpeas-dev, and
+ libgtksourceview-3.0-dev
+ * debian/control.in, debian/rules:
+ - Use Python 3
+ * debian/patches/01_gedit-bugreport-location.patch: Refreshed
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Fri, 08 Mar 2013 17:32:09 -0500
+
gedit (3.6.2-1) experimental; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control?rev=36926&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control [utf-8] (original)
+++ desktop/experimental/gedit/debian/control [utf-8] Fri Mar 8 22:33:37 2013
@@ -2,12 +2,11 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: gedit
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
Build-Depends: cdbs (>= 0.4.90),
debhelper (>= 8),
gnome-pkg-tools (>= 0.10),
@@ -21,12 +20,12 @@
libsm-dev (>= 2:1.0),
libice-dev,
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.28.0),
- libgtk-3-dev (>= 3.6.0),
- libgtksourceview-3.0-dev (>= 3.0.0),
- libpeas-dev (>= 1.1.0),
+ libglib2.0-dev (>= 2.35.4),
+ libgtk-3-dev (>= 3.7.10),
+ libgtksourceview-3.0-dev (>= 3.2.0),
+ libpeas-dev (>= 1.7.0),
libx11-dev,
- python-dev (>= 2.6.6-3~),
+ python3-dev (>= 3.2.3),
python-gi-dev (>= 3.0.0),
yelp-tools,
gobject-introspection,
@@ -34,8 +33,7 @@
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc,
libgtksourceview-3.0-doc
-Standards-Version: 3.9.3
-X-Python-Version: >= 2.5
+Standards-Version: 3.9.4
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gedit/
Homepage: http://www.gnome.org/projects/gedit/
@@ -43,13 +41,13 @@
Package: gedit
Architecture: any
Depends: ${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends},
${gir:Depends},
gedit-common (>= ${gnome:Version}),
gedit-common (<< ${gnome:NextVersion}),
gsettings-desktop-schemas,
- python-gi (>= 3.0),
+ python3-gi (>= 3.0),
python-gi-cairo (>= 3.0),
gir1.2-peas-1.0,
iso-codes
Modified: desktop/experimental/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control.in?rev=36926&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control.in [utf-8] (original)
+++ desktop/experimental/gedit/debian/control.in [utf-8] Fri Mar 8 22:33:37 2013
@@ -16,12 +16,12 @@
libsm-dev (>= 2:1.0),
libice-dev,
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.28.0),
- libgtk-3-dev (>= 3.6.0),
- libgtksourceview-3.0-dev (>= 3.0.0),
- libpeas-dev (>= 1.1.0),
+ libglib2.0-dev (>= 2.35.4),
+ libgtk-3-dev (>= 3.7.10),
+ libgtksourceview-3.0-dev (>= 3.2.0),
+ libpeas-dev (>= 1.7.0),
libx11-dev,
- python-dev (>= 2.6.6-3~),
+ python3-dev (>= 3.2.3),
python-gi-dev (>= 3.0.0),
yelp-tools,
gobject-introspection,
@@ -29,8 +29,7 @@
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc,
libgtksourceview-3.0-doc
-Standards-Version: 3.9.3
-X-Python-Version: >= 2.5
+Standards-Version: 3.9.4
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gedit/
Homepage: http://www.gnome.org/projects/gedit/
@@ -38,13 +37,13 @@
Package: gedit
Architecture: any
Depends: ${misc:Depends},
- ${python:Depends},
+ ${python3:Depends},
${shlibs:Depends},
${gir:Depends},
gedit-common (>= ${gnome:Version}),
gedit-common (<< ${gnome:NextVersion}),
gsettings-desktop-schemas,
- python-gi (>= 3.0),
+ python3-gi (>= 3.0),
python-gi-cairo (>= 3.0),
gir1.2-peas-1.0,
iso-codes
Modified: desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch?rev=36926&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch [utf-8] Fri Mar 8 22:33:37 2013
@@ -7,5 +7,5 @@
-X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit/gedit-bugreport.sh
+X-GNOME-Bugzilla-ExtraInfoScript=@prefix@/share/gedit/gedit-bugreport
Actions=Window;Document;
- _Keywords=Text;
+ _Keywords=Text;Editor;
Modified: desktop/experimental/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/rules?rev=36926&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/rules [utf-8] (original)
+++ desktop/experimental/gedit/debian/rules [utf-8] Fri Mar 8 22:33:37 2013
@@ -8,13 +8,13 @@
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_PYTHON2_MODULE_PACKAGES = gedit
+DEB_PYTHON3_MODULE_PACKAGES = gedit
binary-install/gedit::
cd debian/gedit/usr/share/gedit && mv gedit-bugreport.sh gedit-bugreport
chmod 755 debian/gedit/usr/share/bug/gedit/script
- dh_python2 -pgedit
- dh_python2 -pgedit /usr/lib/gedit/plugins
+ dh_python3 -pgedit
+ dh_python3 -pgedit /usr/lib/gedit/plugins
LDFLAGS += -Wl,-O1 -Wl,--as-needed
More information about the pkg-gnome-commits
mailing list