Merge branch 'master' of github.com:KanoComputing/kano-desktop

KanoComputing · Jun 17, 2014 · a6a9efa · a6a9efa
2 parents 9f453a2 + 8542e7b
commit a6a9efa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+kano-desktop (1.1-1) unstable; urgency=low
+
+  * Prerelease review
+
+ -- Team Kano <[email protected]>  Tue, 17 Jun 2014 20:29:10 +0000
+
 kano-desktop (1.0-61) unstable; urgency=low
 
   * kano-fonts separated

diff --git a/debian/control b/debian/control
@@ -7,10 +7,10 @@ Build-Depends: debhelper (>=9.0.0)
 
 Package: kano-desktop
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}, openbox (>=3.5.2-4~kano.1),
+Depends: ${misc:Depends}, openbox (>=3.5.2-4~kano.1),
          kdesk (>=1.1-02), chromium, kano-themes, lxmenu-data (>=0.1.2-3~kano)
-Replaces: kano-settings (<< 1.1-1.20140512build2)
-Breaks: kano-settings (<< 1.1-1.20140512build2)
+Replaces: kano-settings (<< 1.1-1.20140512build2), kano-feedback (<< 1.1-3)
+Breaks: kano-settings (<< 1.1-1.20140512build2), kano-feedback (<< 1.1-3)
 Description: The desktop experience of Kanux
  This package contains a variety of configuration files and resources that
  make up the whole KANO desktop experience on top of LXDE.
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)