diff -ruN libgdamm3.0-2.9.82/debian/changelog libgdamm3.0-3.0.0/debian/changelog --- libgdamm3.0-2.9.82/debian/changelog 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/changelog 2008-03-19 09:59:57.000000000 +0100 @@ -1,19 +1,38 @@ -libgdamm3.0 (2.9.82-0ubuntu2) hardy; urgency=low +libgdamm3.0 (3.0.0-1) unstable; urgency=low - * Added Conflicts/Replaces fields for the libgdamm3.0-dev and libgdamm3.0-doc - binary packages + * New upstream release. + + Bump soversion to 10 to match upstream changes. + + Add proper Conflicts/Replaces to prepare for sync from Ubuntu. + * Add Debian GNOME Team as uploader. + * Refine debian/rules to be consistent with other GNOME Packages: + + Use gnome-pkg-tools, and set GNOME_MODULE := libgdamm + + Set shlibs version to 3.0.0 due to new API. + + Set proper exclude rules. + + Use chrpath hack to get rid of rpath on 64bit system. + + Bump compat level to 6, and b-dep on debhelper >= 6, cdbs >= 0.4.51. + * Refine debian/control*: + + Add chrpath, gnome-pkg-tools to Build-depends. + + Wrap fields for easier patch. + + Add ${misc:Depends} and ${shlibs:Depends} to Depends. + * Add libgdamm-3.0-doc.doc-base.libgdamm3.0-reference. + * Add libgdamm-3.0-doc.examples to ship examples. + * Refine libgdamm-3.0-doc.docs install path to retain original directory + hierarchy. + * Refine watch file. + + -- Deng Xiyue Mon, 17 Mar 2008 10:09:54 +0800 + +libgdamm3.0 (2.9.81-1) unstable; urgency=low + + * Import Ubuntu package in Debian + * New upstream version. + * Change Maintainer address to point at me + * Update Standars-Version to 3.7.3. No changes needed. + * Change how binary packages are named, from libgdamm-3.0 to libgdamm3.0 + * Change package descriptions to made them more similar to the ones included + in libgdamm1.3 package. - -- Christopher Brotherton Mon, 17 Mar 2008 17:44:50 -0600 - -libgdamm3.0 (2.9.82-0ubuntu1) hardy; urgency=low - - * New upstream release. (LP #190744) - * Updated Standards-Version to 3.7.3 - * Added get-orig-source target to debian/rules. - * Updated soname - * Renamed binary packages from libgdamm-3.0-* to libgdamm3.0-* - - -- Christopher Brotherton Sun, 09 Mar 2008 09:12:20 -0600 + -- Jose Carlos Garcia Sogo Sun, 10 Feb 2008 17:01:48 +0100 libgdamm3.0 (2.9.8-0ubuntu1) gutsy; urgency=low diff -ruN libgdamm3.0-2.9.82/debian/compat libgdamm3.0-3.0.0/debian/compat --- libgdamm3.0-2.9.82/debian/compat 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/compat 2008-03-19 09:59:57.000000000 +0100 @@ -1 +1 @@ -5 +6 diff -ruN libgdamm3.0-2.9.82/debian/control libgdamm3.0-3.0.0/debian/control --- libgdamm3.0-2.9.82/debian/control 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/control 2008-03-19 09:59:57.000000000 +0100 @@ -1,38 +1,60 @@ Source: libgdamm3.0 Section: devel Priority: extra -Maintainer: Ubuntu Desktop Team -Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libglibmm-2.4-dev (>= 2.12.8), libgda3-dev (>= 3.0.0) +Maintainer: Jose Carlos Garcia Sogo +Uploaders: Debian GNOME Maintainers , Deng Xiyue +Build-Depends: cdbs (>= 0.4.51), + chrpath, + debhelper (>= 6), + doc-base, + gnome-pkg-tools, + libglibmm-2.4-dev (>= 2.12.8), + libgda3-dev (>= 3.0.0) Standards-Version: 3.7.3 -Package: libgdamm3.0-9 +Package: libgdamm3.0-10 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ wrappers for libgda - libgdamm is a set of C++ bindings for the libgda database API. +Conflicts: libgdamm3.0-8, + libgdamm-3.0-8, + libgdamm3.0-9 +Replaces: libgdamm3.0-8, + libgdamm-3.0-8, + libgdamm3.0-9 +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: C++ wrappers for libgda3 + libgdamm is a set of C++ bindings for the libgda3 database API. + libgda is the GNU Data Access library. . - This package contains the library. + This package contains the shared library. Package: libgdamm3.0-dev -Provides: libgdamm-3.0-dev -Conflicts: libgdamm-3.0-dev (<< 2.9.82-0ubuntu1) -Replaces: libgdamm-3.0-dev (<< 2.9.82-0ubuntu1) Architecture: any Section: libdevel -Depends: ${misc:Depends}, libgdamm3.0-9 (= ${binary:Version}), libglibmm-2.4-dev (>= 2.12.8), libgda3-dev (>= 3.0.0) -Suggests: libgdamm-3.0-doc -Description: C++ wrappers for libgda (library headers) +Conflicts: libgdamm-3.0-dev +Replaces: libgdamm-3.0-dev +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgdamm3.0-10 (= ${binary:Version}), + libglibmm-2.4-dev (>= 2.12.8), + libgda3-dev (>= 3.0.0) +Suggests: libgdamm3.0-doc +Description: C++ wrappers for libgda3 (library headers) libgdamm is a set of C++ bindings for the libgda database API. + libgda is the GNU Data Access library. . This package contains the library headers. Package: libgdamm3.0-doc -Provides: libgdamm-3.0-doc -Conflicts: libgdamm-3.0-doc (<< 2.9.82-0ubuntu1) -Replaces: libgdamm-3.0-doc (<< 2.9.82-0ubuntu1) Section: doc +Conflicts: libgdamm-3.0-doc +Replaces: libgdamm-3.0-doc +Depends: ${misc:Depends}, + doc-base +Suggests: libgdamm3.0-dev Architecture: all -Description: C++ wrappers for libgda (documentation) +Description: C++ wrappers for libgda3 (documentation) libgdamm is a set of C++ bindings for the libgda database API. + libgda is the GNU Data Access library. . This package contains the documentation. diff -ruN libgdamm3.0-2.9.82/debian/control.in libgdamm3.0-3.0.0/debian/control.in --- libgdamm3.0-2.9.82/debian/control.in 1970-01-01 01:00:00.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/control.in 2008-03-19 09:59:57.000000000 +0100 @@ -0,0 +1,60 @@ +Source: libgdamm3.0 +Section: devel +Priority: extra +Maintainer: Jose Carlos Garcia Sogo +Uploaders: @GNOME_TEAM@ +Build-Depends: cdbs (>= 0.4.51), + chrpath, + debhelper (>= 6), + doc-base, + gnome-pkg-tools, + libglibmm-2.4-dev (>= 2.12.8), + libgda3-dev (>= 3.0.0) +Standards-Version: 3.7.3 + +Package: libgdamm3.0-10 +Architecture: any +Conflicts: libgdamm3.0-8, + libgdamm-3.0-8, + libgdamm3.0-9 +Replaces: libgdamm3.0-8, + libgdamm-3.0-8, + libgdamm3.0-9 +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: C++ wrappers for libgda3 + libgdamm is a set of C++ bindings for the libgda3 database API. + libgda is the GNU Data Access library. + . + This package contains the shared library. + +Package: libgdamm3.0-dev +Architecture: any +Section: libdevel +Conflicts: libgdamm-3.0-dev +Replaces: libgdamm-3.0-dev +Depends: ${misc:Depends}, + ${shlibs:Depends}, + libgdamm3.0-10 (= ${binary:Version}), + libglibmm-2.4-dev (>= 2.12.8), + libgda3-dev (>= 3.0.0) +Suggests: libgdamm3.0-doc +Description: C++ wrappers for libgda3 (library headers) + libgdamm is a set of C++ bindings for the libgda database API. + libgda is the GNU Data Access library. + . + This package contains the library headers. + +Package: libgdamm3.0-doc +Section: doc +Conflicts: libgdamm-3.0-doc +Replaces: libgdamm-3.0-doc +Depends: ${misc:Depends}, + doc-base +Suggests: libgdamm3.0-dev +Architecture: all +Description: C++ wrappers for libgda3 (documentation) + libgdamm is a set of C++ bindings for the libgda database API. + libgda is the GNU Data Access library. + . + This package contains the documentation. diff -ruN libgdamm3.0-2.9.82/debian/libgdamm3.0-10.install libgdamm3.0-3.0.0/debian/libgdamm3.0-10.install --- libgdamm3.0-2.9.82/debian/libgdamm3.0-10.install 1970-01-01 01:00:00.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/libgdamm3.0-10.install 2008-03-19 09:59:57.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/lib*.so.* diff -ruN libgdamm3.0-2.9.82/debian/libgdamm3.0-9.install libgdamm3.0-3.0.0/debian/libgdamm3.0-9.install --- libgdamm3.0-2.9.82/debian/libgdamm3.0-9.install 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/libgdamm3.0-9.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/tmp/usr/lib/lib*.so.* diff -ruN libgdamm3.0-2.9.82/debian/libgdamm3.0-dev.install libgdamm3.0-3.0.0/debian/libgdamm3.0-dev.install --- libgdamm3.0-2.9.82/debian/libgdamm3.0-dev.install 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/libgdamm3.0-dev.install 2008-03-19 09:59:57.000000000 +0100 @@ -1,7 +1,4 @@ -debian/tmp/usr/include -debian/tmp/usr/lib/libgdamm-3.0/include -debian/tmp/usr/lib/libgdamm-3.0/proc/m4 - -debian/tmp/usr/lib/lib*.so - -debian/tmp/usr/lib/pkgconfig +usr/include +usr/lib/libgdamm-3.0 +usr/lib/lib*.so +usr/lib/pkgconfig diff -ruN libgdamm3.0-2.9.82/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference libgdamm3.0-3.0.0/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference --- libgdamm3.0-2.9.82/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference 1970-01-01 01:00:00.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference 2008-03-19 09:59:57.000000000 +0100 @@ -0,0 +1,9 @@ +Document: libgdamm3.0-reference +Title: libgdamm 3.0 Reference Manual +Author: Doxygen +Abstract: Reference Manual for libgdamm 3.0 (C++ bindings for libgda) +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/libgdamm3.0-doc/docs/reference/html/index.html +Files: /usr/share/doc/libgdamm3.0-doc/docs/reference/html/*.html diff -ruN libgdamm3.0-2.9.82/debian/libgdamm3.0-doc.docs libgdamm3.0-3.0.0/debian/libgdamm3.0-doc.docs --- libgdamm3.0-2.9.82/debian/libgdamm3.0-doc.docs 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/libgdamm3.0-doc.docs 2008-03-19 09:59:57.000000000 +0100 @@ -1 +1 @@ -docs/reference/html +docs diff -ruN libgdamm3.0-2.9.82/debian/libgdamm3.0-doc.examples libgdamm3.0-3.0.0/debian/libgdamm3.0-doc.examples --- libgdamm3.0-2.9.82/debian/libgdamm3.0-doc.examples 1970-01-01 01:00:00.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/libgdamm3.0-doc.examples 2008-03-19 09:59:57.000000000 +0100 @@ -0,0 +1 @@ +examples/* diff -ruN libgdamm3.0-2.9.82/debian/rules libgdamm3.0-3.0.0/debian/rules --- libgdamm3.0-2.9.82/debian/rules 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/rules 2008-03-19 09:59:57.000000000 +0100 @@ -1,12 +1,26 @@ #!/usr/bin/make -f - + include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := libgdamm + +SHARED_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libgdamm[0-9\.]+-[0-9][0-9a-z]*)[[:space:]]*$$/\1/p' debian/control) +DOC_PKG := $(shell sed -rn 's/Package:[[:space:]]*(libgdamm[0-9\.]+-doc)[[:space:]]*$$/\1/p' debian/control) +SHVER := 3.0.0 + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -# Path to the debian directory -DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname ) +DEB_DH_INSTALL_SOURCEDIR := debian/tmp +DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))" +DEB_INSTALL_DOCS_$(DOC_PKG) += -XMakefile -XDoxyfile +DEB_INSTALL_EXAMPLES_$(DOC_PKG) += -XMakefile -X.deps -X.libs -X.o -get-orig-source: - cd ${DEBIAN_DIR}/.. && \ - version=$$(uscan --force-download --dehs | \ - sed -n 's/.*\(.*\)<\/upstream-version>.*/\1/p') +# chrpath hack to get rid of amd64 rpath +common-install-impl:: + chrpath -d $(DEB_DH_INSTALL_SOURCEDIR)/usr/lib/*.so* diff -ruN libgdamm3.0-2.9.82/debian/watch libgdamm3.0-3.0.0/debian/watch --- libgdamm3.0-2.9.82/debian/watch 2008-03-19 09:59:05.000000000 +0100 +++ libgdamm3.0-3.0.0/debian/watch 2008-03-19 09:59:57.000000000 +0100 @@ -1,2 +1,4 @@ -version=2 -http://ftp.gnome.org/pub/GNOME/sources/libgdamm/([\d\.]+)/libgdamm-([\d\.]+)\.tar\.gz debian uupdate +version=3 + +http://download.gnome.org/sources/libgdamm/([\d\.]+)[24680]/ \ + libgdamm-([\d\.]+)\.tar\.gz