[Pkg-xfce-commits] r5691 - in goodies/tags/parole: . 0.2.0.6-1/debian 0.2.0.6-1/debian/patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Apr 24 03:38:02 UTC 2011
Author: corsac
Date: 2011-04-24 15:37:58 +0000 (Sun, 24 Apr 2011)
New Revision: 5691
Added:
goodies/tags/parole/0.2.0.6-1/
goodies/tags/parole/0.2.0.6-1/debian/changelog
goodies/tags/parole/0.2.0.6-1/debian/control
goodies/tags/parole/0.2.0.6-1/debian/parole.install
goodies/tags/parole/0.2.0.6-1/debian/patches/01_fix-implicit-dso-linking.patch
goodies/tags/parole/0.2.0.6-1/debian/rules
Removed:
goodies/tags/parole/0.2.0.6-1/debian/browser-plugin-parole.install
goodies/tags/parole/0.2.0.6-1/debian/changelog
goodies/tags/parole/0.2.0.6-1/debian/control
goodies/tags/parole/0.2.0.6-1/debian/parole.install
goodies/tags/parole/0.2.0.6-1/debian/patches/01_fix-implicit-dso-linking.patch
goodies/tags/parole/0.2.0.6-1/debian/rules
Log:
[svn-buildpackage] Tagging parole 0.2.0.6-1
Deleted: goodies/tags/parole/0.2.0.6-1/debian/browser-plugin-parole.install
===================================================================
--- goodies/trunk/parole/debian/browser-plugin-parole.install 2011-04-23 07:41:27 UTC (rev 5673)
+++ goodies/tags/parole/0.2.0.6-1/debian/browser-plugin-parole.install 2011-04-24 15:37:58 UTC (rev 5691)
@@ -1 +0,0 @@
-usr/lib/mozilla/plugins/parole-player.so
Deleted: goodies/tags/parole/0.2.0.6-1/debian/changelog
===================================================================
--- goodies/trunk/parole/debian/changelog 2011-04-23 07:41:27 UTC (rev 5673)
+++ goodies/tags/parole/0.2.0.6-1/debian/changelog 2011-04-24 15:37:58 UTC (rev 5691)
@@ -1,37 +0,0 @@
-parole (0.2.0.6-1) UNRELEASED; urgency=low
-
- [ Lionel Le Folgoc ]
- * debian/control:
- - drop unneeded build-dep on xulrunner-dev. closes: #594073
- - suggests a few useful gstreamer0.10 plugins.
- - build-depends on quilt.
- * debian/patches:
- - 01_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
- - series: added. closes: #615760
- * debian/rules: pass --with quilt to dh.
-
- [ Yves-Alexis Perez ]
- * New upstream release.
- * Switch to 3.0 (quilt) source format.
-
- -- Lionel Le Folgoc <mrpouit at gmail.com> Mon, 23 Aug 2010 20:06:03 +0200
-
-parole (0.2.0.2-3) unstable; urgency=low
-
- * debian/control:
- - add depends on gstreamer0.10-x. closes: #583610
-
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 29 May 2010 00:00:40 +0200
-
-parole (0.2.0.2-2) unstable; urgency=low
-
- * debian/control, debian/browser-plugin-parole: rename browser plugin
- package since it seems that's the preferred scheme.
-
- -- Yves-Alexis Perez <corsac at debian.org> Wed, 28 Apr 2010 21:42:11 +0200
-
-parole (0.2.0.2-1) unstable; urgency=low
-
- * Initial release closes: #549971
-
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 26 Apr 2010 00:04:34 +0200
Copied: goodies/tags/parole/0.2.0.6-1/debian/changelog (from rev 5689, goodies/trunk/parole/debian/changelog)
===================================================================
--- goodies/tags/parole/0.2.0.6-1/debian/changelog (rev 0)
+++ goodies/tags/parole/0.2.0.6-1/debian/changelog 2011-04-24 15:37:58 UTC (rev 5691)
@@ -0,0 +1,51 @@
+parole (0.2.0.6-1) unstable; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * debian/control:
+ - drop unneeded build-dep on xulrunner-dev. closes: #594073
+ - suggests a few useful gstreamer0.10 plugins.
+ - build-depends on quilt.
+ * debian/patches:
+ - 01_fix-implicit-dso-linking.patch: added, fixes FTBFS with binutils-gold.
+ - series: added. closes: #615760
+ * debian/rules: pass --with quilt to dh.
+
+ [ Yves-Alexis Perez ]
+ * New upstream release.
+ * Switch to 3.0 (quilt) source format.
+ * debian/control:
+ - update standards version to 3.9.2.
+ - drop browser-plugin-parole package.
+ - drop quilt build-dep.
+ - add build-dep on hardening-includes
+ - bump xfce build-deps to 4.8.
+ * debian/parole.install updated.
+ * debian/rules:
+ - use --fail-missing and manually remove spurious files.
+ - drop quilt addon
+ - pick build flags from dpkg-buildflags.
+ - add -O1, -z,defs and --as-needed to LDFLAGS.
+ - add hardening flags to build flags.
+ - stop harcoding the shell to bash, it works fine now. closes: #623830
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 24 Apr 2011 16:09:19 +0200
+
+parole (0.2.0.2-3) unstable; urgency=low
+
+ * debian/control:
+ - add depends on gstreamer0.10-x. closes: #583610
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 29 May 2010 00:00:40 +0200
+
+parole (0.2.0.2-2) unstable; urgency=low
+
+ * debian/control, debian/browser-plugin-parole: rename browser plugin
+ package since it seems that's the preferred scheme.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 28 Apr 2010 21:42:11 +0200
+
+parole (0.2.0.2-1) unstable; urgency=low
+
+ * Initial release closes: #549971
+
+ -- Yves-Alexis Perez <corsac at debian.org> Mon, 26 Apr 2010 00:04:34 +0200
Deleted: goodies/tags/parole/0.2.0.6-1/debian/control
===================================================================
--- goodies/trunk/parole/debian/control 2011-04-23 07:41:27 UTC (rev 5673)
+++ goodies/tags/parole/0.2.0.6-1/debian/control 2011-04-24 15:37:58 UTC (rev 5691)
@@ -1,52 +0,0 @@
-Source: parole
-Section: xfce
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
- Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config,
- libgtk2.0-dev (>= 2.16), libgstreamer0.10-dev,
- libgstreamer-plugins-base0.10-dev, libdbus-1-dev, libdbus-glib-1-dev,
- libxfcegui4-dev (>= 4.6.0), libnotify-dev, libtagc0-dev, quilt (>= 0.46-7)
-Standards-Version: 3.8.4
-Homepage: http://goodies.xfce.org/projects/applications/parole
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/parole/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/parole/
-
-Package: parole
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-x
-Suggests: gstreamer0.10-plugins-ugly, gstreamer0.10-plugins-bad, gstreamer0.10-ffmpeg
-Description: media player based on GStreamer framework
- Parole is a media player for the Xfce desktop environment, written using the
- GStreamer framework.
- .
- Parole features playback of local media files, including video with subtitles
- support, DVD/CD and live streams; it is also extensible via plugins.
- .
- This package contains Parole media player.
-
-Package: browser-plugin-parole
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: multimedia plugin for web browsers based on Parole media player
- Parole is a media player for the Xfce desktop environment, written using the
- GStreamer framework.
- .
- Parole features playback of local media files, including video with subtitles
- support, DVD/CD and live streams; it is also extensible via plugins.
- .
- This package contains Parole media player's plugin for web browsers.
-
-Package: parole-dev
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util-dev, libglib2.0-dev,
- libgtk2.0-dev
-Description: development files for Parole media player
- Parole is a media player for the Xfce desktop environment, written using the
- GStreamer framework.
- .
- Parole features playback of local media files, including video with subtitles
- support, DVD/CD and live streams; it is also extensible via plugins.
- .
- This package contains development files for Parole's plugin interface.
Copied: goodies/tags/parole/0.2.0.6-1/debian/control (from rev 5682, goodies/trunk/parole/debian/control)
===================================================================
--- goodies/tags/parole/0.2.0.6-1/debian/control (rev 0)
+++ goodies/tags/parole/0.2.0.6-1/debian/control 2011-04-24 15:37:58 UTC (rev 5691)
@@ -0,0 +1,41 @@
+Source: parole
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
+ Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7.0.50~), intltool, pkg-config,
+ libgtk2.0-dev (>= 2.16), libgstreamer0.10-dev,
+ libgstreamer-plugins-base0.10-dev, libdbus-1-dev, libdbus-glib-1-dev,
+ libxfcegui4-dev (>= 4.8.0), libnotify-dev, libtagc0-dev,
+ hardening-includes, xfce4-dev-tools, libtool, gtk-doc-tools
+Standards-Version: 3.9.2
+Homepage: http://goodies.xfce.org/projects/applications/parole
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/parole/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/parole/
+
+Package: parole
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-x
+Suggests: gstreamer0.10-plugins-ugly, gstreamer0.10-plugins-bad, gstreamer0.10-ffmpeg
+Description: media player based on GStreamer framework
+ Parole is a media player for the Xfce desktop environment, written using the
+ GStreamer framework.
+ .
+ Parole features playback of local media files, including video with subtitles
+ support, DVD/CD and live streams; it is also extensible via plugins.
+ .
+ This package contains Parole media player.
+
+Package: parole-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxfce4util-dev, libglib2.0-dev,
+ libgtk2.0-dev
+Description: development files for Parole media player
+ Parole is a media player for the Xfce desktop environment, written using the
+ GStreamer framework.
+ .
+ Parole features playback of local media files, including video with subtitles
+ support, DVD/CD and live streams; it is also extensible via plugins.
+ .
+ This package contains development files for Parole's plugin interface.
Deleted: goodies/tags/parole/0.2.0.6-1/debian/parole.install
===================================================================
--- goodies/trunk/parole/debian/parole.install 2011-04-23 07:41:27 UTC (rev 5673)
+++ goodies/tags/parole/0.2.0.6-1/debian/parole.install 2011-04-24 15:37:58 UTC (rev 5691)
@@ -1,4 +0,0 @@
-usr/bin
-usr/lib/parole-0/*.so
-usr/lib/parole/parole-media-plugin
-usr/share
Copied: goodies/tags/parole/0.2.0.6-1/debian/parole.install (from rev 5676, goodies/trunk/parole/debian/parole.install)
===================================================================
--- goodies/tags/parole/0.2.0.6-1/debian/parole.install (rev 0)
+++ goodies/tags/parole/0.2.0.6-1/debian/parole.install 2011-04-24 15:37:58 UTC (rev 5691)
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/parole-0/*.so
+usr/share
Deleted: goodies/tags/parole/0.2.0.6-1/debian/patches/01_fix-implicit-dso-linking.patch
===================================================================
--- goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch 2011-04-23 07:41:27 UTC (rev 5673)
+++ goodies/tags/parole/0.2.0.6-1/debian/patches/01_fix-implicit-dso-linking.patch 2011-04-24 15:37:58 UTC (rev 5691)
@@ -1,29 +0,0 @@
-Description: fix FTBFS with gold
-Author: Kevin Fenzi <kevin at tummy.com>
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=6244
-=== modified file 'src/Makefile.in'
---- old/src/Makefile.in 2010-04-28 21:42:11 +0000
-+++ new/src/Makefile.in 2010-10-28 19:19:02 +0000
-@@ -205,7 +205,7 @@
- INTLTOOL_PERL = @INTLTOOL_PERL@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
- LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
- LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
-
-=== modified file 'common/Makefile.in'
---- old/common/Makefile.in 2010-04-28 21:42:11 +0000
-+++ new/common/Makefile.in 2010-10-28 19:30:58 +0000
-@@ -199,7 +199,7 @@
- INTLTOOL_PERL = @INTLTOOL_PERL@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -lX11
- LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
- LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
- LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
-
Copied: goodies/tags/parole/0.2.0.6-1/debian/patches/01_fix-implicit-dso-linking.patch (from rev 5682, goodies/trunk/parole/debian/patches/01_fix-implicit-dso-linking.patch)
===================================================================
--- goodies/tags/parole/0.2.0.6-1/debian/patches/01_fix-implicit-dso-linking.patch (rev 0)
+++ goodies/tags/parole/0.2.0.6-1/debian/patches/01_fix-implicit-dso-linking.patch 2011-04-24 15:37:58 UTC (rev 5691)
@@ -0,0 +1,81 @@
+diff --git a/common/Makefile.am b/common/Makefile.am
+index bd51b3b..5139ca8 100644
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -12,9 +12,12 @@ libparolecommon_la_CFLAGS = \
+ $(GTK_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS)
+
++libparolecommon_la_LIBADD = \
++ $(X11_LIBS)
++
+ libparolescreensaver_la_SOURCES = \
+ parole-screensaver.c \
+ parole-screensaver.h
+
+ libparolescreensaver_la_CFLAGS = \
+- $(GTK_CFLAGS)
+\ No newline at end of file
++ $(GTK_CFLAGS)
+diff --git a/configure.ac b/configure.ac
+index d1b65b0..d65568b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,6 +96,8 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
+ XDT_CHECK_PACKAGE([LIBXFCE4GUI], [libxfcegui4-1.0],[libxfcegui4_minimum_version])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
+
++XDT_CHECK_PACKAGE([X11], [x11])
++
+ #=======================================================#
+ # Check for availability of libnotify #
+ #=======================================================#
+diff --git a/plugins/properties/Makefile.am b/plugins/properties/Makefile.am
+index f4169d0..cc26157 100644
+--- a/plugins/properties/Makefile.am
++++ b/plugins/properties/Makefile.am
+@@ -23,6 +23,10 @@ stream_properties_la_CFLAGS = \
+ $(LIBXFCE4UTIL_CFLAGS)
+
+ stream_properties_la_LIBADD = \
++ $(top_builddir)/parole/libparole.la \
++ $(PLATFORM_LIBS) \
++ $(GTK_LIBS) \
++ $(LIBXFCE4UTIL_LIBS) \
+ $(TAGLIBC_LIBS)
+
+ stream_properties_la_LDFLAGS = \
+diff --git a/plugins/tray/Makefile.am b/plugins/tray/Makefile.am
+index a240229..0c82253 100644
+--- a/plugins/tray/Makefile.am
++++ b/plugins/tray/Makefile.am
+@@ -30,6 +30,8 @@ tray_icon_la_LDFLAGS = \
+ $(PLATFORM_LDFLAGS)
+
+ tray_icon_la_LIBADD = \
++ $(top_builddir)/parole/libparole.la \
++ $(LIBXFCE4UTIL_LIBS) \
+ $(LIBNOTIFY_LIBS)
+
+ #
+@@ -44,4 +46,4 @@ EXTRA_DIST = \
+ $(desktop_in_files)
+
+ DISTCLEANFILES = \
+- $(desktop_DATA)
+\ No newline at end of file
++ $(desktop_DATA)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b2928a8..8bbaa6a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -85,7 +85,8 @@ parole_LDADD = \
+ $(LIBXFCE4GUI_LIBS) \
+ $(GST_VIDEO_LIBS) \
+ $(GST_INTERFACES_LIBS) \
+- $(TAGLIBC_LIBS)
++ $(TAGLIBC_LIBS) \
++ $(X11_LIBS)
+
+ parole_glib_enum_headers = \
+ parole-conf.h \
Deleted: goodies/tags/parole/0.2.0.6-1/debian/rules
===================================================================
--- goodies/trunk/parole/debian/rules 2011-04-23 07:41:27 UTC (rev 5673)
+++ goodies/tags/parole/0.2.0.6-1/debian/rules 2011-04-24 15:37:58 UTC (rev 5691)
@@ -1,11 +0,0 @@
-#!/usr/bin/make -f
-#LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-
-export SHELL=/bin/bash
-export CONFIG_SHELL=/bin/bash
-
-%:
- dh $@ --with quilt
-
-override_dh_makeshlibs:
- dh_makeshlibs -X usr/lib/parole-0
Copied: goodies/tags/parole/0.2.0.6-1/debian/rules (from rev 5683, goodies/trunk/parole/debian/rules)
===================================================================
--- goodies/tags/parole/0.2.0.6-1/debian/rules (rev 0)
+++ goodies/tags/parole/0.2.0.6-1/debian/rules 2011-04-24 15:37:58 UTC (rev 5691)
@@ -0,0 +1,24 @@
+#!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
+
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=-Wl,-O1 -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS)
+
+export CFLAGS LDFLAGS
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ NOCONFIGURE=1 xdt-autogen
+ dh_auto_configure
+
+override_dh_makeshlibs:
+ dh_makeshlibs -X usr/lib/parole-0
+
+override_dh_install:
+ find debian/tmp/usr/lib -name '*.la' -delete
+ dh_install --fail-missing
More information about the Pkg-xfce-commits
mailing list