r12012 - in /desktop/unstable/eel2/debian: changelog control control.in patches/01_libtool_release.patch patches/02_ldflags_libadd.patch patches/series rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Jul 18 22:09:54 UTC 2007
Author: joss
Date: Wed Jul 18 22:09:54 2007
New Revision: 12012
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12012
Log:
* 02_ldflags_libadd.patch: Correctly separate LDFLAGS and LIBADD to
avoid another kind of argument reordering.
* Switch to quilt; build depend on quilt.
Added:
desktop/unstable/eel2/debian/patches/02_ldflags_libadd.patch
desktop/unstable/eel2/debian/patches/series
Modified:
desktop/unstable/eel2/debian/changelog
desktop/unstable/eel2/debian/control
desktop/unstable/eel2/debian/control.in
desktop/unstable/eel2/debian/patches/01_libtool_release.patch
desktop/unstable/eel2/debian/rules
Modified: desktop/unstable/eel2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/changelog?rev=12012&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/changelog (original)
+++ desktop/unstable/eel2/debian/changelog Wed Jul 18 22:09:54 2007
@@ -3,8 +3,11 @@
* 99_ltmain_as-needed.patch: get --as-needed back to work.
* New upstream release.
* Use ${binary:Version}.
-
- -- Josselin Mouette <joss at debian.org> Wed, 18 Jul 2007 19:43:34 +0200
+ * 02_ldflags_libadd.patch: Correctly separate LDFLAGS and LIBADD to
+ avoid another kind of argument reordering.
+ * Switch to quilt; build depend on quilt.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 19 Jul 2007 00:01:41 +0200
eel2 (2.18.0.1-2) unstable; urgency=low
Modified: desktop/unstable/eel2/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/control?rev=12012&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/control (original)
+++ desktop/unstable/eel2/debian/control Wed Jul 18 22:09:54 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), gettext, libgtk2.0-dev (>= 2.9.4), libgnomeui-dev (>= 2.16.0-2), libgail-dev (>= 1.9), cdbs (>= 0.4.41), libgnomevfs2-dev (>= 2.9.1), gnome-pkg-tools (>= 0.11.3), dpkg-dev (>= 1.13.19), libxt-dev, libgnome-menu-dev (>= 2.16.1-1), libgnome-desktop-dev (>= 2.1.4), libxml-parser-perl, libart-2.0-dev (>= 2.3.8), libgconf2-dev, libglib2.0-dev (>= 2.6.0), libxml2-dev (>= 2.4.7), libglade2-dev, libxrender-dev
+Build-Depends: debhelper (>= 5), gettext, libgtk2.0-dev (>= 2.9.4), libgnomeui-dev (>= 2.16.0-2), libgail-dev (>= 1.9), cdbs (>= 0.4.41), libgnomevfs2-dev (>= 2.9.1), gnome-pkg-tools (>= 0.11.3), dpkg-dev (>= 1.13.19), libxt-dev, libgnome-menu-dev (>= 2.16.1-1), libgnome-desktop-dev (>= 2.1.4), libxml-parser-perl, libart-2.0-dev (>= 2.3.8), libgconf2-dev, libglib2.0-dev (>= 2.6.0), libxml2-dev (>= 2.4.7), libglade2-dev, libxrender-dev, quilt
Standards-Version: 3.7.2
Package: libeel2-dev
Modified: desktop/unstable/eel2/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/control.in?rev=12012&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/control.in (original)
+++ desktop/unstable/eel2/debian/control.in Wed Jul 18 22:09:54 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), gettext, libgtk2.0-dev (>= 2.9.4), libgnomeui-dev (>= 2.16.0-2), libgail-dev (>= 1.9), cdbs (>= 0.4.41), libgnomevfs2-dev (>= 2.9.1), gnome-pkg-tools (>= 0.11.3), dpkg-dev (>= 1.13.19), libxt-dev, libgnome-menu-dev (>= 2.16.1-1), libgnome-desktop-dev (>= 2.1.4), libxml-parser-perl, libart-2.0-dev (>= 2.3.8), libgconf2-dev, libglib2.0-dev (>= 2.6.0), libxml2-dev (>= 2.4.7), libglade2-dev, libxrender-dev
+Build-Depends: debhelper (>= 5), gettext, libgtk2.0-dev (>= 2.9.4), libgnomeui-dev (>= 2.16.0-2), libgail-dev (>= 1.9), cdbs (>= 0.4.41), libgnomevfs2-dev (>= 2.9.1), gnome-pkg-tools (>= 0.11.3), dpkg-dev (>= 1.13.19), libxt-dev, libgnome-menu-dev (>= 2.16.1-1), libgnome-desktop-dev (>= 2.1.4), libxml-parser-perl, libart-2.0-dev (>= 2.3.8), libgconf2-dev, libglib2.0-dev (>= 2.6.0), libxml2-dev (>= 2.4.7), libglade2-dev, libxrender-dev, quilt
Standards-Version: 3.7.2
Package: libeel2-dev
Modified: desktop/unstable/eel2/debian/patches/01_libtool_release.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/patches/01_libtool_release.patch?rev=12012&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/patches/01_libtool_release.patch (original)
+++ desktop/unstable/eel2/debian/patches/01_libtool_release.patch Wed Jul 18 22:09:54 2007
@@ -1,5 +1,7 @@
---- eel/Makefile.am.orig 2007-02-23 21:35:13.000000000 +0100
-+++ eel/Makefile.am 2007-02-23 21:46:34.000000000 +0100
+Index: eel-2.18.3/eel/Makefile.am
+===================================================================
+--- eel-2.18.3.orig/eel/Makefile.am 2007-07-02 22:39:31.000000000 +0200
++++ eel-2.18.3/eel/Makefile.am 2007-07-19 00:02:26.964652549 +0200
@@ -24,7 +24,7 @@
@@ -9,9 +11,11 @@
-no-undefined \
$(EEL_LIBS) \
$(RENDER_LIBS) \
---- eel/Makefile.in.orig 2007-02-23 21:46:40.000000000 +0100
-+++ eel/Makefile.in 2007-02-23 21:47:29.000000000 +0100
-@@ -304,7 +304,7 @@
+Index: eel-2.18.3/eel/Makefile.in
+===================================================================
+--- eel-2.18.3.orig/eel/Makefile.in 2007-07-02 23:16:41.000000000 +0200
++++ eel-2.18.3/eel/Makefile.in 2007-07-19 00:02:26.964652549 +0200
+@@ -311,7 +311,7 @@
# FIXME: put this back once the registration_id stuff is cleared up
# -DBONOBO_DISABLE_DEPRECATED
libeel_2_la_LDFLAGS = \
Added: desktop/unstable/eel2/debian/patches/02_ldflags_libadd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/patches/02_ldflags_libadd.patch?rev=12012&op=file
==============================================================================
--- desktop/unstable/eel2/debian/patches/02_ldflags_libadd.patch (added)
+++ desktop/unstable/eel2/debian/patches/02_ldflags_libadd.patch Wed Jul 18 22:09:54 2007
@@ -1,0 +1,47 @@
+Index: eel-2.18.3/eel/Makefile.am
+===================================================================
+--- eel-2.18.3.orig/eel/Makefile.am 2007-07-19 00:04:55.805134485 +0200
++++ eel-2.18.3/eel/Makefile.am 2007-07-19 00:03:22.935842165 +0200
+@@ -26,6 +26,9 @@
+ libeel_2_la_LDFLAGS = \
+ -release @EEL_MAJOR_VERSION at .@EEL_MINOR_VERSION@ \
+ -no-undefined \
++ $(NULL)
++
++libeel_2_la_LIBADD = \
+ $(EEL_LIBS) \
+ $(RENDER_LIBS) \
+ $(X_LIBS) \
+Index: eel-2.18.3/eel/Makefile.in
+===================================================================
+--- eel-2.18.3.orig/eel/Makefile.in 2007-07-19 00:04:55.805134485 +0200
++++ eel-2.18.3/eel/Makefile.in 2007-07-19 00:03:30.420268678 +0200
+@@ -55,7 +55,9 @@
+ "$(DESTDIR)$(libeelincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libeel_2_la_LIBADD =
++am__DEPENDENCIES_1 =
++libeel_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \
+ eel-art-extensions.lo eel-art-gtk-extensions.lo \
+@@ -82,7 +84,6 @@
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_check_program_OBJECTS = check-program.$(OBJEXT)
+ check_program_OBJECTS = $(am_check_program_OBJECTS)
+-am__DEPENDENCIES_1 =
+ check_program_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(check_program_LDFLAGS) $(LDFLAGS) -o $@
+@@ -313,6 +314,9 @@
+ libeel_2_la_LDFLAGS = \
+ -release @EEL_MAJOR_VERSION at .@EEL_MINOR_VERSION@ \
+ -no-undefined \
++ $(NULL)
++
++libeel_2_la_LIBADD = \
+ $(EEL_LIBS) \
+ $(RENDER_LIBS) \
+ $(X_LIBS) \
Added: desktop/unstable/eel2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/patches/series?rev=12012&op=file
==============================================================================
--- desktop/unstable/eel2/debian/patches/series (added)
+++ desktop/unstable/eel2/debian/patches/series Wed Jul 18 22:09:54 2007
@@ -1,0 +1,3 @@
+01_libtool_release.patch
+02_ldflags_libadd.patch
+99_ltmain_as-needed.patch
Modified: desktop/unstable/eel2/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eel2/debian/rules?rev=12012&op=diff
==============================================================================
--- desktop/unstable/eel2/debian/rules (original)
+++ desktop/unstable/eel2/debian/rules Wed Jul 18 22:09:54 2007
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
More information about the pkg-gnome-commits
mailing list