From 2be2bbd695320bacd3040ba5cfb5c09efdc15f18 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Wed, 29 May 2013 13:08:32 +0100 Subject: debian/control, configure.ac: Remove obsolete dependency on libedataserverui-3.0-dev --- configure.ac | 1 - debian/changelog | 7 +++++++ debian/control | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e9acb8c..d229f9d 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,6 @@ PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION libecal-1.2 >= $ECAL_REQUIRED_VERSION libical >= $ICAL_REQUIRED_VERSION libedataserver-1.2 >= EDS_REQUIRED_VERSION - libedataserverui-3.0 >= EDS_REQUIRED_VERSION cairo >= CAIRO_REQUIRED_VERSION gdk-3.0 >= GDK_REQUIRED_VERSION) diff --git a/debian/changelog b/debian/changelog index 7d949a1..a1f40db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) UNRELEASED; urgency=low + + * debian/control, configure.ac: Remove obsolete dependency on + libedataserverui-3.0-dev + + -- Iain Lane Wed, 29 May 2013 13:07:39 +0100 + indicator-datetime (12.10.3daily13.05.06.1-0ubuntu1) saucy; urgency=low [ Sebastien Bacher ] diff --git a/debian/control b/debian/control index 41bdb0f..6b60f90 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 9), libjson-glib-dev, libpolkit-gobject-1-dev, libedataserver1.2-dev (>= 3.5), - libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), libgnome-control-center-dev, libtimezonemap1-dev, -- cgit v1.2.3 From 98ae37d8ed8e71f29fd130ce387b74958bd22768 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 4 Jun 2013 17:15:25 -0400 Subject: releasing version 12.10.3daily13.05.06.1-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a1f40db..e4dc905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) UNRELEASED; urgency=low +indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) saucy; urgency=low * debian/control, configure.ac: Remove obsolete dependency on libedataserverui-3.0-dev - -- Iain Lane Wed, 29 May 2013 13:07:39 +0100 + -- Iain Lane Fri, 31 May 2013 10:31:55 +0100 indicator-datetime (12.10.3daily13.05.06.1-0ubuntu1) saucy; urgency=low -- cgit v1.2.3 From 1c25791a40d58f4812a6f4dfd689c3717acf3f29 Mon Sep 17 00:00:00 2001 From: Timo Jyrinki Date: Wed, 5 Jun 2013 11:49:39 +0300 Subject: Mark 12.10.3daily13.05.06.1-0ubuntu2 as released. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a1f40db..aba1f93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) UNRELEASED; urgency=low +indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) saucy; urgency=low * debian/control, configure.ac: Remove obsolete dependency on libedataserverui-3.0-dev -- cgit v1.2.3 From 7e3cedd1cce7c80ac7d2a6acfcfd3e8fccf2ba78 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Wed, 5 Jun 2013 14:45:20 -0400 Subject: Rename .desktop file for compatibility with gnome-control-center 3.8 --- data/Makefile.am | 8 ++++---- data/gnome-indicator-datetime-panel.desktop.in | 12 ++++++++++++ data/indicator-datetime-preferences.desktop.in | 12 ------------ debian/changelog | 6 ++++++ po/POTFILES.in | 2 +- 5 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 data/gnome-indicator-datetime-panel.desktop.in delete mode 100644 data/indicator-datetime-preferences.desktop.in diff --git a/data/Makefile.am b/data/Makefile.am index 6d4dd72..91a49d7 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,14 +21,14 @@ pkgdata_DATA = datetime-dialog.ui @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications -desktop_DATA = indicator-datetime-preferences.desktop +desktop_DATA = gnome-indicator-datetime-panel.desktop EXTRA_DIST += \ - indicator-datetime-preferences.desktop + gnome-indicator-datetime-panel.desktop -CLEANFILES += indicator-datetime-preferences.desktop +CLEANFILES += gnome-indicator-datetime-panel.desktop endif EXTRA_DIST += \ datetime-dialog.ui \ - indicator-datetime-preferences.desktop.in + gnome-indicator-datetime-panel.desktop.in diff --git a/data/gnome-indicator-datetime-panel.desktop.in b/data/gnome-indicator-datetime-panel.desktop.in new file mode 100644 index 0000000..68571db --- /dev/null +++ b/data/gnome-indicator-datetime-panel.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.0 +_Name=Time & Date +_Comment=Change your clock and date settings +Icon=preferences-system-time +TryExec=gnome-control-center +Exec=gnome-control-center indicator-datetime +StartupNotify=true +Type=Application +Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; +X-GNOME-Settings-Panel=indicator-datetime +OnlyShowIn=Unity; diff --git a/data/indicator-datetime-preferences.desktop.in b/data/indicator-datetime-preferences.desktop.in deleted file mode 100644 index 68571db..0000000 --- a/data/indicator-datetime-preferences.desktop.in +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=1.0 -_Name=Time & Date -_Comment=Change your clock and date settings -Icon=preferences-system-time -TryExec=gnome-control-center -Exec=gnome-control-center indicator-datetime -StartupNotify=true -Type=Application -Categories=GNOME;GTK;Utility;DesktopSettings;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel; -X-GNOME-Settings-Panel=indicator-datetime -OnlyShowIn=Unity; diff --git a/debian/changelog b/debian/changelog index aba1f93..db7319e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-datetime (12.10.3daily13.06.05-0ubuntu1) UNRELEASED; urgency=low + + * Rename .desktop file for compatibility with gnome-control-center 3.8 + + -- Jeremy Bicha Wed, 05 Jun 2013 14:30:22 -0400 + indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) saucy; urgency=low * debian/control, configure.ac: Remove obsolete dependency on diff --git a/po/POTFILES.in b/po/POTFILES.in index d22e5f9..0227a19 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,4 +5,4 @@ src/datetime-prefs-locations.c src/utils.c src/settings-shared.h [type: gettext/glade]data/datetime-dialog.ui -data/indicator-datetime-preferences.desktop.in +data/gnome-indicator-datetime-panel.desktop.in -- cgit v1.2.3 From 1c5dd360d042df5d1d0538a99d76503012195147 Mon Sep 17 00:00:00 2001 From: Automatic PS uploader Date: Fri, 7 Jun 2013 02:02:42 +0000 Subject: Releasing 12.10.3daily13.06.07-0ubuntu1, based on r220 --- debian/changelog | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index db7319e..755ba27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -indicator-datetime (12.10.3daily13.06.05-0ubuntu1) UNRELEASED; urgency=low +indicator-datetime (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low + [ Jeremy Bicha ] * Rename .desktop file for compatibility with gnome-control-center 3.8 - -- Jeremy Bicha Wed, 05 Jun 2013 14:30:22 -0400 + [ Ubuntu daily release ] + * Automatic snapshot from revision 220 + + -- Ubuntu daily release Fri, 07 Jun 2013 02:02:41 +0000 indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) saucy; urgency=low -- cgit v1.2.3 From adcf6754fb52a1dd9ed099fe420eebbb4fcbb082 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 13 Jun 2013 11:54:37 +0100 Subject: Link test program in the right order. Importantly, make sure XORG_GTEST_LIBS comes after it as it uses pthread. --- debian/changelog | 7 +++++++ tests/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b40d288..5dd803e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (12.10.3daily13.06.07-0ubuntu2) UNRELEASED; urgency=low + + * Link test program in the right order. Importantly, make sure + XORG_GTEST_LIBS comes after it as it uses pthread. + + -- Iain Lane Thu, 13 Jun 2013 11:44:12 +0100 + indicator-datetime (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low [ Jeremy Bicha ] diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ca0cbc..f9676c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -24,10 +24,10 @@ AM_CXXFLAGS = $(GTEST_CXXFLAGS) TEST_LIBS = \ $(top_builddir)/src/.libs/libdatetime.so \ + libgtest.a \ $(INDICATOR_LIBS) \ $(COVERAGE_LDFLAGS) \ - $(XORG_GTEST_LDFLAGS) \ - libgtest.a + $(XORG_GTEST_LDFLAGS) TEST_CPPFLAGS = \ $(AM_CPPFLAGS) \ -- cgit v1.2.3 From cf09eb8b3b120d99bb4e070689d5e48a75c893c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 13 Jun 2013 18:46:32 +0200 Subject: Include the missing version that got directly pushed to the distro... which is generally a bad idea. --- debian/changelog | 6 +++++- debian/control | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5dd803e..1342194 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -indicator-datetime (12.10.3daily13.06.07-0ubuntu2) UNRELEASED; urgency=low +indicator-datetime (12.10.3daily13.06.07-0ubuntu2) saucy; urgency=low + [ Ian Lane ] * Link test program in the right order. Importantly, make sure XORG_GTEST_LIBS comes after it as it uses pthread. + [ Jonathan Riddell ] + * Build against libical 1.0 + -- Iain Lane Thu, 13 Jun 2013 11:44:12 +0100 indicator-datetime (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low diff --git a/debian/control b/debian/control index 6b60f90..b0488f4 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), libido3-0.1-dev (>= 0.2.90), libgeoclue-dev (>= 0.12.0), libecal1.2-dev (>= 3.5), - libical-dev (>= 0.48), + libical-dev (>= 1.0), libgtk-3-dev (>= 3.1.4), libcairo2-dev (>= 1.10), libjson-glib-dev, -- cgit v1.2.3 From 360589faa26e678eaa00821eafb2ec3c7a9bf867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 13 Jun 2013 18:54:18 +0200 Subject: Fixing the changelog --- debian/changelog | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1342194..814a60d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,15 @@ -indicator-datetime (12.10.3daily13.06.07-0ubuntu2) saucy; urgency=low +indicator-datetime (12.10.3daily13.06.07-0ubuntu3) UNRELEASED; urgency=low - [ Ian Lane ] * Link test program in the right order. Importantly, make sure XORG_GTEST_LIBS comes after it as it uses pthread. - [ Jonathan Riddell ] + -- Iain Lane Thu, 13 Jun 2013 11:44:12 +0100 + +indicator-datetime (12.10.3daily13.06.07-0ubuntu2) saucy; urgency=low + * Build against libical 1.0 - -- Iain Lane Thu, 13 Jun 2013 11:44:12 +0100 + -- Jonathan Riddell Thu, 13 Jun 2013 13:23:54 +0100 indicator-datetime (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low -- cgit v1.2.3