r26755 - in /desktop/experimental/gedit/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Feb 27 16:03:03 UTC 2011
Author: pochu
Date: Sun Feb 27 16:02:57 2011
New Revision: 26755
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26755
Log:
* New upstream release.
+ debian/patches/03_python_path.patch,
debian/patches/04_link_against_libICE.patch,
debian/patches/90_autoreconf.patch:
- Removed, no longer needed.
+ debian/patches/01_gedit-bugreport-location.patch,
debian/patches/99_ltmain_as-needed.patch:
- Refreshed.
+ debian/control.in:
- Update build dependencies and dependencies.
+ debian/rules:
- s/gedit-2/gedit/
+ debian/gedit.dirs:
- Removed, not needed.
Removed:
desktop/experimental/gedit/debian/gedit.dirs
desktop/experimental/gedit/debian/patches/03_python_path.patch
desktop/experimental/gedit/debian/patches/04_link_against_libICE.patch
desktop/experimental/gedit/debian/patches/90_autoreconf.patch
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/patches/99_ltmain_as-needed.patch
desktop/experimental/gedit/debian/patches/series
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=26755&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/changelog [utf-8] (original)
+++ desktop/experimental/gedit/debian/changelog [utf-8] Sun Feb 27 16:02:57 2011
@@ -1,6 +1,23 @@
-gedit (2.30.4-2) UNRELEASED; urgency=low
-
+gedit (2.91.5-1) UNRELEASED; urgency=low
+
+ [ Josselin Mouette ]
* Recommend yelp. Closes: #600055.
+
+ [ Emilio Pozuelo Monfort ]
+ * New upstream release.
+ + debian/patches/03_python_path.patch,
+ debian/patches/04_link_against_libICE.patch,
+ debian/patches/90_autoreconf.patch:
+ - Removed, no longer needed.
+ + debian/patches/01_gedit-bugreport-location.patch,
+ debian/patches/99_ltmain_as-needed.patch:
+ - Refreshed.
+ + debian/control.in:
+ - Update build dependencies and dependencies.
+ + debian/rules:
+ - s/gedit-2/gedit/
+ + debian/gedit.dirs:
+ - Removed, not needed.
-- Josselin Mouette <joss at debian.org> Wed, 13 Oct 2010 10:50:33 +0200
Modified: desktop/experimental/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control?rev=26755&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control [utf-8] (original)
+++ desktop/experimental/gedit/debian/control [utf-8] Sun Feb 27 16:02:57 2011
@@ -20,19 +20,17 @@
iso-codes (>= 0.35),
libsm-dev (>= 2:1.0),
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.23.1),
- libgtk2.0-dev (>= 2.19.0),
- libgtksourceview2.0-dev (>= 2.9.7),
- libgconf2-dev,
+ libglib2.0-dev (>= 2.25.15),
+ libgtk3.0-dev (>= 2.99.1),
+ libgtksourceview-3.0-dev (>= 2.91.1),
+ libpeas-dev (>= 0.7),
libx11-dev,
- python-dev (>= 2.5),
- python-gobject-dev (>= 2.15.4),
- python-gtk2-dev (>= 2.12.0),
- python-gtksourceview2 (>= 2.9.2),
+ python (>= 2.5),
+ gsettings-desktop-schemas-dev,
scrollkeeper
Build-Depends-Indep: libglib2.0-doc,
- libgtk2.0-doc,
- libgtksourceview2.0-doc
+ libgtk3.0-doc,
+ libgtksourceview-3.0-doc
Standards-Version: 3.9.0
XS-Python-Version: >= 2.5
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/
@@ -46,14 +44,9 @@
${shlibs:Depends},
gedit-common (>= ${gnome:Version}),
gedit-common (<< ${gnome:NextVersion}),
- python-gtksourceview2 (>= 2.9.2),
python-gobject (>= 2.15.4),
- python-gtk2 (>= 2.12.0),
+ gsettings-desktop-schemas,
iso-codes
-Replaces: gedit-common (<< 2.16.2-3)
-Conflicts: gedit-common (<= 2.10.5-1)
-Breaks: seahorse (<< 2.24),
- seahorse-plugins (<< 2.26)
Recommends: zenity,
python-gnome2,
yelp
@@ -90,9 +83,7 @@
Section: devel
Depends: ${misc:Depends},
gedit (>= ${gnome:Version}),
- gedit (<< ${gnome:NextVersion}),
- libgtksourceview2.0-dev (>= 2.4.0)
-Replaces: gedit-common (<< 2.16.2-3)
+ gedit (<< ${gnome:NextVersion})
Description: official text editor of the GNOME desktop environment (development files)
gedit is a text editor which supports most standard editor features,
extending this basic functionality with other features not usually
Modified: desktop/experimental/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control.in?rev=26755&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control.in [utf-8] (original)
+++ desktop/experimental/gedit/debian/control.in [utf-8] Sun Feb 27 16:02:57 2011
@@ -15,19 +15,17 @@
iso-codes (>= 0.35),
libsm-dev (>= 2:1.0),
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.23.1),
- libgtk2.0-dev (>= 2.19.0),
- libgtksourceview2.0-dev (>= 2.9.7),
- libgconf2-dev,
+ libglib2.0-dev (>= 2.25.15),
+ libgtk3.0-dev (>= 2.99.1),
+ libgtksourceview-3.0-dev (>= 2.91.1),
+ libpeas-dev (>= 0.7),
libx11-dev,
- python-dev (>= 2.5),
- python-gobject-dev (>= 2.15.4),
- python-gtk2-dev (>= 2.12.0),
- python-gtksourceview2 (>= 2.9.2),
+ python (>= 2.5),
+ gsettings-desktop-schemas-dev,
scrollkeeper
Build-Depends-Indep: libglib2.0-doc,
- libgtk2.0-doc,
- libgtksourceview2.0-doc
+ libgtk3.0-doc,
+ libgtksourceview-3.0-doc
Standards-Version: 3.9.0
XS-Python-Version: >= 2.5
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/
@@ -41,14 +39,9 @@
${shlibs:Depends},
gedit-common (>= ${gnome:Version}),
gedit-common (<< ${gnome:NextVersion}),
- python-gtksourceview2 (>= 2.9.2),
python-gobject (>= 2.15.4),
- python-gtk2 (>= 2.12.0),
+ gsettings-desktop-schemas,
iso-codes
-Replaces: gedit-common (<< 2.16.2-3)
-Conflicts: gedit-common (<= 2.10.5-1)
-Breaks: seahorse (<< 2.24),
- seahorse-plugins (<< 2.26)
Recommends: zenity,
python-gnome2,
yelp
@@ -85,9 +78,7 @@
Section: devel
Depends: ${misc:Depends},
gedit (>= ${gnome:Version}),
- gedit (<< ${gnome:NextVersion}),
- libgtksourceview2.0-dev (>= 2.4.0)
-Replaces: gedit-common (<< 2.16.2-3)
+ gedit (<< ${gnome:NextVersion})
Description: official text editor of the GNOME desktop environment (development files)
gedit is a text editor which supports most standard editor features,
extending this basic functionality with other features not usually
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=26755&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] Sun Feb 27 16:02:57 2011
@@ -4,5 +4,5 @@
X-GNOME-Bugzilla-Product=gedit
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@
--X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit-2/gedit-bugreport.sh
-+X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gedit-2/gedit-bugreport
+-X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit/gedit-bugreport.sh
++X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gedit/gedit-bugreport
Modified: desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.patch?rev=26755&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.patch [utf-8] Sun Feb 27 16:02:57 2011
@@ -1,6 +1,6 @@
--- a/ltmain.sh
+++ b/ltmain.sh
-@@ -4716,6 +4716,11 @@
+@@ -5041,6 +5041,11 @@
arg=$func_stripname_result
;;
@@ -12,7 +12,7 @@
-Wl,*)
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
+@@ -5394,6 +5399,15 @@
lib=
found=no
case $deplib in
Modified: desktop/experimental/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/series?rev=26755&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/series [utf-8] Sun Feb 27 16:02:57 2011
@@ -1,5 +1,2 @@
01_gedit-bugreport-location.patch
-03_python_path.patch
-04_link_against_libICE.patch
-90_autoreconf.patch
99_ltmain_as-needed.patch
Modified: desktop/experimental/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/rules?rev=26755&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/rules [utf-8] (original)
+++ desktop/experimental/gedit/debian/rules [utf-8] Sun Feb 27 16:02:57 2011
@@ -5,12 +5,12 @@
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-version.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
binary-install/gedit::
- cd debian/gedit/usr/share/gedit-2 && mv gedit-bugreport.sh gedit-bugreport
+ cd debian/gedit/usr/share/gedit && mv gedit-bugreport.sh gedit-bugreport
chmod 755 debian/gedit/usr/share/bug/gedit/script
- dh_pysupport -pgedit /usr/lib/gedit-2/plugins
+ dh_pysupport -pgedit /usr/lib/gedit/plugins
LDFLAGS += -Wl,-O1 -Wl,--as-needed
More information about the pkg-gnome-commits
mailing list