r34545 - in /desktop/unstable/gedit/debian: changelog control control.in gedit-dev.install gedit.install patches/02_privlib.patch patches/series rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sun Apr 22 19:33:11 UTC 2012
Author: biebl
Date: Sun Apr 22 19:33:10 2012
New Revision: 34545
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34545
Log:
* Move libgedit-private into a package-private directory. This library is
not supposed to be installed system wide.
* Use dh-autoreconf to update the build system.
Added:
desktop/unstable/gedit/debian/patches/02_privlib.patch
Modified:
desktop/unstable/gedit/debian/changelog
desktop/unstable/gedit/debian/control
desktop/unstable/gedit/debian/control.in
desktop/unstable/gedit/debian/gedit-dev.install
desktop/unstable/gedit/debian/gedit.install
desktop/unstable/gedit/debian/patches/series
desktop/unstable/gedit/debian/rules
Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=34545&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Sun Apr 22 19:33:10 2012
@@ -1,3 +1,11 @@
+gedit (3.4.1-2) UNRELEASED; urgency=low
+
+ * Move libgedit-private into a package-private directory. This library is
+ not supposed to be installed system wide.
+ * Use dh-autoreconf to update the build system.
+
+ -- Michael Biebl <biebl at debian.org> Sun, 22 Apr 2012 21:21:22 +0200
+
gedit (3.4.1-1) unstable; urgency=low
[ Jeremy Bicha ]
Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=34545&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control [utf-8] (original)
+++ desktop/unstable/gedit/debian/control [utf-8] Sun Apr 22 19:33:10 2012
@@ -11,6 +11,7 @@
Build-Depends: cdbs (>= 0.4.90),
debhelper (>= 8),
gnome-pkg-tools (>= 0.10),
+ dh-autoreconf,
autotools-dev,
intltool (>= 0.40.0),
gsettings-desktop-schemas-dev,
Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=34545&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in [utf-8] (original)
+++ desktop/unstable/gedit/debian/control.in [utf-8] Sun Apr 22 19:33:10 2012
@@ -6,6 +6,7 @@
Build-Depends: cdbs (>= 0.4.90),
debhelper (>= 8),
gnome-pkg-tools (>= 0.10),
+ dh-autoreconf,
autotools-dev,
intltool (>= 0.40.0),
gsettings-desktop-schemas-dev,
Modified: desktop/unstable/gedit/debian/gedit-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/gedit-dev.install?rev=34545&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/gedit-dev.install [utf-8] (original)
+++ desktop/unstable/gedit/debian/gedit-dev.install [utf-8] Sun Apr 22 19:33:10 2012
@@ -1,5 +1,4 @@
usr/include
-usr/lib/libgedit-private.so
usr/lib/pkgconfig
usr/share/gtk-doc
usr/share/gedit/gir-1.0
Modified: desktop/unstable/gedit/debian/gedit.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/gedit.install?rev=34545&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/gedit.install [utf-8] (original)
+++ desktop/unstable/gedit/debian/gedit.install [utf-8] Sun Apr 22 19:33:10 2012
@@ -4,7 +4,7 @@
usr/lib/gedit/plugins/*.plugin
usr/lib/gedit/plugins/*.so
usr/lib/gedit/plugins/*/*.py
-usr/lib/libgedit-private.so.*
+usr/lib/gedit/*.so
usr/lib/python*
usr/share/applications/gedit.desktop
usr/share/dbus-1/
Added: desktop/unstable/gedit/debian/patches/02_privlib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/02_privlib.patch?rev=34545&op=file
==============================================================================
--- desktop/unstable/gedit/debian/patches/02_privlib.patch (added)
+++ desktop/unstable/gedit/debian/patches/02_privlib.patch [utf-8] Sun Apr 22 19:33:10 2012
@@ -1,0 +1,38 @@
+From cfe09b4c452b44896549bea652989654e86acd85 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sun, 22 Apr 2012 21:08:03 +0200
+Subject: [PATCH] Move libgedit-private library to pkglibdir
+
+Move libgedit-private library into a package-private directory since it
+is not supposed to be installed system wide.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674584
+---
+ gedit/Makefile.am | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gedit/Makefile.am b/gedit/Makefile.am
+index a386e07..066357b 100644
+--- a/gedit/Makefile.am
++++ b/gedit/Makefile.am
+@@ -5,7 +5,7 @@ bin_PROGRAMS = gedit
+
+ noinst_LTLIBRARIES = libgedit.la
+
+-lib_LTLIBRARIES = libgedit-private.la
++pkglib_LTLIBRARIES = libgedit-private.la
+
+ INCLUDES = \
+ -I$(top_srcdir) \
+@@ -47,6 +47,8 @@ libgedit_la_LIBADD += $(GEDIT_LIBS) $(GTK_MAC_LIBS)
+
+ libgedit_private_la_LIBADD = libgedit.la $(GEDIT_LIBS)
+
++libgedit_private_la_LDFLAGS = -avoid-version
++
+ # Mac OSX convenience library and ldflags
+ if OS_OSX
+ noinst_LTLIBRARIES += libosx.la
+--
+1.7.10
+
Modified: desktop/unstable/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/series?rev=34545&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/series [utf-8] Sun Apr 22 19:33:10 2012
@@ -1,1 +1,2 @@
01_gedit-bugreport-location.patch
+02_privlib.patch
Modified: desktop/unstable/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/rules?rev=34545&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/rules [utf-8] (original)
+++ desktop/unstable/gedit/debian/rules [utf-8] Sun Apr 22 19:33:10 2012
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/autoreconf.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
@@ -19,4 +20,6 @@
DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+DEB_DH_MAKESHLIBS_ARGS_gedit += -X/usr/lib/gedit
+
DEB_DH_GIREPOSITORY_ARGS_gedit += -ldebian/tmp/usr/share/gedit/gir-1.0 /usr/lib/gedit/girepository-1.0
More information about the pkg-gnome-commits
mailing list