r26349 - in /desktop/experimental/devhelp/debian: changelog compat control.in devhelp-common.install devhelp.install libdevhelp-1-1.install libdevhelp-1-dev.install libdevhelp-3-0.install libdevhelp-dev.install rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Tue Jan 18 23:08:47 UTC 2011 

Author: pochu
Date: Tue Jan 18 23:08:47 2011
New Revision: 26349

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26349
Log:
* New upstream release.
  + debian/control.in,
    debian/rules,
    debian/libdevhelp*.install:
    - Rename libdevhelp-1-1 to libdevhelp-3-0 because of the new SONAME.
    - Rename libdevhelp-1-dev to libdevhelp-dev. It's not like we're going
      to support multiple libdevhelps ever.
  + debian/control.in:
    - Update build dependencies and dependencies.
    - Relax the shared library package dependency on devhelp-common to
      allow multiple libdevhelps to be installed in parallel (to ease
      transitions when the SONAME changes).
  + debian/*.install:
    - Simplified.
  + debian/control.in,
    debian/compat:
    - Switch to debhelper compat 8.

Added:
    desktop/experimental/devhelp/debian/libdevhelp-3-0.install
      - copied, changed from r26348, desktop/experimental/devhelp/debian/libdevhelp-1-1.install
    desktop/experimental/devhelp/debian/libdevhelp-dev.install
      - copied, changed from r26348, desktop/experimental/devhelp/debian/libdevhelp-1-dev.install
Removed:
    desktop/experimental/devhelp/debian/libdevhelp-1-1.install
    desktop/experimental/devhelp/debian/libdevhelp-1-dev.install
Modified:
    desktop/experimental/devhelp/debian/changelog
    desktop/experimental/devhelp/debian/compat
    desktop/experimental/devhelp/debian/control.in
    desktop/experimental/devhelp/debian/devhelp-common.install
    desktop/experimental/devhelp/debian/devhelp.install
    desktop/experimental/devhelp/debian/rules

Modified: desktop/experimental/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/changelog?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/changelog [utf-8] (original)
+++ desktop/experimental/devhelp/debian/changelog [utf-8] Tue Jan 18 23:08:47 2011
@@ -1,3 +1,25 @@
+devhelp (2.91.5-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + debian/control.in,
+      debian/rules,
+      debian/libdevhelp*.install:
+      - Rename libdevhelp-1-1 to libdevhelp-3-0 because of the new SONAME.
+      - Rename libdevhelp-1-dev to libdevhelp-dev. It's not like we're going
+        to support multiple libdevhelps ever.
+    + debian/control.in:
+      - Update build dependencies and dependencies.
+      - Relax the shared library package dependency on devhelp-common to
+        allow multiple libdevhelps to be installed in parallel (to ease
+        transitions when the SONAME changes).
+    + debian/*.install:
+      - Simplified.
+    + debian/control.in,
+      debian/compat:
+      - Switch to debhelper compat 8.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 18 Jan 2011 22:12:52 +0000
+
 devhelp (2.30.1-1) unstable; urgency=low
 
   * New upstream stable release.

Modified: desktop/experimental/devhelp/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/compat?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/compat [utf-8] (original)
+++ desktop/experimental/devhelp/debian/compat [utf-8] Tue Jan 18 23:08:47 2011
@@ -1,1 +1,1 @@
-5
+8

Modified: desktop/experimental/devhelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/control.in?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/control.in [utf-8] (original)
+++ desktop/experimental/devhelp/debian/control.in [utf-8] Tue Jan 18 23:08:47 2011
@@ -5,44 +5,38 @@
 Uploaders: @GNOME_TEAM@
 Homepage: http://live.gnome.org/devhelp
 Build-Depends: cdbs,
-               debhelper (>= 5),
+               debhelper (>= 8),
+               gnome-pkg-tools,
                intltool,
-               libgtk2.0-dev (>= 2.14.7),
-               libglade2-dev (>= 1:2.4.0),
+               libglib2.0-dev (>= 2.25.11),
+               libgtk3.0-dev (>= 2.99.1),
                libgconf2-dev (>= 2.6.0),
-               libwebkit-dev (>= 1.1.13),
-               libwnck-dev (>= 2.14.1),
+               libwebkitgtk-3.0-dev,
                libxml-parser-perl,
-               gnome-pkg-tools,
-               libglib2.0-dev (>= 2.10.0),
                python-dev,
                python-support (>= 0.3),
-               libunique-dev (>= 1.1)
 Standards-Version: 3.9.0
 Vcs-Svn: svn://svn.debian.org/pkg-gnome/desktop/unstable/devhelp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/
 
-Package: libdevhelp-1-1
+Package: libdevhelp-3-0
 Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         devhelp-common (= ${source:Version})
+         devhelp-common (>= ${source:Version})
 Description: Library providing documentation browser functionality
  This library provides embedable widgets from the Devhelp program to
  be integrated in tools like the Anjuta IDE for browsing API reference
  documentation.
 
-Package: libdevhelp-1-dev
+Package: libdevhelp-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libgtk2.0-dev (>= 2.8.17-1),
-         libdevhelp-1-1 (= ${binary:Version}),
-         libwnck-dev (>= 2.14.1),
-         libgconf2-dev (>= 2.6.0),
-         libwebkit-dev,
-         libglade2-dev (>= 1:2.4.0-1)
+         libdevhelp-3-0 (= ${binary:Version}),
+         libgtk3.0-dev,
+         libwebkitgtk-3.0-dev
 Description: Library providing documentation browser functionality (development)
  This library provides embedable widgets from the Devhelp program to
  be integrated in tools like the Anjuta IDE for browsing API reference
@@ -53,8 +47,8 @@
 Package: devhelp
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: libgtk2.0-doc (>= 2.2.0),
-            libglib2.0-doc (>= 2.2.0),
+Recommends: libgtk3.0-doc,
+            libglib2.0-doc,
             libpango1.0-doc
 Description: A GNOME developers help program
  Devhelp's primary goal is to be an API documentation browser for GNOME.

Modified: desktop/experimental/devhelp/debian/devhelp-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/devhelp-common.install?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/devhelp-common.install [utf-8] (original)
+++ desktop/experimental/devhelp/debian/devhelp-common.install [utf-8] Tue Jan 18 23:08:47 2011
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/gedit-2/plugins/devhelp.gedit-plugin
-debian/tmp/usr/lib/gedit-2/plugins/devhelp/*.py
-debian/tmp/usr/share/devhelp/* usr/share/devhelp/
-debian/tmp/usr/share/locale/* usr/share/locale/
-debian/tmp/usr/share/icons/hicolor
-debian/tmp/etc/* etc/
+usr/lib/gedit-2/plugins/devhelp.gedit-plugin
+usr/lib/gedit-2/plugins/devhelp/*.py
+usr/share/devhelp
+usr/share/locale
+usr/share/icons/hicolor
+etc

Modified: desktop/experimental/devhelp/debian/devhelp.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/devhelp.install?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/devhelp.install [utf-8] (original)
+++ desktop/experimental/devhelp/debian/devhelp.install [utf-8] Tue Jan 18 23:08:47 2011
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/applications/* usr/share/applications/
-debian/tmp/usr/bin/* usr/bin/
+usr/share/applications
+usr/bin

Copied: desktop/experimental/devhelp/debian/libdevhelp-3-0.install (from r26348, desktop/experimental/devhelp/debian/libdevhelp-1-1.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/libdevhelp-3-0.install?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/libdevhelp-1-1.install [utf-8] (original)
+++ desktop/experimental/devhelp/debian/libdevhelp-3-0.install [utf-8] Tue Jan 18 23:08:47 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libdevhelp-1.so.* usr/lib/
+usr/lib/libdevhelp-3.so.*

Copied: desktop/experimental/devhelp/debian/libdevhelp-dev.install (from r26348, desktop/experimental/devhelp/debian/libdevhelp-1-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/libdevhelp-dev.install?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/libdevhelp-1-dev.install [utf-8] (original)
+++ desktop/experimental/devhelp/debian/libdevhelp-dev.install [utf-8] Tue Jan 18 23:08:47 2011
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libdevhelp-1.so usr/lib/
-debian/tmp/usr/lib/pkgconfig/* usr/lib/pkgconfig/
-debian/tmp/usr/include/* usr/include/
+usr/lib/libdevhelp-3.so
+usr/lib/pkgconfig
+usr/include

Modified: desktop/experimental/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/devhelp/debian/rules?rev=26349&op=diff
==============================================================================
--- desktop/experimental/devhelp/debian/rules [utf-8] (original)
+++ desktop/experimental/devhelp/debian/rules [utf-8] Tue Jan 18 23:08:47 2011
@@ -4,11 +4,11 @@
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-libdevhelp-1-N := $(shell sed -rn 's/^Package:[[:space:]]*(libdevhelp-1-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+libdevhelp-3-N := $(shell sed -rn 's/^Package:[[:space:]]*(libdevhelp-3-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libdevhelp-1-N) (>= 2.30)'
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(libdevhelp-3-N) (>= 2.30)'
 
 X_TOOLS += misc/devhelp.vim \
 	misc/html2funcs.py \

More information about the pkg-gnome-commits mailing list