diff options
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/control | 21 |
2 files changed, 19 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index d6a12b5..091c2d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.3-1) unstable; urgency=low + + * Merge Ubuntu. + Preserve Maintainer and Vcs-* fields. + + -- Evgeni Golov <evgeni@debian.org> Thu, 01 Jul 2010 11:28:16 +0200 + libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low * New upstream release. @@ -23,12 +30,13 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Standards-Version: 3.8.4 - Fix Homepage URL. - Update Vcs-* fields. + - -doc packages are Arch:all * debian/copyright: - Convert to DEP5 format. - Add Ken and Sebastien, according to changelog. - Add Aurélien Gâteau, according to headers. - -- Evgeni Golov <evgeni@debian.org> Wed, 16 Jun 2010 11:37:08 +0200 + -- Evgeni Golov <evgeni@debian.org> Sun, 20 Jun 2010 13:56:00 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 18222ae..8f4ca78 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,7 @@ Source: libdbusmenu Section: gnome Priority: optional -Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> -XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org> +Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org> Uploaders: Evgeni Golov <evgeni@debian.org> Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), @@ -22,8 +21,8 @@ Build-Depends: debhelper (>= 5.0), valac Standards-Version: 3.8.4 Homepage: https://launchpad.net/dbusmenu -Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian Package: libdbusmenu-glib1 Section: libs @@ -60,12 +59,12 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: library for passing menus over DBus - GTK version +Description: library for passing menus over DBus - GTK+ version libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains shared libraries to be used by GTK applications. + This package contains shared libraries to be used by GTK+ applications. Package: libdbusmenu-gtk-dev Section: libdevel @@ -76,12 +75,12 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev -Description: library for passing menus over DBus - GTK version developement files +Description: library for passing menus over DBus - GTK+ version developement files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains files that are needed to build GTK applications. + This package contains files that are needed to build GTK+ applications. Package: libdbusmenu-tools Section: devel @@ -129,7 +128,7 @@ Description: typelib file for libdbusmenu-gtk1 Package: libdbusmenu-glib-doc Section: doc -Architecture: any +Architecture: all Depends: ${misc:Depends} Description: library for passing menus over DBus - documentation libdbusmenu passes a menu structure across DBus so that a program can @@ -140,9 +139,9 @@ Description: library for passing menus over DBus - documentation Package: libdbusmenu-gtk-doc Section: doc -Architecture: any +Architecture: all Depends: ${misc:Depends} -Description: library for passing menus over DBus - GTK version documentation +Description: library for passing menus over DBus - GTK+ version documentation libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. |