r15224 - /packages/unstable/libgdamm3.0/debian/

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Mon Mar 17 02:44:17 UTC 2008 

Author: manphiz-guest
Date: Mon Mar 17 02:44:17 2008
New Revision: 15224

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15224
Log:
Renamed naming from libgdamm-3.0-* back to libgdamm3.0-*: Ubuntu is now syncing name with us :)  Adjust all package names, control field, doc path accordingly.  And revert changelog mentioning this.
Reword to "Set shlibs version to 3.0.0 due to new API."
Stop building static library: libgda3 provides no static one.

Added:
    packages/unstable/libgdamm3.0/debian/libgdamm3.0-10.install
      - copied unchanged from r15219, packages/unstable/libgdamm3.0/debian/libgdamm-3.0-10.install
    packages/unstable/libgdamm3.0/debian/libgdamm3.0-dev.install
      - copied, changed from r15219, packages/unstable/libgdamm3.0/debian/libgdamm-3.0-dev.install
    packages/unstable/libgdamm3.0/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference
      - copied, changed from r15219, packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.doc-base.libgdamm3.0-reference
    packages/unstable/libgdamm3.0/debian/libgdamm3.0-doc.docs
      - copied unchanged from r15219, packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.docs
    packages/unstable/libgdamm3.0/debian/libgdamm3.0-doc.examples
      - copied unchanged from r15219, packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.examples
Removed:
    packages/unstable/libgdamm3.0/debian/libgdamm-3.0-10.install
    packages/unstable/libgdamm3.0/debian/libgdamm-3.0-dev.install
    packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.doc-base.libgdamm3.0-reference
    packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.docs
    packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.examples
Modified:
    packages/unstable/libgdamm3.0/debian/changelog
    packages/unstable/libgdamm3.0/debian/control
    packages/unstable/libgdamm3.0/debian/control.in
    packages/unstable/libgdamm3.0/debian/rules

Modified: packages/unstable/libgdamm3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdamm3.0/debian/changelog?rev=15224&op=diff
==============================================================================
--- packages/unstable/libgdamm3.0/debian/changelog (original)
+++ packages/unstable/libgdamm3.0/debian/changelog Mon Mar 17 02:44:17 2008
@@ -2,13 +2,11 @@
 
   * New upstream release.
     + Bump soversion to 10 to match upstream changes.
-    + Rename packages from libgdamm3.0-* to libgdamm-3.0-* to match
-      upstream sonames, and add proper Conflicts/Replaces.
+    + 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.
-    + Build static library.
+    + 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.
@@ -22,7 +20,7 @@
     hierarchy.
   * Refine watch file.
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Sun, 16 Mar 2008 23:22:36 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Mon, 17 Mar 2008 10:09:54 +0800
 
 libgdamm3.0 (2.9.81-1) unstable; urgency=low
 

Modified: packages/unstable/libgdamm3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdamm3.0/debian/control?rev=15224&op=diff
==============================================================================
--- packages/unstable/libgdamm3.0/debian/control (original)
+++ packages/unstable/libgdamm3.0/debian/control Mon Mar 17 02:44:17 2008
@@ -12,10 +12,14 @@
                libgda3-dev (>= 3.0.0)
 Standards-Version: 3.7.3
 
-Package: libgdamm-3.0-10
+Package: libgdamm3.0-10
 Architecture: any
-Conflicts: libgdamm3.0-8
-Replaces: libgdamm3.0-8
+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
@@ -24,14 +28,14 @@
  .
  This package contains the shared library.
 
-Package: libgdamm-3.0-dev
+Package: libgdamm3.0-dev
 Architecture: any
 Section: libdevel
-Conflicts: libgdamm3.0-dev
-Replaces: libgdamm3.0-dev
+Conflicts: libgdamm-3.0-dev
+Replaces: libgdamm-3.0-dev
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgdamm-3.0-10 (= ${binary:Version}),
+         libgdamm3.0-10 (= ${binary:Version}),
          libglibmm-2.4-dev (>= 2.12.8),
          libgda3-dev (>= 3.0.0)
 Suggests: libgdamm3.0-doc
@@ -41,10 +45,10 @@
  .
  This package contains the library headers.
 
-Package: libgdamm-3.0-doc
+Package: libgdamm3.0-doc
 Section: doc
-Conflicts: libgdamm3.0-doc
-Replaces: libgdamm3.0-doc
+Conflicts: libgdamm-3.0-doc
+Replaces: libgdamm-3.0-doc
 Depends: ${misc:Depends},
          doc-base
 Suggests: libgdamm3.0-dev

Modified: packages/unstable/libgdamm3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdamm3.0/debian/control.in?rev=15224&op=diff
==============================================================================
--- packages/unstable/libgdamm3.0/debian/control.in (original)
+++ packages/unstable/libgdamm3.0/debian/control.in Mon Mar 17 02:44:17 2008
@@ -12,10 +12,14 @@
                libgda3-dev (>= 3.0.0)
 Standards-Version: 3.7.3
 
-Package: libgdamm-3.0-10
+Package: libgdamm3.0-10
 Architecture: any
-Conflicts: libgdamm3.0-8
-Replaces: libgdamm3.0-8
+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
@@ -24,14 +28,14 @@
  .
  This package contains the shared library.
 
-Package: libgdamm-3.0-dev
+Package: libgdamm3.0-dev
 Architecture: any
 Section: libdevel
-Conflicts: libgdamm3.0-dev
-Replaces: libgdamm3.0-dev
+Conflicts: libgdamm-3.0-dev
+Replaces: libgdamm-3.0-dev
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgdamm-3.0-10 (= ${binary:Version}),
+         libgdamm3.0-10 (= ${binary:Version}),
          libglibmm-2.4-dev (>= 2.12.8),
          libgda3-dev (>= 3.0.0)
 Suggests: libgdamm3.0-doc
@@ -41,10 +45,10 @@
  .
  This package contains the library headers.
 
-Package: libgdamm-3.0-doc
+Package: libgdamm3.0-doc
 Section: doc
-Conflicts: libgdamm3.0-doc
-Replaces: libgdamm3.0-doc
+Conflicts: libgdamm-3.0-doc
+Replaces: libgdamm-3.0-doc
 Depends: ${misc:Depends},
          doc-base
 Suggests: libgdamm3.0-dev

Copied: packages/unstable/libgdamm3.0/debian/libgdamm3.0-dev.install (from r15219, packages/unstable/libgdamm3.0/debian/libgdamm-3.0-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdamm3.0/debian/libgdamm3.0-dev.install?rev=15224&op=diff
==============================================================================
--- packages/unstable/libgdamm3.0/debian/libgdamm-3.0-dev.install (original)
+++ packages/unstable/libgdamm3.0/debian/libgdamm3.0-dev.install Mon Mar 17 02:44:17 2008
@@ -1,5 +1,4 @@
 usr/include
 usr/lib/libgdamm-3.0
 usr/lib/lib*.so
-usr/lib/lib*.a
 usr/lib/pkgconfig

Copied: packages/unstable/libgdamm3.0/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference (from r15219, packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.doc-base.libgdamm3.0-reference)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdamm3.0/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference?rev=15224&op=diff
==============================================================================
--- packages/unstable/libgdamm3.0/debian/libgdamm-3.0-doc.doc-base.libgdamm3.0-reference (original)
+++ packages/unstable/libgdamm3.0/debian/libgdamm3.0-doc.doc-base.libgdamm3.0-reference Mon Mar 17 02:44:17 2008
@@ -5,5 +5,5 @@
 Section: Programming/C++
 
 Format: HTML
-Index: /usr/share/doc/libgdamm-3.0-doc/docs/reference/html/index.html
-Files: /usr/share/doc/libgdamm-3.0-doc/docs/reference/html/*.html
+Index: /usr/share/doc/libgdamm3.0-doc/docs/reference/html/index.html
+Files: /usr/share/doc/libgdamm3.0-doc/docs/reference/html/*.html

Modified: packages/unstable/libgdamm3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdamm3.0/debian/rules?rev=15224&op=diff
==============================================================================
--- packages/unstable/libgdamm3.0/debian/rules (original)
+++ packages/unstable/libgdamm3.0/debian/rules Mon Mar 17 02:44:17 2008
@@ -16,7 +16,6 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-static
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V"$(SHARED_PKG) (>= $(SHVER))"
 DEB_INSTALL_DOCS_$(DOC_PKG) += -XMakefile -XDoxyfile

More information about the pkg-gnome-commits mailing list