* moved all glade and channels files into subdirectories of data

* do not install obsolete files to update-manager/channels

12 files changed, 272 insertions, 5 deletions

diff --git a/data/channels/Debian.info b/data/channels/Debian.info
new file mode 100644
index 00000000..3958607a
--- /dev/null
+++ b/data/channels/Debian.info
@@ -0,0 +1,57 @@
+ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog
+
+Suite: sarge
+RepositoryType: deb
+BaseURI: http://http.us.debian.org/debian/
+Description: Debian 3.1 "Sarge"
+Component: main
+Enabled: 1
+CompDescription: Officially supported
+Component: contrib
+Enabled: 0
+CompDescription: DFSG-compatible Software with Non-Free Dependencies
+Component: non-free
+Enabled: 0
+CompDescription: Non-DFSG-compatible Software
+
+Suite: sarge/updates
+RepositoryType: deb
+BaseURI: http://security.debian.org/
+Description: Debian 3.1 "Sarge" Security Updates
+Component: main
+Enabled: 1
+CompDescription: Officially supported
+Component: contrib
+Enabled: 0
+CompDescription: DFSG-compatible Software with Non-Free Dependencies
+Component: non-free
+Enabled: 0
+CompDescription: Non-DFSG-compatible Software
+
+Suite: etch
+RepositoryType: deb
+BaseURI: http://http.us.debian.org/debian/
+Description: Debian "Etch" (testing)
+Component: main
+Enabled: 1
+CompDescription: Officially supported
+Component: contrib
+Enabled: 0
+CompDescription: DFSG-compatible Software with Non-Free Dependencies
+Component: non-free
+Enabled: 0
+CompDescription: Non-DFSG-compatible Software
+
+Suite: sid
+RepositoryType: deb
+BaseURI: http://http.us.debian.org/debian/
+Description: Debian "Sid" (unstable)
+Component: main
+Enabled: 1
+CompDescription: Officially supported
+Component: contrib
+Enabled: 0
+CompDescription: DFSG-compatible Software with Non-Free Dependencies
+Component: non-free
+Enabled: 0
+CompDescription: Non-DFSG-compatible Software
diff --git a/channels/Debian.info.in b/data/channels/Debian.info.in
index ea2d1e53..ea2d1e53 100644
--- a/channels/Debian.info.in
+++ b/data/channels/Debian.info.in
diff --git a/channels/Makefile b/data/channels/Makefile
index 3901f9cc..3901f9cc 100644
--- a/channels/Makefile
+++ b/data/channels/Makefile
diff --git a/channels/Makefile.am b/data/channels/Makefile.am
index c9d63742..c9d63742 100644
--- a/channels/Makefile.am
+++ b/data/channels/Makefile.am
diff --git a/channels/README.channels b/data/channels/README.channels
index 6bc76872..6bc76872 100644
--- a/channels/README.channels
+++ b/data/channels/README.channels
diff --git a/data/channels/Ubuntu.info b/data/channels/Ubuntu.info
new file mode 100644
index 00000000..28fe85b3
--- /dev/null
+++ b/data/channels/Ubuntu.info
@@ -0,0 +1,209 @@
+ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
+
+Suite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 6.04 'Dapper Drake'
+Component: main
+Enabled: 1
+CompDescription: Officially supported
+CompDescriptionLong: Free software that is officially supported by Canonical Ltd. (main)
+Component: universe
+Enabled: 0
+CompDescription: Community maintained (universe)
+CompDescriptionLong: Free software that is maintained by the community (universe)
+Component: restricted
+Enabled: 1
+CompDescription: Non-free drivers
+CompDescriptionLong: Non-free drivers for devices (restricted) 
+Component: multiverse
+Enabled: 0
+CompDescription: Restricted software (Multiverse)
+CompDescriptionLong: Software that is restricted by copyright or legal issues (multiverse)
+
+Suite: dapper
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*6.04
+Description: Cdrom with Ubuntu 6.04 'Dapper Drake'
+Available: False
+Component: main
+Enabled: 1
+CompDescription: Oficially supported
+Component: restricted
+Enabled: 1
+CompDescription: Restricted copyright
+
+Suite: dapper-security
+ParentSuite: dapper
+RepositoryType: deb
+BaseURI: http://security.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+Description: Ubuntu 6.04 Security Updates
+
+Suite: dapper-updates
+ParentSuite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 6.04 Updates
+
+Suite: dapper-backports
+ParentSuite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 6.04 Backports
+
+Suite: dapper-backports
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 5.10 'Breezy Badger'
+Component: main
+Enabled: 1
+CompDescription: Officially supported
+Component: restricted
+Enabled: 1
+CompDescription: Restricted copyright
+Component: universe
+Enabled: 0
+CompDescription: Community maintained (Universe)
+Component: multiverse
+Enabled: 0
+CompDescription: Non-free (Multiverse)
+
+Suite: breezy
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*5.10
+Description: Cdrom with Ubuntu 5.10 'Breezy Badger'
+Available: False
+Component: main
+Enabled: 1
+CompDescription: Oficially supported
+Component: restricted
+Enabled: 1
+CompDescription: Restricted copyright
+
+Suite: breezy-security
+ParentSuite: breezy
+RepositoryType: deb
+BaseURI: http://security.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+Description: Ubuntu 5.10 Security Updates
+
+Suite: breezy-updates
+ParentSuite: breezy
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 5.10 Updates
+
+Suite: breezy-backports
+ParentSuite: breezy
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 5.10 Backports
+
+Suite: hoary
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 5.04 'Hoary Hedgehog'
+Component: main
+Enabled: 1
+CompDescription: Oficially supported
+Component: restricted
+Enabled: 1
+CompDescription: Restricted copyright
+Component: universe
+Enabled: 0
+CompDescription: Community maintained (Universe)
+Component: multiverse
+Enabled: 0
+CompDescription: Non-free (Multiverse)
+
+Suite: hoary
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*5.04
+Description: Cdrom with Ubuntu 5.04 'Hoary Hedgehog'
+Available: False
+Component: main
+Enabled: 1
+CompDescription: Oficially supported
+Component: restricted
+Enabled: 1
+CompDescription: Restricted copyright
+
+Suite: hoary-security
+ParentSuite: hoary
+RepositoryType: deb
+BaseURI: http://security.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+Description: Ubuntu 5.04 Security Updates
+
+Suite: hoary-updates
+ParentSuite: hoary
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 5.04 Updates
+
+Suite: hoary-backports
+ParentSuite: hoary
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 5.04 Backports
+
+Suite: warty
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 4.10 'Warty Warthog'
+Component: main
+Enabled: 1
+CompDescription: Oficially supported
+Component: restricted
+Enabled: 1
+CompDescription: Restricted copyright
+Component: universe
+Enabled: 0
+CompDescription: Community maintained (Universe)
+Component: multiverse
+Enabled: 0
+CompDescription: Non-free (Multiverse)
+
+Suite: warty
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*4.10
+Description: Cdrom with Ubuntu 4.10 'Warty Warthog'
+Available: False
+Component: main
+Enabled: 1
+CompDescription: Oficially supported
+Component: restricted
+Enabled: 1
+CompDescription: Restricted copyright
+
+Suite: warty-security
+ParentSuite: warty
+RepositoryType: deb
+BaseURI: http://security.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/|security.ubuntu.com
+Description: Ubuntu 4.10 Security Updates
+
+Suite: warty-updates
+ParentSuite: warty
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 4.10 Updates
+
+Suite: warty-backports
+ParentSuite: warty
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+Description: Ubuntu 4.10 Backports
diff --git a/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index e01a9221..e01a9221 100644
--- a/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
diff --git a/data/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade
index 08ffd743..08ffd743 100644
--- a/data/SoftwareProperties.glade
+++ b/data/glade/SoftwareProperties.glade
diff --git a/data/SoftwarePropertiesDialogs.glade b/data/glade/SoftwarePropertiesDialogs.glade
index b381965b..b381965b 100644
--- a/data/SoftwarePropertiesDialogs.glade
+++ b/data/glade/SoftwarePropertiesDialogs.glade
diff --git a/data/UpdateManager.glade b/data/glade/UpdateManager.glade
index 1221e78c..1221e78c 100644
--- a/data/UpdateManager.glade
+++ b/data/glade/UpdateManager.glade
diff --git a/data/dialog_add_channels.glade b/data/glade/dialog_add_channels.glade
index a0e00a53..a0e00a53 100644
--- a/data/dialog_add_channels.glade
+++ b/data/glade/dialog_add_channels.glade
diff --git a/setup.py b/setup.py
index 798fea0e..be346881 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ os.system("cd po; make update-po")
 # do the same for the desktop files
 os.system("cd data; make")
 # and channels
-os.system("cd channels; make")
+os.system("cd data/channels; make")
     
 setup(name='update-manager',
       version='0.42.2',
@@ -60,10 +60,13 @@ setup(name='update-manager',
                ],
       data_files=[
                   ('share/update-manager/glade',
-                     glob.glob("data/*.glade")
+                     glob.glob("data/glade/*.glade")
+                  ),
+                  ('share/doc/update-manager',
+                     glob.glob("data/channels/README.channels")
                   ),
                   ('share/update-manager/channels',
-                     glob.glob("channels/*")
+                     glob.glob("data/channels/*.info")
                   ),
                   ('share/applications',
                      ["data/update-manager.desktop",
@@ -74,5 +77,3 @@ setup(name='update-manager',
                   ),
                   ] + I18NFILES + HELPFILES + ICONS,
       )
-
-