Adjusting package name to libhildon. Auto sh-libs generation.

diff --git a/ChangeLog.2 b/ChangeLog.2
index 2a2985d..0a99116 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,14 @@
+2007-01-22  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
+       * debian/libhildon0-dbg.install:
+       * debian/libhildon0-dev.docs:
+       * debian/libhildon0-dev.install:
+       * debian/libhildon0.install:
+       * debian/changelog:
+       * debian/control: Adjusting package name to libhildon.
+
+       * debian/rules: Auto sh-libs generation.
+
 2007-01-19  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * src/hildon-calendar-popup.c:

diff --git a/debian/changelog b/debian/changelog
index f985519..9647d36 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hildon (0.9.9-1) unstable; urgency=low
+libhildon (0.9.9-1) unstable; urgency=low
 
   * Unreleased.
 

diff --git a/debian/control b/debian/control
index c0e06cd..ac4b65a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,25 +1,25 @@
-Source: hildon
+Source: libhildon
 Section: x11
 Priority: optional
 Maintainer: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
 Build-Depends: debhelper (>= 4.0.0), pkg-config, libgtk2.0-dev (>= 2:2.6.10-1.osso4), osso-esd-dev, libxi-dev, libxt-dev, libpng12-dev, libgconf2-dev, gtk-doc-tools
 Standards-Version: 3.6.0
 
-Package: hildon-dev
+Package: libhildon0-dev
 Section: devel
 Architecture: any
-Depends: hildon-libs0 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.6.10-1.osso4), osso-esd-dev, libgconf2-dev
+Depends: libhildon0 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.6.10-1.osso4), osso-esd-dev, libgconf2-dev
 Description: Hildon libraries development files
 
-Package: hildon0
+Package: libhildon0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, osso-sounds-ui
 Description: Hildon libraries
 
-Package: hildon0-dbg
+Package: libhildon0-dbg
 Section: libdevel
 Architecture: any
-Depends: hildon0 (= ${Source-Version})
+Depends: libhildon0 (= ${Source-Version})
 Description: Debug symbols for hildon libraries
 

diff --git a/debian/hildon-dev.docs b/debian/hildon-dev.docs
deleted file mode 100644 (file)
index 52e24a4..0000000
--- a/debian/hildon-dev.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/build/usr/share/gtk-doc/html

diff --git a/debian/hildon-dev.install b/debian/hildon-dev.install
deleted file mode 100644 (file)
index 9d4598d..0000000
--- a/debian/hildon-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*.so
-usr/lib/pkgconfig

diff --git a/debian/hildon0-dbg.install b/debian/hildon0-dbg.install
deleted file mode 100644 (file)
index cddaee0..0000000
--- a/debian/hildon0-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/debug/*

diff --git a/debian/hildon0.install b/debian/hildon0.install
deleted file mode 100644 (file)
index 093956b..0000000
--- a/debian/hildon0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*.so.*

diff --git a/debian/libhildon0-dbg.install b/debian/libhildon0-dbg.install
new file mode 100644 (file)
index 0000000..cddaee0
--- /dev/null
+++ b/debian/libhildon0-dbg.install
@@ -0,0 +1 @@
+usr/lib/debug/*

diff --git a/debian/libhildon0-dev.docs b/debian/libhildon0-dev.docs
new file mode 100644 (file)
index 0000000..52e24a4
--- /dev/null
+++ b/debian/libhildon0-dev.docs
@@ -0,0 +1 @@
+debian/build/usr/share/gtk-doc/html

diff --git a/debian/libhildon0-dev.install b/debian/libhildon0-dev.install
new file mode 100644 (file)
index 0000000..9d4598d
--- /dev/null
+++ b/debian/libhildon0-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/*.so
+usr/lib/pkgconfig

diff --git a/debian/libhildon0.install b/debian/libhildon0.install
new file mode 100644 (file)
index 0000000..093956b
--- /dev/null
+++ b/debian/libhildon0.install
@@ -0,0 +1 @@
+usr/lib/*.so.*

diff --git a/debian/rules b/debian/rules
index 2463da4..b0dfb48 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,13 +32,14 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 # shared library versions, option 1
-version=2.0.5
-major=2
+# version=0.0.0 
+# major=0
 # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+version=`ls src/.libs/lib*.so.* | \
+awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+
+major=`ls src/.libs/lib*.so.* | \
+awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 config.status: $(SOURCE_DIR)/configure
        dh_testdir