r43811 - in /desktop/experimental/gnome-applets/debian: changelog control control.in gnome-applets-data.install patches/ patches/configurable_pythondir.patch patches/series rules
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Thu Oct 30 18:20:29 UTC 2014
Author: mitya57-guest
Date: Thu Oct 30 18:20:29 2014
New Revision: 43811
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43811
Log:
* Make pythondir configurable and set it to /usr/share/gnome-applets/
* Add explicit B-D on python3 to make Lintian happy
Added:
desktop/experimental/gnome-applets/debian/patches/
desktop/experimental/gnome-applets/debian/patches/configurable_pythondir.patch
desktop/experimental/gnome-applets/debian/patches/series
Modified:
desktop/experimental/gnome-applets/debian/changelog
desktop/experimental/gnome-applets/debian/control
desktop/experimental/gnome-applets/debian/control.in
desktop/experimental/gnome-applets/debian/gnome-applets-data.install
desktop/experimental/gnome-applets/debian/rules
Modified: desktop/experimental/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/changelog?rev=43811&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/changelog [utf-8] Thu Oct 30 18:20:29 2014
@@ -8,6 +8,7 @@
* Remove --enable-mixer-applet configure flag.
* Remove obsolete gnome-applets.gconf-defaults file.
* Update applet list in package description.
+ * Move Python modules to a private location.
* Use dh_python3.
* Use NEWS file as upstream changelog.
* Bump Standards-Version to 3.9.6, no changes needed.
Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=43811&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control [utf-8] Thu Oct 30 18:20:29 2014
@@ -29,6 +29,7 @@
libx11-dev,
libxklavier-dev (>= 4.0),
gnome-settings-daemon-dev,
+ python3,
dh-python,
xsltproc,
docbook-xsl,
Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=43811&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control.in [utf-8] Thu Oct 30 18:20:29 2014
@@ -25,6 +25,7 @@
libx11-dev,
libxklavier-dev (>= 4.0),
gnome-settings-daemon-dev,
+ python3,
dh-python,
xsltproc,
docbook-xsl,
Modified: desktop/experimental/gnome-applets/debian/gnome-applets-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/gnome-applets-data.install?rev=43811&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/gnome-applets-data.install [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/gnome-applets-data.install [utf-8] Thu Oct 30 18:20:29 2014
@@ -1,3 +1,2 @@
etc/
usr/share/
-usr/lib/python*
Added: desktop/experimental/gnome-applets/debian/patches/configurable_pythondir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/configurable_pythondir.patch?rev=43811&op=file
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/configurable_pythondir.patch (added)
+++ desktop/experimental/gnome-applets/debian/patches/configurable_pythondir.patch [utf-8] Thu Oct 30 18:20:29 2014
@@ -0,0 +1,25 @@
+Description: make pythondir configurable
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: yes
+Last-Update: 2014-10-30
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -561,6 +561,17 @@
+ dnl ***************************************************************************
+ dnl *** Set install directories ***
+ dnl ***************************************************************************
++AC_ARG_WITH([pythondir],
++ AS_HELP_STRING([--with-pythondir=DIR],
++ [installation path for private Python modules @<:@auto@:>@]),
++ [ac_with_pythondir=$withval], [ac_with_pythondir=""])
++if test "$ac_with_pythondir" != ""; then
++ pythondir=${ac_with_pythondir}
++fi
++
++AC_MSG_NOTICE([installing private Python modules in $pythondir])
++AC_SUBST(pythondir)
++
+ iconsdir="${datadir}/icons"
+ AC_SUBST(iconsdir)
+ pixmapsdir="${datadir}/pixmaps"
Added: desktop/experimental/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/series?rev=43811&op=file
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/series (added)
+++ desktop/experimental/gnome-applets/debian/patches/series [utf-8] Thu Oct 30 18:20:29 2014
@@ -0,0 +1 @@
+configurable_pythondir.patch
Modified: desktop/experimental/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/rules?rev=43811&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/rules [utf-8] Thu Oct 30 18:20:29 2014
@@ -9,7 +9,10 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DATADIR = /usr/share/gnome-applets
+
DEB_CONFIGURE_EXTRA_FLAGS += \
+ --with-pythondir=$(DATADIR) \
--enable-ipv6 \
--enable-suid=no
@@ -29,7 +32,7 @@
dh_python3 -pgnome-applets
binary-install/gnome-applets-data::
- dh_python3 -pgnome-applets-data
+ dh_python3 -pgnome-applets-data $(DATADIR)
clean::
rm -f $(MANPAGES)
More information about the pkg-gnome-commits
mailing list