r20545 - in /packages/unstable/libgda4/debian: changelog control control.in copyright rules watch
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Wed Jul 1 22:59:33 UTC 2009
Author: pochu-guest
Date: Wed Jul 1 22:59:33 2009
New Revision: 20545
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20545
Log:
* debian/watch: don't uupdate.
* The dbg package is section debug.
* debian/rules: little cleanup.
* debian/copyright: point to the versionful license.
* debian/control: Inherit the Section from the source stanza where
it's duplicated.
* Standards-Version is 3.8.2, changes:
- Don't ship our own copy of jquery.js, link to the one in libjs-jquery
instead. Thus depend on libjs-jquery.
* Move some packages to the database section.
* debian/control: clean up whitespaces.
Modified:
packages/unstable/libgda4/debian/changelog
packages/unstable/libgda4/debian/control
packages/unstable/libgda4/debian/control.in
packages/unstable/libgda4/debian/copyright
packages/unstable/libgda4/debian/rules
packages/unstable/libgda4/debian/watch
Modified: packages/unstable/libgda4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/changelog?rev=20545&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/changelog (original)
+++ packages/unstable/libgda4/debian/changelog Wed Jul 1 22:59:33 2009
@@ -1,5 +1,6 @@
libgda4 (4.0.1-1) UNRELEASED; urgency=low
+ [ Gustavo R. Montesino ]
* New major upstream version
- Update packaging for the new version.
* debian/control.in:
@@ -8,6 +9,19 @@
* debian/patches:
- 01_gds_info_new_remove.patch: Removed - not relevant anymore
- 02_libgda3_ia64_segv.patch: Removed - applied upstream
+
+ [ Emilio Pozuelo Monfort ]
+ * debian/watch: don't uupdate.
+ * The dbg package is section debug.
+ * debian/rules: little cleanup.
+ * debian/copyright: point to the versionful license.
+ * debian/control: Inherit the Section from the source stanza where
+ it's duplicated.
+ * Standards-Version is 3.8.2, changes:
+ - Don't ship our own copy of jquery.js, link to the one in libjs-jquery
+ instead. Thus depend on libjs-jquery.
+ * Move some packages to the database section.
+ * debian/control: clean up whitespaces.
-- Gustavo R. Montesino <grmontesino at ig.com.br> Thu, 07 May 2009 12:17:47 -0300
Modified: packages/unstable/libgda4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/control?rev=20545&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/control (original)
+++ packages/unstable/libgda4/debian/control Wed Jul 1 22:59:33 2009
@@ -29,10 +29,9 @@
scrollkeeper
Build-Depends-Indep: gtk-doc-tools,
sgmltools-lite
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Package: libgda4-4
-Section: libs
Architecture: any
Depends: libgda4-common (>= ${source:Version}),
${shlibs:Depends},
@@ -69,7 +68,8 @@
Package: libgda4-common
Section: misc
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+ libjs-jquery
Recommends: libgda4-4
Conflicts: libgda-common (<< 0.2.96-6.2)
Replaces: libgda-common (<< 0.2.96-6.2)
@@ -101,7 +101,7 @@
development.
Package: libgda4-4-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: any
Depends: libgda4-4 (= ${binary:Version}),
Modified: packages/unstable/libgda4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/control.in?rev=20545&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/control.in (original)
+++ packages/unstable/libgda4/debian/control.in Wed Jul 1 22:59:33 2009
@@ -29,10 +29,9 @@
scrollkeeper
Build-Depends-Indep: gtk-doc-tools,
sgmltools-lite
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Package: libgda4- at SONAME@
-Section: libs
Architecture: any
Depends: libgda4-common (>= ${source:Version}),
${shlibs:Depends},
@@ -43,14 +42,14 @@
Conflicts: libgda2-1
Replaces: libgda2-1
Description: data abstraction library based on GLib
- libgda is a (relatively small) database abstraction/access library
- integrated on the GLib object model. It can be used as a metadata
- extractor, to get information about all database objects in a common
- way, and as an ODBC-like wrapper to access data in different engines
+ libgda is a (relatively small) database abstraction/access library
+ integrated on the GLib object model. It can be used as a metadata
+ extractor, to get information about all database objects in a common
+ way, and as an ODBC-like wrapper to access data in different engines
through an easier API.
Package: libgda4-bin
-Section: misc
+Section: database
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -58,26 +57,27 @@
Replaces: libgda-common (<< 0.2.96-6.2)
Description: data abstraction library based on GLib -- binary files
libgda is a (relatively small) database abstraction/access library
- integrated on the GLib object model. It can be used as a metadata
- extractor, to get information about all database objects in a common
- way, and as an ODBC-like wrapper to access data in different engines
+ integrated on the GLib object model. It can be used as a metadata
+ extractor, to get information about all database objects in a common
+ way, and as an ODBC-like wrapper to access data in different engines
through an easier API.
.
This package contains binary files for libgda.
Package: libgda4-common
-Section: misc
+Section: database
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+ libjs-jquery
Recommends: libgda4- at SONAME@
Conflicts: libgda-common (<< 0.2.96-6.2)
Replaces: libgda-common (<< 0.2.96-6.2)
Description: data abstraction library based on GLib -- common files
libgda is a (relatively small) database abstraction/access library
- integrated on the GLib object model. It can be used as a metadata
- extractor, to get information about all database objects in a common
- way, and as an ODBC-like wrapper to access data in different engines
+ integrated on the GLib object model. It can be used as a metadata
+ extractor, to get information about all database objects in a common
+ way, and as an ODBC-like wrapper to access data in different engines
through an easier API.
.
This package contains common files for libgda.
@@ -92,16 +92,16 @@
Suggests: libgda3-doc
Description: data abstraction library based on GLib -- development files
libgda is a (relatively small) database abstraction/access library
- integrated on the GLib object model. It can be used as a metadata
- extractor, to get information about all database objects in a common
- way, and as an ODBC-like wrapper to access data in different engines
+ integrated on the GLib object model. It can be used as a metadata
+ extractor, to get information about all database objects in a common
+ way, and as an ODBC-like wrapper to access data in different engines
through an easier API.
.
- This package contains the header files and libraries needed for
+ This package contains the header files and libraries needed for
development.
Package: libgda4- at SONAME@-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: any
Depends: libgda4- at SONAME@ (= ${binary:Version}),
@@ -132,7 +132,7 @@
This package contains document files about libgda API.
Package: libgda4-mysql
-Section: gnome
+Section: database
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -147,7 +147,7 @@
through libgda.
Package: libgda4-postgres
-Section: gnome
+Section: database
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -158,11 +158,11 @@
way, and as an ODBC-like wrapper to access data in different engines
through an easier API.
.
- This package contains the provider needed to access PostgreSQL
+ This package contains the provider needed to access PostgreSQL
databases through libgda.
Package: libgda4-sqlite
-Section: gnome
+Section: database
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -173,5 +173,5 @@
way, and as an ODBC-like wrapper to access data in different engines
through an easier API.
.
- This package contains the provider needed to access SQLite databases
+ This package contains the provider needed to access SQLite databases
through libgda.
Modified: packages/unstable/libgda4/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/copyright?rev=20545&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/copyright (original)
+++ packages/unstable/libgda4/debian/copyright Wed Jul 1 22:59:33 2009
@@ -58,6 +58,6 @@
X-Comment: On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in '/usr/share/common-licenses/LGPL' and the
+ Public License can be found in '/usr/share/common-licenses/LGPL-2' and the
text of the GNU Free Documentation License can be found in
'/usr/share/common-licenses/GFDL'.
Modified: packages/unstable/libgda4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/rules?rev=20545&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/rules (original)
+++ packages/unstable/libgda4/debian/rules Wed Jul 1 22:59:33 2009
@@ -9,19 +9,27 @@
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-LDFLAGS += -Wl,-z,defs
+GNOME_MODULE := libgda
+SONAME := 4
-LDFLAGS += -Wl,--as-needed
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+DEB_DH_MAKESHLIBS_ARGS_ALL += -X /usr/lib/libgda-4.0/providers
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-LDFLAGS += -Wl,-O1
+DEB_CONFIGURE_EXTRA_FLAGS += --with-postgres=$(shell pg_config --includedir) \
+ --without-bdb \
+ --without-mSQL \
+ --without-ibmdb2 \
+ --without-sybase \
+ --without-tds \
+ --without-oracle \
+ --without-firebird \
+ --without-xbase \
+ --without-mdb \
+ --without-ldap
-GNOME_MODULE := libgda
-
-SONAME := 4
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS += --with-postgres=$(shell pg_config --includedir) --without-bdb --without-mSQL --without-ibmdb2 --without-sybase --without-tds --without-oracle --without-firebird --without-xbase --without-mdb --without-ldap
-DEB_DH_STRIP_ARGS += --dbg-package=libgda4-$(SONAME)
-DEB_DH_MAKESHLIBS_ARGS_ALL += -X /usr/lib/libgda-4.0/providers
+# Only build the docs if this file is present (e.g. when building arch.all packages)
+$(DEB_BUILDDIR)/config.status: DEB_CONFIGURE_EXTRA_FLAGS += $(shell if test -f /usr/share/pkgconfig/gtk-doc.pc; then echo "--enable-gtk-doc"; fi)
clean::
sed -e 's#@SONAME@#$(SONAME)#g' \
@@ -32,7 +40,11 @@
rm -f libsql/lexer.c
rm -f libsql/parser.c
-$(DEB_BUILDDIR)/config.status: DEB_CONFIGURE_EXTRA_FLAGS += $(shell if test -f /usr/share/pkgconfig/gtk-doc.pc; then echo "--enable-gtk-doc"; fi)
+binary-install/libgda4-common::
+ # Don't ship our own copy of jquery.js
+ rm debian/libgda4-common/usr/share/libgda-4.0/web/jquery.js
+ ln -s /usr/share/javascript/jquery/jquery.js \
+ debian/libgda4-common/usr/share/libgda-4.0/web/
common-binary-post-install-arch::
for i in libgda4-common libgda4-bin libgda4-dev libgda4-$(SONAME)-dbg \
Modified: packages/unstable/libgda4/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda4/debian/watch?rev=20545&op=diff
==============================================================================
--- packages/unstable/libgda4/debian/watch (original)
+++ packages/unstable/libgda4/debian/watch Wed Jul 1 22:59:33 2009
@@ -1,4 +1,3 @@
version=3
http://ftp.gnome.org/pub/GNOME/sources/libgda/([\d\.]+[02468])/ \
- libgda-(.*)\.tar\.gz \
- debian uupdate
+ libgda-(.*)\.tar\.gz
More information about the pkg-gnome-commits
mailing list