* moved all glade and channels files into subdirectories of data

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

11 files changed, 604 insertions, 0 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/data/channels/Debian.info.in b/data/channels/Debian.info.in
new file mode 100644
index 00000000..ea2d1e53
--- /dev/null
+++ b/data/channels/Debian.info.in
@@ -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/data/channels/Makefile b/data/channels/Makefile
new file mode 100644
index 00000000..3901f9cc
--- /dev/null
+++ b/data/channels/Makefile
@@ -0,0 +1,14 @@
+
+DOMAIN=update-manager
+INFO_IN_FILES := $(wildcard *.info.in)
+INFO_FILES := $(patsubst %.info.in,%.info,$(wildcard *.info.in))
+
+all: $(INFO_FILES)
+
+%.info: %.info.in ../po/$(DOMAIN).pot
+	sed 's/^_//g' < $< > $@
+	intltool-extract --type=gettext/rfc822deb $<
+	#intltool-merge -d ../po $< $@
+
+clean:
+	rm -f $(INFO_FILES) $(wildcard *.h)
\ No newline at end of file
diff --git a/data/channels/Makefile.am b/data/channels/Makefile.am
new file mode 100644
index 00000000..c9d63742
--- /dev/null
+++ b/data/channels/Makefile.am
@@ -0,0 +1,11 @@
+%.info: %.info.in
+	sed 's/^_//g' < $< > $@
+	$(INTLTOOL_EXTRACT) --type=gettext/rfc822deb $<
+
+datadir=$(prefix)/share/update-manager
+dinfodir = $(datadir)/dists
+dinfo_DATA = Debian.info Ubuntu.info
+
+EXTRA_DIST= $(dinfo_DATA)
+
+CLEANFILES = $(dinfo_DATA) $(dinfo_DATA:.info=.info.in.h)
diff --git a/data/channels/README.channels b/data/channels/README.channels
new file mode 100644
index 00000000..6bc76872
--- /dev/null
+++ b/data/channels/README.channels
@@ -0,0 +1,47 @@
+Channel Definition
+------------------
+
+The .info files allow to specify a set of default channels that is available
+in the dialog "add channel". The .info file whose name corresponds to the
+LSB release name is used, e.g. 'Ubuntu.info' on a Ubuntu system.
+
+Furthermore all .info files are used to render the channels presented in the
+sources list more user friendly.
+
+
+Tags
+----
+
+Suite:           the name of the dist used in the repository
+
+MatchSuite:      mainly used for cdroms. defaults to Suite
+
+ParentSuite:     the channel only appears as a component of the parent suite in
+                 the add dialog
+                 the components/sections of the suite correspond to the ones of
+	         the parent suite. specified components of the suite itself
+		 are ignored
+	
+Available:	 determs the availabilty of the suite in the add dialog.
+                 defaults to False
+
+RepositoryType:  does the repository contain binary or source packages
+
+BaseURI:         the base URI of the repository
+
+MatchURI:        used for identifing mirrors
+
+Description:     description of the suite. the translation is done through
+                 gettext at runtime
+
+Component:       a component/section of the suite (ignored if ParentSuite is
+                 set)
+
+Enabled:         activate the component by default (ignored if ParentSuite is 
+                 set)
+
+CompDescription: humand readable description of the component/section
+                 (ignored if ParentSuite is set). the translation is done
+		 through gettext at runtime
+
+
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/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
new file mode 100644
index 00000000..e01a9221
--- /dev/null
+++ b/data/channels/Ubuntu.info.in
@@ -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.06 'Dapper Drake'
+Component: main
+Enabled: 1
+_CompDescription: Officially supported
+_CompDescriptionLong: OpenSource software that is officially supported by Canonical Ltd. (main)
+Component: universe
+Enabled: 0
+_CompDescription: Community maintained (universe)
+_CompDescriptionLong: OpenSource software that is maintained by the community (universe)
+Component: restricted
+Enabled: 1
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary 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.06
+_Description: Cdrom with Ubuntu 6.06 '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: Important security updates
+
+Suite: dapper-updates
+ParentSuite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+_Description: Recommended updates
+
+Suite: dapper-backports
+ParentSuite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+_Description: Backported updates
+
+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/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