Merge from ubuntu-desktop

6 files changed, 47 insertions, 73 deletions

diff --git a/debian/changelog b/debian/changelog
index c087ed4..8bb1a90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,18 @@
-indicator-datetime (0.0.1~dev-0ubuntu1~ppa5) lucid; urgency=low
+indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low
 
-  * Upstream Merge
-    * Date menuitem, calendar menuitem and settings menuitem
+  * debian/control:
+    - fix build-dep
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 17 Feb 2010 22:38:00 -0600
+ -- Didier Roche <didrocks@ubuntu.com>  Thu, 11 Feb 2010 20:27:22 +0100
 
-indicator-datetime (0.0.1~dev-0ubuntu1~ppa4) lucid; urgency=low
+indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low
 
-  * Bumping for rebuild with new dbusmenu
+  * new upstream version
 
- -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 10:08:03 -0600
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 10 Feb 2010 12:10:48 +0100
 
-indicator-datetime (0.0.1~dev-0ubuntu1~ppa3) lucid; urgency=low
+indicator-datetime (0.0.1~r1-0ubuntu1) lucid; urgency=low
 
-  * Bump version for rebuild
+  * Initial packaging
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 19:04:57 -0800
-
-indicator-datetime (0.0.1~dev-0ubuntu1~ppa2) karmic; urgency=low
-
-  * Upstream merge
-    * Adding in an indicator
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 07 Jan 2010 08:34:01 -0600
-
-indicator-datetime (0.0.1~dev-0ubuntu1~ppa1) karmic; urgency=low
-
-  * Initial release.
-
- -- Ted Gould <ted@ubuntu.com>  Wed, 06 Jan 2010 10:34:29 -0600
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 27 Jan 2010 12:13:00 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index fa9dcf8..5347b7d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,20 @@
 Source: indicator-datetime
-Section: gnome
+Section: misc
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-Build-Depends: debhelper (>= 5.0),
-               cdbs (>= 0.4.41),
-               libgtk2.0-dev (>= 2.12.0),
-               libdbus-glib-1-dev,
-               libindicator-dev (>= 0.3.0~dev),
-               libdbusmenu-glib-dev (>= 0.1.2),
-               libdbusmenu-gtk-dev (>= 0.1.2),
-               intltool
-Standards-Version: 3.8.2
-Homepage: https://launchpad.net/indicator-datetime
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+Build-Depends: cdbs, 
+               debhelper (>= 5), 
+               pkg-config,
+               intltool (>= 0.35.0), 
+               libindicator-dev (>= 0.3.0),
+               libdbusmenu-glib-dev (>= 0.1.1)
+Standards-Version: 3.8.3
+Homepage: https://launchpad.net/indicator-applet-developers
 
 Package: indicator-datetime
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}, 
          ${misc:Depends}
-Description: An indicator showing the date and time.
- .
- This indicator is designed to be placed on the right side of a panel and
- give the user easy way to find out the date and time.
- .
- It requires some way to be hosted into a panel.  For the GNOME Panel the
- appropriate package is indicator-applet.
+Description: A very, very simple clock
+ A simple clock appearing in the indicator bar
+
diff --git a/debian/copyright b/debian/copyright
index e3a5693..1db6a43 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
-This package was debianized by Ted Gould <ted@canonical.com> on
-Wed Jan  6 10:29:45 CST 2010.
+This package was debianized by Didier Roche <didrocks@ubuntu.com> on
+Wed, 10 Feb 2010 11:11:01 +0100.
 
 It was downloaded from https://launchpad.net/indicator-datetime
 
@@ -9,25 +9,19 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C) 2010 Canonical Ltd
+    Copyright (C) 2009 Canonical Ltd
 
 License:
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 3 as
-    published by the Free Software Foundation.
  
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License
+  as published by the Free Software Foundation; either version 3
+  of the License, or (at your option) any later version.
  
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Canonical Ltd
-
-On Debian/Ubuntu systems, the full text of the full text of the GPL v3 can be
-found in `/usr/share/common-licenses/GPL-3'
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+The Debian packaging is (C) 2010, Canonical Ltd. and is licensed under the 
+GPLv3, see /usr/share/common-licenses/GPL-3.
diff --git a/debian/rules b/debian/rules
index 2217018..87f7f7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,12 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-
-DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators
-
-binary-install/indicator-datetime::
-	# remove .a/.la clutter
-	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
-	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la
+install/indicator-datetime::
+	find debian/indicator-datetime/usr/lib -name \*.la -exec rm {} \;
+	find debian/indicator-datetime/usr/lib -name \*.a -exec rm {} \;
 
+common-binary-post-install-arch:: list-missing
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..641f050
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/indicator-datetime/+download .*/indicator-datetime-([0-9.]+)\.tar\.gz