r10541 - in /packages/unstable/libgda3/debian: changelog control control.in rules

lool at users.alioth.debian.org lool at users.alioth.debian.org
Mon Apr 30 08:51:03 UTC 2007


Author: lool
Date: Mon Apr 30 08:51:02 2007
New Revision: 10541

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10541
Log:
* Wrap build-deps and deps.
* DISABLE_UPDATE_UPLOADERS and build-depend on gnome-pkg-tools >= 0.11.
* Drop useless @VERSION@ substitution.
* Cleanups.
* Don't export LDFLAGS.

Modified:
    packages/unstable/libgda3/debian/changelog
    packages/unstable/libgda3/debian/control
    packages/unstable/libgda3/debian/control.in
    packages/unstable/libgda3/debian/rules

Modified: packages/unstable/libgda3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda3/debian/changelog?rev=10541&op=diff
==============================================================================
--- packages/unstable/libgda3/debian/changelog (original)
+++ packages/unstable/libgda3/debian/changelog Mon Apr 30 08:51:02 2007
@@ -1,5 +1,6 @@
 libgda3 (3.0.0-1) UNRELEASED; urgency=low
 
+  [ Gustavo R. Montesino ]
   * New major upstream release.
     - debian/libgda3-3.install: Some libraries were removed/merged.
     - libgda3-dev.install, $(plugin).install: Install the new pkgconfig
@@ -10,7 +11,14 @@
   * debian/patches/02_missing_include.patch: Fix potential segfault on 64 bit
     architetures due to missing include; thanks Dann Frazier. (closes: #420677)
 
- -- Gustavo R. Montesino <grmontesino at ig.com.br>  Sun, 29 Apr 2007 20:22:04 -0300
+  [ Loic Minier ]
+  * Wrap build-deps and deps.
+  * DISABLE_UPDATE_UPLOADERS and build-depend on gnome-pkg-tools >= 0.11.
+  * Drop useless @VERSION@ substitution.
+  * Cleanups.
+  * Don't export LDFLAGS.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 30 Apr 2007 10:50:00 +0200
 
 libgda3 (2.99.5-1) unstable; urgency=low
 

Modified: packages/unstable/libgda3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda3/debian/control?rev=10541&op=diff
==============================================================================
--- packages/unstable/libgda3/debian/control (original)
+++ packages/unstable/libgda3/debian/control Mon Apr 30 08:51:02 2007
@@ -2,17 +2,42 @@
 Section: libs
 Priority: optional
 Maintainer: Gustavo R. Montesino <grmontesino at ig.com.br>
-Uploaders: 
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 4.1.46), dpkg-dev (>= 1.13.19), gnome-pkg-tools, intltool, pkg-config, libglib2.0-dev (>= 2.4.1-2), libxml2-dev (>= 2.4.22), libxslt1-dev (>= 1.0.18), libmysqlclient15-dev, libpq-dev, libsqlite3-dev, freetds-dev (>= 0.61), unixodbc-dev, libgdbm-dev, libreadline5-dev, libpopt-dev, zlib1g-dev, scrollkeeper
-Build-Depends-Indep: gtk-doc-tools, sgmltools-lite
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jordi Mallach <jordi at debian.org>, Loic Minier <lool at dooz.org>
+Build-Depends: cdbs (>= 0.4.41),
+               debhelper (>= 4.1.46),
+               dpkg-dev (>= 1.13.19),
+               gnome-pkg-tools (>= 0.11),
+               intltool,
+               pkg-config,
+               libglib2.0-dev (>= 2.4.1-2),
+               libxml2-dev (>= 2.4.22),
+               libxslt1-dev (>= 1.0.18),
+               libmysqlclient15-dev,
+               libpq-dev,
+               libsqlite3-dev,
+               freetds-dev (>= 0.61),
+               unixodbc-dev,
+               libgdbm-dev,
+               libreadline5-dev,
+               libpopt-dev,
+               zlib1g-dev,
+               scrollkeeper
+Build-Depends-Indep: gtk-doc-tools,
+                     sgmltools-lite
 Standards-Version: 3.7.2
 
 Package: libgda3-3
 Section: libs
 Architecture: any
-Depends: libgda3-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgda3-common (>= ${source:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: libgda3-bin
-Suggests: libgda3-mysql, libgda3-postgres, libgda3-odbc, libgda3-sqlite, libgda3-freetds
+Suggests: libgda3-mysql,
+          libgda3-postgres,
+          libgda3-odbc,
+          libgda3-sqlite,
+          libgda3-freetds
 Conflicts: libgda2-1
 Replaces: libgda2-1
 Description: GNOME Data Access library for GNOME2
@@ -29,7 +54,8 @@
 Package: libgda3-bin
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Conflicts: libgda-common (<< 0.2.96-6.2)
 Replaces: libgda-common (<< 0.2.96-6.2)
 Description: Binary files for GNOME Data Access library for GNOME2
@@ -64,7 +90,10 @@
 Package: libgda3-dev
 Section: libdevel
 Architecture: any
-Depends: libgda3-3 (= ${binary:Version}), libglib2.0-dev (>= 2.2.0), libxslt1-dev, ${misc:Depends}
+Depends: libgda3-3 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.2.0),
+         libxslt1-dev,
+         ${misc:Depends}
 Suggests: libgda3-doc
 Description: Development files for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
@@ -82,7 +111,8 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libgda3-3 (= ${binary:Version}), ${misc:Depends}
+Depends: libgda3-3 (= ${binary:Version}),
+         ${misc:Depends}
 Description: GDA3 library and debugging symbols
  GDA is GNOME Data Access.
  .
@@ -104,7 +134,8 @@
 Package: libgda3-doc
 Section: doc
 Architecture: all
-Depends: lynx | www-browser, ${misc:Depends}
+Depends: lynx | www-browser,
+         ${misc:Depends}
 Conflicts: libgda-doc
 Description: Documentation files for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
@@ -120,7 +151,8 @@
 Package: libgda3-mysql
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: MySQL backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -136,7 +168,8 @@
 Package: libgda3-odbc
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: ODBC backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -152,7 +185,8 @@
 Package: libgda3-postgres
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: PostgreSQL backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -168,7 +202,8 @@
 Package: libgda3-sqlite
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: SQLite backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -184,7 +219,8 @@
 Package: libgda3-freetds
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: FreeTDS backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,

Modified: packages/unstable/libgda3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda3/debian/control.in?rev=10541&op=diff
==============================================================================
--- packages/unstable/libgda3/debian/control.in (original)
+++ packages/unstable/libgda3/debian/control.in Mon Apr 30 08:51:02 2007
@@ -3,16 +3,41 @@
 Priority: optional
 Maintainer: Gustavo R. Montesino <grmontesino at ig.com.br>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.41), debhelper (>= 4.1.46), dpkg-dev (>= 1.13.19), gnome-pkg-tools, intltool, pkg-config, libglib2.0-dev (>= 2.4.1-2), libxml2-dev (>= 2.4.22), libxslt1-dev (>= 1.0.18), libmysqlclient15-dev, libpq-dev, libsqlite3-dev, freetds-dev (>= 0.61), unixodbc-dev, libgdbm-dev, libreadline5-dev, libpopt-dev, zlib1g-dev, scrollkeeper
-Build-Depends-Indep: gtk-doc-tools, sgmltools-lite
+Build-Depends: cdbs (>= 0.4.41),
+               debhelper (>= 4.1.46),
+               dpkg-dev (>= 1.13.19),
+               gnome-pkg-tools (>= 0.11),
+               intltool,
+               pkg-config,
+               libglib2.0-dev (>= 2.4.1-2),
+               libxml2-dev (>= 2.4.22),
+               libxslt1-dev (>= 1.0.18),
+               libmysqlclient15-dev,
+               libpq-dev,
+               libsqlite3-dev,
+               freetds-dev (>= 0.61),
+               unixodbc-dev,
+               libgdbm-dev,
+               libreadline5-dev,
+               libpopt-dev,
+               zlib1g-dev,
+               scrollkeeper
+Build-Depends-Indep: gtk-doc-tools,
+                     sgmltools-lite
 Standards-Version: 3.7.2
 
 Package: libgda3- at SONAME@
 Section: libs
 Architecture: any
-Depends: libgda3-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgda3-common (>= ${source:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Recommends: libgda3-bin
-Suggests: libgda3-mysql, libgda3-postgres, libgda3-odbc, libgda3-sqlite, libgda3-freetds
+Suggests: libgda3-mysql,
+          libgda3-postgres,
+          libgda3-odbc,
+          libgda3-sqlite,
+          libgda3-freetds
 Conflicts: libgda2-1
 Replaces: libgda2-1
 Description: GNOME Data Access library for GNOME2
@@ -29,7 +54,8 @@
 Package: libgda3-bin
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Conflicts: libgda-common (<< 0.2.96-6.2)
 Replaces: libgda-common (<< 0.2.96-6.2)
 Description: Binary files for GNOME Data Access library for GNOME2
@@ -64,7 +90,10 @@
 Package: libgda3-dev
 Section: libdevel
 Architecture: any
-Depends: libgda3- at SONAME@ (= ${binary:Version}), libglib2.0-dev (>= 2.2.0), libxslt1-dev, ${misc:Depends}
+Depends: libgda3- at SONAME@ (= ${binary:Version}),
+         libglib2.0-dev (>= 2.2.0),
+         libxslt1-dev,
+         ${misc:Depends}
 Suggests: libgda3-doc
 Description: Development files for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
@@ -82,7 +111,8 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libgda3- at SONAME@ (= ${binary:Version}), ${misc:Depends}
+Depends: libgda3- at SONAME@ (= ${binary:Version}),
+         ${misc:Depends}
 Description: GDA3 library and debugging symbols
  GDA is GNOME Data Access.
  .
@@ -104,7 +134,8 @@
 Package: libgda3-doc
 Section: doc
 Architecture: all
-Depends: lynx | www-browser, ${misc:Depends}
+Depends: lynx | www-browser,
+         ${misc:Depends}
 Conflicts: libgda-doc
 Description: Documentation files for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
@@ -120,7 +151,8 @@
 Package: libgda3-mysql
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: MySQL backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -136,7 +168,8 @@
 Package: libgda3-odbc
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: ODBC backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -152,7 +185,8 @@
 Package: libgda3-postgres
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: PostgreSQL backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -168,7 +202,8 @@
 Package: libgda3-sqlite
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: SQLite backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,
@@ -184,7 +219,8 @@
 Package: libgda3-freetds
 Section: gnome
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: FreeTDS backend plugin for GNOME Data Access library for GNOME2
  GNOME Data Access is an attempt to provide uniform access to
  different kinds of data sources (databases, information servers,

Modified: packages/unstable/libgda3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda3/debian/rules?rev=10541&op=diff
==============================================================================
--- packages/unstable/libgda3/debian/rules (original)
+++ packages/unstable/libgda3/debian/rules Mon Apr 30 08:51:02 2007
@@ -1,38 +1,37 @@
 #!/usr/bin/make -f 
 # -*- Makefile -*-
-# debian/rules makefile for libgda
 
+DISABLE_UPDATE_UPLOADERS := 1
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/gnome.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-LDFLAGS += -Wl,-O1
-
 LDFLAGS += -Wl,-z,defs
 
-export LDFLAGS
+LDFLAGS += -Wl,-O1
 
 GNOME_MODULE := libgda
 
-soname := 3
+SONAME := 3
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --with-postgres=${shell pg_config --includedir}
-DEB_DH_STRIP_ARGS := --dbg-package=libgda3-${soname}
-DEB_DH_MAKESHLIBS_ARGS_ALL := -X /usr/lib/libgda-3.0/providers
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --with-postgres=$(shell pg_config --includedir)
+DEB_DH_STRIP_ARGS += --dbg-package=libgda3-$(SONAME)
+DEB_DH_MAKESHLIBS_ARGS_ALL += -X /usr/lib/libgda-3.0/providers
 
 clean::
-	sed -e 's/@SONAME@/${soname}/g' -e 's/@VERSION@/${version}/g' -e \
-	  's/@GNOME_TEAM@/${uploaders}/' debian/control.in > debian/control
+	sed -e 's#@SONAME@#$(SONAME)#g' \
+		-e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \
+		debian/control.in >debian/control
 
 common-binary-post-install-arch::
-	for i in libgda3-common libgda3-bin libgda3-dev libgda3-${soname}-dbg \
+	for i in libgda3-common libgda3-bin libgda3-dev libgda3-$(SONAME)-dbg \
 	  libgda3-mysql libgda3-odbc libgda3-postgres libgda3-sqlite \
 	  libgda3-freetds; \
 	do \
 		rm -rf debian/$$i/usr/share/doc; \
-		dh_link -p$$i usr/share/doc/libgda3-${soname} usr/share/doc/$$i; \
+		dh_link -p$$i usr/share/doc/libgda3-$(SONAME) usr/share/doc/$$i; \
 	done
 
 .PHONY: post-patches clean common-binary-post-install-arch




More information about the pkg-gnome-commits mailing list