rev 16575 - in krap/google-gadgets/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Mon Jan 11 14:14:34 UTC 2010
Author: fabo
Date: 2010-01-11 14:14:32 +0000 (Mon, 11 Jan 2010)
New Revision: 16575
Modified:
krap/google-gadgets/trunk/debian/changelog
krap/google-gadgets/trunk/debian/control
krap/google-gadgets/trunk/debian/copyright
krap/google-gadgets/trunk/debian/patches/01_am_maintainer_mode.patch
krap/google-gadgets/trunk/debian/patches/02_kfreebsd.patch
krap/google-gadgets/trunk/debian/patches/03_GRE_Version.patch
krap/google-gadgets/trunk/debian/rules
Log:
- Rename library packages.
- Conflict against old libraries
- Update -dev packages dependency
Modified: krap/google-gadgets/trunk/debian/changelog
===================================================================
--- krap/google-gadgets/trunk/debian/changelog 2010-01-11 14:13:23 UTC (rev 16574)
+++ krap/google-gadgets/trunk/debian/changelog 2010-01-11 14:14:32 UTC (rev 16575)
@@ -1,3 +1,12 @@
+google-gadgets (0.11.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload to fix broken ABI:
+ - Rename library packages.
+ - Conflict against old libraries
+ - Update -dev packages dependency
+
+ -- Fathi Boudra <fabo at debian.org> Mon, 11 Jan 2010 09:55:21 +0100
+
google-gadgets (0.11.1-1) unstable; urgency=low
* New upstream release (Closes: 534719)
Modified: krap/google-gadgets/trunk/debian/control
===================================================================
--- krap/google-gadgets/trunk/debian/control 2010-01-11 14:13:23 UTC (rev 16574)
+++ krap/google-gadgets/trunk/debian/control 2010-01-11 14:14:32 UTC (rev 16575)
@@ -13,10 +13,11 @@
Vcs-Browser: http://code.google.com/p/google-gadgets-for-linux/source/browse/#svn/trunk/packaging/debian
Homepage: http://code.google.com/p/google-gadgets-for-linux/
-Package: libggadget-1.0-0
+Package: libggadget-1.0-0a
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libggadget-1.0-0
Description: Google Gadgets main library
This package contains the main Google Gadgets library, it is required by both
the GTK+ and Qt versions of Google Gadgets.
@@ -24,15 +25,16 @@
Package: libggadget-1.0-dev
Section: libdevel
Architecture: any
-Depends: libggadget-1.0-0 (= ${binary:Version})
+Depends: libggadget-1.0-0a (= ${binary:Version}), ${misc:Depends}
Description: Google Gadgets main development files
This package contains the development files assoicated with libggadget, it is
needed to write programs that utilise libggadget.
-Package: libggadget-gtk-1.0-0
+Package: libggadget-gtk-1.0-0a
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libggadget-gtk-1.0-0
Description: Google Gadgets GTK+ library
This package contains the GTK+ Google Gadgets library, it is required to run
the GTK+ version of Google Gadgets.
@@ -40,15 +42,16 @@
Package: libggadget-gtk-1.0-dev
Section: libdevel
Architecture: any
-Depends: libggadget-gtk-1.0-0 (= ${binary:Version})
+Depends: libggadget-gtk-1.0-0a (= ${binary:Version}), ${misc:Depends}
Description: Google Gadgets GTK+ development files
This package contains the development files assoicated with libggadget-gtk,
it is needed to write GTK+ programs that utilise libggadget.
-Package: libggadget-qt-1.0-0
+Package: libggadget-qt-1.0-0a
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libggadget-qt-1.0-0
Description: Google Gadgets Qt library
This package contains the Qt Google Gadgets library, it is required to run
the Qt version of Google Gadgets.
@@ -56,7 +59,7 @@
Package: libggadget-qt-1.0-dev
Section: libdevel
Architecture: any
-Depends: libggadget-qt-1.0-0 (= ${binary:Version})
+Depends: libggadget-qt-1.0-0a (= ${binary:Version}), ${misc:Depends}
Description: Google Gadgets Qt development files
This package contains the development files assoicated with libggadget-qt,
it is needed to write Qt programs that utilise libggadget.
@@ -64,7 +67,7 @@
Package: google-gadgets-common
Section: misc
Architecture: any
-Depends: ${shlibs:Depends}, shared-mime-info
+Depends: ${shlibs:Depends}, ${misc:Depends}, shared-mime-info
Description: Common files for Qt and GTK+ versions of google-gadgets
Google Gadgets for Linux provides a platform for running desktop gadgets under
Linux, catering to the unique needs of Linux users. It's compatible with the
@@ -79,7 +82,8 @@
Architecture: any
Depends: google-gadgets-common (= ${binary:Version}),
google-gadgets-gst (= ${binary:Version}),
- google-gadgets-xul (= ${binary:Version}), ${shlibs:Depends}
+ google-gadgets-xul (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
Description: GTK+ Version of Google Gadgets
Google Gadgets for Linux provides a platform for running desktop gadgets under
Linux, catering to the unique needs of Linux users. It's compatible with the
@@ -94,7 +98,8 @@
Architecture: any
Depends: google-gadgets-common (= ${binary:Version}),
google-gadgets-gst (= ${binary:Version}),
- google-gadgets-xul (= ${binary:Version}), ${shlibs:Depends}
+ google-gadgets-xul (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
Description: Qt4 version of Google Gadgets
Google Gadgets for Linux provides a platform for running desktop gadgets under
Linux, catering to the unique needs of Linux users. It's compatible with the
@@ -107,7 +112,8 @@
Package: google-gadgets-gst
Section: misc
Architecture: any
-Depends: google-gadgets-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: google-gadgets-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
Description: GStreamer Module for Google Gadgets
Google Gadgets for Linux provides a platform for running desktop gadgets under
Linux, catering to the unique needs of Linux users. It's compatible with the
@@ -120,7 +126,8 @@
Package: google-gadgets-xul
Section: misc
Architecture: any
-Depends: google-gadgets-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: google-gadgets-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
Description: XULRunner module for Google Gadgets
Google Gadgets for Linux provides a platform for running desktop gadgets under
Linux, catering to the unique needs of Linux users. It's compatible with the
Modified: krap/google-gadgets/trunk/debian/copyright
===================================================================
--- krap/google-gadgets/trunk/debian/copyright 2010-01-11 14:13:23 UTC (rev 16574)
+++ krap/google-gadgets/trunk/debian/copyright 2010-01-11 14:14:32 UTC (rev 16575)
@@ -1,9 +1,10 @@
This package was debianized by Jack Coulter <jscinoz at gmail.com> on
Sat, 07 Jun 2008 12:53:23 +1000.
-It was downloaded from
-http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-0.10.4.tar.bz2
+It was downloaded from:
+ http://code.google.com/p/google-gadgets-for-linux/
+
Upstream Author:
Google Gadgets for Linux team <google-gadgets-for-linux-dev at googlegroups.com>
Modified: krap/google-gadgets/trunk/debian/patches/01_am_maintainer_mode.patch
===================================================================
--- krap/google-gadgets/trunk/debian/patches/01_am_maintainer_mode.patch 2010-01-11 14:13:23 UTC (rev 16574)
+++ krap/google-gadgets/trunk/debian/patches/01_am_maintainer_mode.patch 2010-01-11 14:14:32 UTC (rev 16575)
@@ -1,6 +1,6 @@
---- google-gadgets-0.10.5.orig/configure.ac
-+++ google-gadgets-0.10.5/configure.ac
-@@ -34,6 +34,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,6 +34,7 @@ AC_CONFIG_SRCDIR([ggadget/common.h])
AC_CONFIG_AUX_DIR([autotools])
AC_CONFIG_MACRO_DIR([autotools])
Modified: krap/google-gadgets/trunk/debian/patches/02_kfreebsd.patch
===================================================================
--- krap/google-gadgets/trunk/debian/patches/02_kfreebsd.patch 2010-01-11 14:13:23 UTC (rev 16574)
+++ krap/google-gadgets/trunk/debian/patches/02_kfreebsd.patch 2010-01-11 14:14:32 UTC (rev 16575)
@@ -1,6 +1,6 @@
---- google-gadgets-0.10.5.orig/configure.ac
-+++ google-gadgets-0.10.5/configure.ac
-@@ -414,7 +415,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -495,7 +495,7 @@ case $host_os in
GGL_PLATFORM_SHORT="\"mac\""
GGL_PLATFORM="\"mac\""
;;
@@ -8,5 +8,4 @@
+ *linux* | *kfreebsd*-gnu* )
ggl_host_type=linux
PREDEFINED_MACROS="$PREDEFINED_MACROS -DGGL_HOST_LINUX=1"
- SMJS_CFLAGS="-DXP_UNIX"
-
+ GGL_PLATFORM_SHORT="\"linux\""
Modified: krap/google-gadgets/trunk/debian/patches/03_GRE_Version.patch
===================================================================
--- krap/google-gadgets/trunk/debian/patches/03_GRE_Version.patch 2010-01-11 14:13:23 UTC (rev 16574)
+++ krap/google-gadgets/trunk/debian/patches/03_GRE_Version.patch 2010-01-11 14:14:32 UTC (rev 16575)
@@ -1,8 +1,6 @@
-Index: google-gadgets-0.11.1/extensions/gtkmoz_browser_element/browser_child.cc
-===================================================================
---- google-gadgets-0.11.1.orig/extensions/gtkmoz_browser_element/browser_child.cc 2009-12-22 11:34:43.000000000 +1100
-+++ google-gadgets-0.11.1/extensions/gtkmoz_browser_element/browser_child.cc 2009-12-22 11:36:32.000000000 +1100
-@@ -1213,8 +1213,8 @@
+--- a/extensions/gtkmoz_browser_element/browser_child.cc
++++ b/extensions/gtkmoz_browser_element/browser_child.cc
+@@ -1213,8 +1213,8 @@ static bool InitGecko() {
nsresult rv;
static const GREVersionRange kGREVersion = {
@@ -13,11 +11,9 @@
};
char xpcom_location[4096];
-Index: google-gadgets-0.11.1/extensions/smjs_script_runtime/libmozjs_glue.cc
-===================================================================
---- google-gadgets-0.11.1.orig/extensions/smjs_script_runtime/libmozjs_glue.cc 2009-12-22 11:36:53.000000000 +1100
-+++ google-gadgets-0.11.1/extensions/smjs_script_runtime/libmozjs_glue.cc 2009-12-22 11:37:08.000000000 +1100
-@@ -198,8 +198,8 @@
+--- a/extensions/smjs_script_runtime/libmozjs_glue.cc
++++ b/extensions/smjs_script_runtime/libmozjs_glue.cc
+@@ -198,8 +198,8 @@ bool LibmozjsGlueStartup() {
char xpcom_file[4096];
static const GREVersionRange kGREVersion = {
Modified: krap/google-gadgets/trunk/debian/rules
===================================================================
--- krap/google-gadgets/trunk/debian/rules 2010-01-11 14:13:23 UTC (rev 16574)
+++ krap/google-gadgets/trunk/debian/rules 2010-01-11 14:14:32 UTC (rev 16575)
@@ -67,8 +67,6 @@
dh_install -s
dh_installman -pgoogle-gadgets-gtk debian/ggl-gtk.7
dh_installman -pgoogle-gadgets-qt debian/ggl-qt.7
-
-
# Must not depend on anything. This is to be called by
# binary-arch
More information about the pkg-kde-commits
mailing list