r28169 - in /desktop/experimental/gedit: ./ debian/ debian/patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Jun 2 16:35:54 UTC 2011
Author: joss
Date: Thu Jun 2 16:35:53 2011
New Revision: 28169
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28169
Log:
Merge to experimental branch what’s been uploaded to experimental but
committed to unstable.
Removed:
desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.patch
Modified:
desktop/experimental/gedit/ (props changed)
desktop/experimental/gedit/debian/changelog
desktop/experimental/gedit/debian/control
desktop/experimental/gedit/debian/control.in
desktop/experimental/gedit/debian/gedit-common.install
desktop/experimental/gedit/debian/gedit-dev.dirs
desktop/experimental/gedit/debian/gedit-dev.install
desktop/experimental/gedit/debian/gedit.install
desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
desktop/experimental/gedit/debian/patches/series
desktop/experimental/gedit/debian/rules
Propchange: desktop/experimental/gedit/
------------------------------------------------------------------------------
svn:mergeinfo = /desktop/unstable/gedit:27001-28168
Modified: desktop/experimental/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/changelog?rev=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/changelog [utf-8] (original)
+++ desktop/experimental/gedit/debian/changelog [utf-8] Thu Jun 2 16:35:53 2011
@@ -1,28 +1,44 @@
-gedit (2.91.7-1) UNRELEASED; urgency=low
+gedit (3.0.0-2) UNRELEASED; urgency=low
+
+ [ Mirco Bauer ]
+ * Added gir1.2-pango-1.0 and gir1.2-gtksource-3.0 to dependencies as used by
+ pythonconsole, externaltools and snippets plugins.
+
+ [ Emilio Pozuelo Monfort ]
+ * debian/control.in:
+ - Update build dependencies and dependencies.
+ * debian/gedit.dirs:
+ - Removed, not needed.
[ Josselin Mouette ]
+ * 90_autoreconf.patch, 99_ltmain_as-needed.patch: dropped.
+ * Use dh-autoreconf.
+ * Break gedit-plugins < 2.91.
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 12 Apr 2011 22:40:02 +0200
+
+gedit (3.0.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Updated build-dependencies
+ * Added gobject introspection integration
+ * debian/patches/03_python_path.patch
+ debian/patches/04_link_against_libICE.patch
+ debian/patches/10_pt_BR_po.patch:
+ - Dropped obsolete patches
+ * debian/patches/90_autoreconf.patch
+ debian/patches/99_ltmain_as-needed.patch:
+ - Refreshed
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 10 Apr 2011 20:29:56 +0200
+
+gedit (2.30.4-2) unstable; urgency=low
+
* 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 ]
- * Break gedit-plugins < 2.91.
-
- -- Josselin Mouette <joss at debian.org> Wed, 13 Oct 2010 10:50:33 +0200
+ * 10_pt_BR_po.patch: fix an important mistake in the Brazilian
+ Portuguese translation. Closes: #603502.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 24 Jan 2011 21:18:12 +0100
gedit (2.30.4-1) unstable; urgency=low
Modified: desktop/experimental/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control?rev=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control [utf-8] (original)
+++ desktop/experimental/gedit/debian/control [utf-8] Thu Jun 2 16:35:53 2011
@@ -11,24 +11,28 @@
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5.0.37.2),
gnome-pkg-tools (>= 0.10),
+ dh-autoreconf,
autotools-dev,
python-support (>= 0.3),
intltool (>= 0.40.0),
gnome-doc-utils (>= 0.9.0),
+ gsettings-desktop-schemas-dev,
gtk-doc-tools (>= 1.0),
libenchant-dev (>= 1.2.0),
iso-codes (>= 0.35),
libsm-dev (>= 2:1.0),
libice-dev,
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.28),
+ libglib2.0-dev (>= 2.28.0),
libgtk-3-dev (>= 3.0.0),
- libgtksourceview-3.0-dev (>= 2.91.1),
- libpeas-dev (>= 0.7.2),
+ libgtksourceview-3.0-dev (>= 3.0.0),
+ libpeas-dev (>= 0.7.3),
libx11-dev,
libzeitgeist-dev (>= 0.3.2),
- python (>= 2.5),
- gsettings-desktop-schemas-dev,
+ python-dev (>= 2.5),
+ python-gobject-dev (>= 2.28),
+ gobject-introspection,
+ libgirepository1.0-dev (>= 0.9.3),
scrollkeeper
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc,
@@ -46,8 +50,13 @@
${shlibs:Depends},
gedit-common (>= ${gnome:Version}),
gedit-common (<< ${gnome:NextVersion}),
- python-gobject (>= 2.15.4),
gsettings-desktop-schemas,
+ python-gobject (>= 2.28),
+ gir1.2-glib-2.0,
+ gir1.2-peas-1.0,
+ gir1.2-pango-1.0,
+ gir1.2-gtk-3.0,
+ gir1.2-gtksource-3.0,
iso-codes
Recommends: zenity,
python-gnome2,
@@ -86,7 +95,10 @@
Section: devel
Depends: ${misc:Depends},
gedit (>= ${gnome:Version}),
- gedit (<< ${gnome:NextVersion})
+ gedit (<< ${gnome:NextVersion}),
+ libgtksourceview-3.0-dev,
+ libpeas-dev
+Replaces: gedit-common (<< 2.16.2-3)
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=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control.in [utf-8] (original)
+++ desktop/experimental/gedit/debian/control.in [utf-8] Thu Jun 2 16:35:53 2011
@@ -6,24 +6,28 @@
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5.0.37.2),
gnome-pkg-tools (>= 0.10),
+ dh-autoreconf,
autotools-dev,
python-support (>= 0.3),
intltool (>= 0.40.0),
gnome-doc-utils (>= 0.9.0),
+ gsettings-desktop-schemas-dev,
gtk-doc-tools (>= 1.0),
libenchant-dev (>= 1.2.0),
iso-codes (>= 0.35),
libsm-dev (>= 2:1.0),
libice-dev,
libxml2-dev (>= 2.5.0),
- libglib2.0-dev (>= 2.28),
+ libglib2.0-dev (>= 2.28.0),
libgtk-3-dev (>= 3.0.0),
- libgtksourceview-3.0-dev (>= 2.91.1),
- libpeas-dev (>= 0.7.2),
+ libgtksourceview-3.0-dev (>= 3.0.0),
+ libpeas-dev (>= 0.7.3),
libx11-dev,
libzeitgeist-dev (>= 0.3.2),
- python (>= 2.5),
- gsettings-desktop-schemas-dev,
+ python-dev (>= 2.5),
+ python-gobject-dev (>= 2.28),
+ gobject-introspection,
+ libgirepository1.0-dev (>= 0.9.3),
scrollkeeper
Build-Depends-Indep: libglib2.0-doc,
libgtk-3-doc,
@@ -41,8 +45,13 @@
${shlibs:Depends},
gedit-common (>= ${gnome:Version}),
gedit-common (<< ${gnome:NextVersion}),
- python-gobject (>= 2.15.4),
gsettings-desktop-schemas,
+ python-gobject (>= 2.28),
+ gir1.2-glib-2.0,
+ gir1.2-peas-1.0,
+ gir1.2-pango-1.0,
+ gir1.2-gtk-3.0,
+ gir1.2-gtksource-3.0,
iso-codes
Recommends: zenity,
python-gnome2,
@@ -81,7 +90,10 @@
Section: devel
Depends: ${misc:Depends},
gedit (>= ${gnome:Version}),
- gedit (<< ${gnome:NextVersion})
+ gedit (<< ${gnome:NextVersion}),
+ libgtksourceview-3.0-dev,
+ libpeas-dev
+Replaces: gedit-common (<< 2.16.2-3)
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/gedit-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/gedit-common.install?rev=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/gedit-common.install [utf-8] (original)
+++ desktop/experimental/gedit/debian/gedit-common.install [utf-8] Thu Jun 2 16:35:53 2011
@@ -1,6 +1,9 @@
debian/gedit-icon.xpm /usr/share/pixmaps/
-debian/tmp/usr/share/gedit-2
+debian/tmp/usr/share/gedit/logo
+debian/tmp/usr/share/gedit/plugins
+debian/tmp/usr/share/gedit/ui
+debian/tmp/usr/share/glib-2.0
debian/tmp/usr/share/gnome
+debian/tmp/usr/share/GConf
debian/tmp/usr/share/locale
debian/tmp/usr/share/man
-debian/tmp/usr/share/omf
Modified: desktop/experimental/gedit/debian/gedit-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/gedit-dev.dirs?rev=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/gedit-dev.dirs [utf-8] (original)
+++ desktop/experimental/gedit/debian/gedit-dev.dirs [utf-8] Thu Jun 2 16:35:53 2011
@@ -1,1 +1,1 @@
-usr/lib/gedit-2/plugins
+usr/lib/gedit/plugins
Modified: desktop/experimental/gedit/debian/gedit-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/gedit-dev.install?rev=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/gedit-dev.install [utf-8] (original)
+++ desktop/experimental/gedit/debian/gedit-dev.install [utf-8] Thu Jun 2 16:35:53 2011
@@ -1,3 +1,5 @@
debian/tmp/usr/include
+debian/tmp/usr/lib/libgedit-private.so
debian/tmp/usr/lib/pkgconfig
debian/tmp/usr/share/gtk-doc
+debian/tmp/usr/share/gedit/gir-1.0
Modified: desktop/experimental/gedit/debian/gedit.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/gedit.install?rev=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/gedit.install [utf-8] (original)
+++ desktop/experimental/gedit/debian/gedit.install [utf-8] Thu Jun 2 16:35:53 2011
@@ -1,9 +1,10 @@
-debian/tmp/etc
debian/tmp/usr/bin/gedit
-debian/tmp/usr/lib/gedit/gedit-2/gedit-bugreport.sh /usr/share/gedit-2/
-debian/tmp/usr/lib/gedit-2/plugins/*.gedit-plugin
-debian/tmp/usr/lib/gedit-2/plugins/*.so
-debian/tmp/usr/lib/gedit-2/plugins/*/*.py
-debian/tmp/usr/lib/gedit-2/plugin-loaders/*.so
+debian/tmp/usr/lib/gedit/gedit/gedit-bugreport.sh /usr/share/gedit/
+debian/tmp/usr/lib/gedit/girepository-1.0/
+debian/tmp/usr/lib/gedit/plugins/*.plugin
+debian/tmp/usr/lib/gedit/plugins/*.so
+debian/tmp/usr/lib/gedit/plugins/*/*.py
+debian/tmp/usr/lib/libgedit-private.so.*
debian/tmp/usr/share/applications/gedit.desktop
+debian/tmp/usr/share/dbus-1/
debian/script /usr/share/bug/gedit/
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=28169&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] Thu Jun 2 16:35:53 2011
@@ -1,8 +1,8 @@
---- a/data/gedit.desktop.in.in
-+++ b/data/gedit.desktop.in.in
+--- gedit-3.0.0.orig/data/gedit.desktop.in.in
++++ gedit-3.0.0/data/gedit.desktop.in.in
@@ -15,4 +15,4 @@
X-GNOME-Bugzilla-Product=gedit
X-GNOME-Bugzilla-Component=general
X-GNOME-Bugzilla-Version=@VERSION@
-X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit/gedit-bugreport.sh
-+X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gedit/gedit-bugreport
++X-GNOME-Bugzilla-ExtraInfoScript=@prefix@/share/gedit/gedit-bugreport
Modified: desktop/experimental/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/patches/series?rev=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gedit/debian/patches/series [utf-8] Thu Jun 2 16:35:53 2011
@@ -1,2 +1,1 @@
01_gedit-bugreport-location.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=28169&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/rules [utf-8] (original)
+++ desktop/experimental/gedit/debian/rules [utf-8] Thu Jun 2 16:35:53 2011
@@ -1,17 +1,21 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
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 && mv gedit-bugreport.sh gedit-bugreport
chmod 755 debian/gedit/usr/share/bug/gedit/script
dh_pysupport -pgedit /usr/lib/gedit/plugins
+binary-predeb/gedit::
+ dh_girepository -ldebian/tmp/usr/share/gedit/gir-1.0 /usr/lib/gedit/girepository-1.0
+
LDFLAGS += -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
More information about the pkg-gnome-commits
mailing list