r17575 - in /desktop/experimental/gedit/debian: changelog control control.in gedit.install patches/01_gedit-bugreport-location.patch patches/99_ltmain_as-needed.patch rules script
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 14 15:24:44 UTC 2008
Author: joss
Date: Fri Nov 14 15:24:44 2008
New Revision: 17575
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17575
Log:
* Pass -pgedit to dh_pysupport.
* New upstream release.
+ Document you need to escape backslashes. Closes: #361399.
* Massive update to (build-)dependencies, yay.
* Update list of installed files.
* Standards version is 3.8.0.
* Move gedit-bugreport.sh to /usr/share/gedit-2 and without extension.
* Provide a bug script that executes it for reportbug.
* 01_gedit-bugreport-location.patch:
+ Update for the new location.
+ Only patch the .in.in file, the other is always overwritten.
* 99_ltmain_as-needed.patch: updated to apply.
Added:
desktop/experimental/gedit/debian/script
Modified:
desktop/experimental/gedit/debian/changelog
desktop/experimental/gedit/debian/control
desktop/experimental/gedit/debian/control.in
desktop/experimental/gedit/debian/gedit.install
desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch
desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.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=17575&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/changelog (original)
+++ desktop/experimental/gedit/debian/changelog Fri Nov 14 15:24:44 2008
@@ -1,11 +1,26 @@
-gedit (2.22.3-2) UNRELEASED; urgency=low
-
+gedit (2.24.1-1) experimental; urgency=low
+
+ [ Loic Minier ]
* Replace homepage pseudo-field in description with a real source field in
control.
* Add note that dh_pysupport call should be made package specific or moved
to a different target.
- -- Loic Minier <lool at dooz.org> Sun, 03 Aug 2008 18:23:55 +0200
+ [ Josselin Mouette ]
+ * Pass -pgedit to dh_pysupport.
+ * New upstream release.
+ + Document you need to escape backslashes. Closes: #361399.
+ * Massive update to (build-)dependencies, yay.
+ * Update list of installed files.
+ * Standards version is 3.8.0.
+ * Move gedit-bugreport.sh to /usr/share/gedit-2 and without extension.
+ * Provide a bug script that executes it for reportbug.
+ * 01_gedit-bugreport-location.patch:
+ + Update for the new location.
+ + Only patch the .in.in file, the other is always overwritten.
+ * 99_ltmain_as-needed.patch: updated to apply.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 14 Nov 2008 15:31:20 +0100
gedit (2.22.3-1) unstable; urgency=low
Modified: desktop/experimental/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control?rev=17575&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control (original)
+++ desktop/experimental/gedit/debian/control Fri Nov 14 15:24:44 2008
@@ -2,31 +2,30 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5.0.37.2),
- libglib2.0-dev (>= 2.13.5),
- libgtk2.0-dev (>= 2.11.6),
- libgnomevfs2-dev (>= 1:2.16.0),
- libbonobo2-dev (>= 2.15.0),
- libgnomeui-dev (>= 2.16.0),
- libglade2-dev (>= 2.5.1),
- libgtksourceview2.0-dev (>= 2.2.0),
- libattr1-dev,
- scrollkeeper,
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
- libxml-parser-perl,
+ python-support (>= 0.3),
+ intltool (>= 0.35.0),
gnome-doc-utils (>= 0.3.2),
- python (>= 2.3),
- python-dev,
- python-gobject-dev (>= 2.12.0),
+ gtk-doc-tools (>= 1.0),
+ libenchant-dev (>= 1.2.0),
+ iso-codes (>= 0.35),
+ libattr1-dev,
+ libsm-dev (>= 2:1.0),
+ libxml2-dev (>= 2.5.0),
+ libglib2.0-dev (>= 2.16.0),
+ libgtk2.0-dev (>= 2.13.0),
+ libgtksourceview2.0-dev (>= 2.2.0),
+ libgconf2-dev,
+ python-dev (>= 2.3),
+ python-gobject-dev (>= 2.15.4),
python-gtk2-dev (>= 2.12.0),
python-gtksourceview2 (>= 2.2.0),
- python-support (>= 0.3),
- libenchant-dev,
- iso-codes
-Standards-Version: 3.7.3
+ scrollkeeper
+Standards-Version: 3.8.0
XS-Python-Version: >= 2.3
Homepage: http://www.gnome.org/projects/gedit/
Modified: desktop/experimental/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/control.in?rev=17575&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/control.in (original)
+++ desktop/experimental/gedit/debian/control.in Fri Nov 14 15:24:44 2008
@@ -5,28 +5,27 @@
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs (>= 0.4.41),
debhelper (>= 5.0.37.2),
- libglib2.0-dev (>= 2.13.5),
- libgtk2.0-dev (>= 2.11.6),
- libgnomevfs2-dev (>= 1:2.16.0),
- libbonobo2-dev (>= 2.15.0),
- libgnomeui-dev (>= 2.16.0),
- libglade2-dev (>= 2.5.1),
- libgtksourceview2.0-dev (>= 2.2.0),
- libattr1-dev,
- scrollkeeper,
gnome-pkg-tools (>= 0.10),
dpkg-dev (>= 1.13.19),
- libxml-parser-perl,
+ python-support (>= 0.3),
+ intltool (>= 0.35.0),
gnome-doc-utils (>= 0.3.2),
- python (>= 2.3),
- python-dev,
- python-gobject-dev (>= 2.12.0),
+ gtk-doc-tools (>= 1.0),
+ libenchant-dev (>= 1.2.0),
+ iso-codes (>= 0.35),
+ libattr1-dev,
+ libsm-dev (>= 2:1.0),
+ libxml2-dev (>= 2.5.0),
+ libglib2.0-dev (>= 2.16.0),
+ libgtk2.0-dev (>= 2.13.0),
+ libgtksourceview2.0-dev (>= 2.2.0),
+ libgconf2-dev,
+ python-dev (>= 2.3),
+ python-gobject-dev (>= 2.15.4),
python-gtk2-dev (>= 2.12.0),
python-gtksourceview2 (>= 2.2.0),
- python-support (>= 0.3),
- libenchant-dev,
- iso-codes
-Standards-Version: 3.7.3
+ scrollkeeper
+Standards-Version: 3.8.0
XS-Python-Version: >= 2.3
Homepage: http://www.gnome.org/projects/gedit/
@@ -40,14 +39,12 @@
gedit-common (>= ${gnome:Version}),
gedit-common (<< ${gnome:NextVersion}),
python-gtksourceview2 (>= 2.2.0),
- python-gobject (>= 2.12.0),
+ python-gobject (>= 2.15.4),
python-gtk2 (>= 2.12.0),
- python-glade2 (>= 2.9.7),
iso-codes
Replaces: gedit-common (<< 2.16.2-3)
Conflicts: gedit-common (<= 2.10.5-1)
-Recommends: libgnomevfs2-bin,
- zenity,
+Recommends: zenity,
python-gnome2
XB-Python-Version: ${python:Versions}
Description: official text editor of the GNOME desktop environment
@@ -84,9 +81,7 @@
Depends: ${misc:Depends},
gedit (>= ${gnome:Version}),
gedit (<< ${gnome:NextVersion}),
- libgtksourceview2.0-dev (>= 2.2.0),
- libgnomeui-dev (>= 2.16.0),
- libglade2-dev (>= 2.5.1)
+ libgtksourceview2.0-dev (>= 2.2.0)
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,
Modified: desktop/experimental/gedit/debian/gedit.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/gedit.install?rev=17575&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/gedit.install (original)
+++ desktop/experimental/gedit/debian/gedit.install Fri Nov 14 15:24:44 2008
@@ -1,11 +1,9 @@
debian/tmp/etc
debian/tmp/usr/bin/gedit
-debian/tmp/usr/lib/gedit/gedit-2/gedit-bugreport.sh /usr/lib/gedit-2/
+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/pythonconsole/*.py
-debian/tmp/usr/lib/gedit-2/plugins/externaltools/*.py
-debian/tmp/usr/lib/gedit-2/plugins/externaltools/*.glade
-debian/tmp/usr/lib/gedit-2/plugins/snippets/*.py
-debian/tmp/usr/lib/gedit-2/plugins/snippets/*.glade
+debian/tmp/usr/lib/gedit-2/plugins/*/*.py
+debian/tmp/usr/lib/gedit-2/plugins/*/*.ui
debian/tmp/usr/share/applications/gedit.desktop
+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=17575&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch (original)
+++ desktop/experimental/gedit/debian/patches/01_gedit-bugreport-location.patch Fri Nov 14 15:24:44 2008
@@ -5,12 +5,4 @@
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/lib/gedit-2/gedit-bugreport.sh
---- data/gedit.desktop.in.old 2008-04-09 09:15:26.000000000 +0200
-+++ data/gedit.desktop.in 2008-04-09 09:15:39.000000000 +0200
-@@ -14,4 +14,4 @@
- X-GNOME-Bugzilla-Product=gedit
- X-GNOME-Bugzilla-Component=general
- X-GNOME-Bugzilla-Version=2.22.3
--X-GNOME-Bugzilla-ExtraInfoScript=/opt/gnome/libexec/gedit-2/gedit-bugreport.sh
-+X-GNOME-Bugzilla-ExtraInfoScript=/usr/lib/gedit-2/gedit-bugreport.sh
++X-GNOME-Bugzilla-ExtraInfoScript=/usr/share/gedit-2/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=17575&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/gedit/debian/patches/99_ltmain_as-needed.patch Fri Nov 14 15:24:44 2008
@@ -1,20 +1,20 @@
-Index: nautilus-2.18.1/ltmain.sh
+Index: bug-buddy-2.24.1/ltmain.sh
===================================================================
---- nautilus-2.18.1.orig/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh 2007-06-06 23:36:38.899175453 +0200
-@@ -1784,6 +1784,11 @@
+--- bug-buddy-2.24.1.orig/ltmain.sh 2008-11-13 16:38:58.930987388 +0100
++++ bug-buddy-2.24.1/ltmain.sh 2008-11-13 16:39:01.278988042 +0100
+@@ -1807,6 +1807,11 @@ EOF
arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
;;
+ -Wl,--as-needed)
+ deplibs="$deplibs $arg"
+ continue
-+ ;;
-+
++ ;;
++
-Wl,*)
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
arg=
-@@ -2124,6 +2129,15 @@
+@@ -2150,6 +2155,15 @@ EOF
lib=
found=no
case $deplib in
@@ -27,6 +27,6 @@
+ fi
+ continue
+ ;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
Modified: desktop/experimental/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/rules?rev=17575&op=diff
==============================================================================
--- desktop/experimental/gedit/debian/rules (original)
+++ desktop/experimental/gedit/debian/rules Fri Nov 14 15:24:44 2008
@@ -10,11 +10,9 @@
binary-install/gedit::
cp debian/gedit.lintian debian/gedit/usr/share/lintian/overrides/gedit
- # XXX this binary-install/gedit target is specific to gedit but the
- # call to dh_pysupport acts on all packages; this should be fixed by
- # either calling dh_pysupport -p in a non-package-specific target (on
- # all packages) or per-package in per-package-specific targets
- dh_pysupport /usr/lib/gedit-2/plugins
+ cd debian/gedit/usr/share/gedit-2 && mv gedit-bugreport.sh gedit-bugreport
+ chmod 755 debian/gedit/usr/share/bug/gedit/script
+ dh_pysupport -pgedit /usr/lib/gedit-2/plugins
LDFLAGS += -Wl,-O1 -Wl,--as-needed
Added: desktop/experimental/gedit/debian/script
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gedit/debian/script?rev=17575&op=file
==============================================================================
--- desktop/experimental/gedit/debian/script (added)
+++ desktop/experimental/gedit/debian/script Fri Nov 14 15:24:44 2008
@@ -1,0 +1,4 @@
+#! /bin/sh
+
+exec /usr/share/gedit-2/gedit-bugreport >&3
+
More information about the pkg-gnome-commits
mailing list