r46216 - in /desktop/unstable/gnome-applets/debian: changelog control control.in patches/ patches/series patches/window_picker_ldflags.patch rules
mitya57 at users.alioth.debian.org
mitya57 at users.alioth.debian.org
Wed Sep 30 13:18:45 UTC 2015
Author: mitya57
Date: Wed Sep 30 13:18:45 2015
New Revision: 46216
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46216
Log:
* Avoid renaming libwindow-picker-applet.so library by passing
--no-ext-rename to dh_python3.
* Add missing ${python3:Depends} to gnome-applets-data package.
* Backport upstream change to fix LDFLAGS for window picker applet.
* Build with --disable-static, and remove libwindow-picker-applet.la
in binary-install/gnome-applets target.
* Disable dh_makeshlibs for gnome-applets package, there are no real
shared libraries there.
Added:
desktop/unstable/gnome-applets/debian/patches/
desktop/unstable/gnome-applets/debian/patches/series
desktop/unstable/gnome-applets/debian/patches/window_picker_ldflags.patch
Modified:
desktop/unstable/gnome-applets/debian/changelog
desktop/unstable/gnome-applets/debian/control
desktop/unstable/gnome-applets/debian/control.in
desktop/unstable/gnome-applets/debian/rules
Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=46216&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Wed Sep 30 13:18:45 2015
@@ -9,8 +9,14 @@
* Update gnome-applets package description to mention three new applets
(Brightness, Inhibit and Search Bar).
* Do not mention Command Line applet which we do not build.
- * Do not run dh_python3 against gnome-applets package.
- * Remove __pycache__ directory from gnome-applets-data package.
+ * Avoid renaming libwindow-picker-applet.so library by passing
+ --no-ext-rename to dh_python3.
+ * Add missing ${python3:Depends} to gnome-applets-data package.
+ * Backport upstream change to fix LDFLAGS for window picker applet.
+ * Build with --disable-static, and remove libwindow-picker-applet.la
+ in binary-install/gnome-applets target.
+ * Disable dh_makeshlibs for gnome-applets package, there are no real
+ shared libraries there.
-- Dmitry Shachnev <mitya57 at debian.org> Mon, 28 Sep 2015 17:10:10 +0300
Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=46216&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control [utf-8] Wed Sep 30 13:18:45 2015
@@ -44,7 +44,7 @@
Package: gnome-applets-data
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
Breaks: netspeed (<< 3.16)
Replaces: netspeed (<< 3.16)
Description: Various applets for the GNOME panel - data files
Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=46216&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control.in [utf-8] Wed Sep 30 13:18:45 2015
@@ -40,7 +40,7 @@
Package: gnome-applets-data
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${python3:Depends}
Breaks: netspeed (<< 3.16)
Replaces: netspeed (<< 3.16)
Description: Various applets for the GNOME panel - data files
Added: desktop/unstable/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/series?rev=46216&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/series (added)
+++ desktop/unstable/gnome-applets/debian/patches/series [utf-8] Wed Sep 30 13:18:45 2015
@@ -0,0 +1 @@
+window_picker_ldflags.patch
Added: desktop/unstable/gnome-applets/debian/patches/window_picker_ldflags.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/window_picker_ldflags.patch?rev=46216&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/window_picker_ldflags.patch (added)
+++ desktop/unstable/gnome-applets/debian/patches/window_picker_ldflags.patch [utf-8] Wed Sep 30 13:18:45 2015
@@ -0,0 +1,14 @@
+Description: fix window-picker LDFLAGS
+Origin: upstream, https://git.gnome.org/browse/gnome-applets/commit/?id=04fe4f86a5bae9ec
+Last-Update: 2015-09-30
+
+--- a/windowpicker/src/Makefile.am
++++ b/windowpicker/src/Makefile.am
+@@ -19,6 +19,7 @@
+ $(NULL)
+
+ libwindow_picker_applet_la_LDFLAGS = \
++ -module -avoid-version \
+ $(WARN_LDFLAGS) \
+ $(AM_LDFLAGS) \
+ $(NULL)
Modified: desktop/unstable/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/rules?rev=46216&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/rules [utf-8] Wed Sep 30 13:18:45 2015
@@ -12,6 +12,7 @@
DATADIR = /usr/share/gnome-applets
DEB_CONFIGURE_EXTRA_FLAGS += \
+ --disable-static \
--with-pythondir=$(DATADIR) \
--enable-ipv6 \
--enable-suid=no
@@ -20,6 +21,7 @@
DEB_INSTALL_CHANGELOGS_ALL = ./NEWS
DEB_DH_STRIP_ARGS += --dbg-package=gnome-applets-dbg
+DEB_DH_MAKESHLIBS_ARGS_gnome-applets += --no-act
# Build manual pages
build/gnome-applets:: $(MANPAGES)
@@ -27,8 +29,11 @@
debian/cpufreq-selector.1: debian/cpufreq-selector.sgml
docbook-to-man $< > $@
+binary-install/gnome-applets::
+ rm debian/gnome-applets/usr/lib/gnome-applets/5.0/libwindow-picker-applet.la
+ dh_python3 -pgnome-applets --no-ext-rename
+
binary-install/gnome-applets-data::
- rm -rf debian/gnome-applets-data/usr/share/gnome-applets/invest/__pycache__
dh_python3 -pgnome-applets-data $(DATADIR)
clean::
More information about the pkg-gnome-commits
mailing list