aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog12
-rw-r--r--debian/control16
-rw-r--r--debian/source/format1
3 files changed, 20 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 1f79e7c..0c34a3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,15 @@ libdbusmenu (0.3.4-0ubuntu1) maverick; urgency=low
-- Ted Gould <ted@ubuntu.com> Thu, 01 Jul 2010 09:00:16 -0500
+libdbusmenu (0.3.3-1) unstable; urgency=low
+
+ * Merge Ubuntu.
+ Preserve Maintainer and Vcs-* fields.
+ * Standards-Version: 3.9.0
+ * Source-Format: 1.0 for now
+
+ -- Evgeni Golov <evgeni@debian.org> Thu, 01 Jul 2010 11:42:23 +0200
+
libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low
* New upstream release.
@@ -34,12 +43,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 aefb40e..66dbaff 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 5.0),
gir1.0-glib-2.0,
gir1.0-gtk-2.0,
valac
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
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
@@ -60,12 +60,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 +76,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 +129,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 +140,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.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0