* debian/byobu-extras.install, debian/control, debian/install,

debian/release.sh, debian/rules, generate, rpm/byobu.spec: eliminate
    the byobu-extras package; this was originally created because we
    used to force select-screen-profile on first run, and the number of
    profiles was overwhelming;  we're no longer doing this, and this
    separate package is more trouble than its worth


Signed-off-by: Dustin Kirkland <kirkland@canonical.com>

debian/byobu-extras.install

@@ -1 +0,0 @@
-profiles/*_* usr/share/byobu/profiles

debian/changelog

@@ -13,11 +13,17 @@ byobu (2.17) unreleased; urgency=low
   * debian/postinst, debian/screen-profiles.postinst: ensure that
     /usr/bin/screen doesn't disappear, which causes the dpkg-divert
     removal to fail; LP: #390808
+  * debian/byobu-extras.install, debian/control, debian/install,
+    debian/release.sh, debian/rules, generate, rpm/byobu.spec: eliminate
+    the byobu-extras package; this was originally created because we
+    used to force select-screen-profile on first run, and the number of
+    profiles was overwhelming;  we're no longer doing this, and this
+    separate package is more trouble than its worth
 
   [ Ciemon Dunville ]
   * byobu.1: update description, add note about units of measure
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 26 Jun 2009 11:39:04 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 26 Jun 2009 11:51:11 -0500
 
 byobu (2.16-0ubuntu1) karmic; urgency=low
 

debian/control

@@ -11,10 +11,10 @@ Package: byobu
 Architecture: all
 Depends: ${misc:Depends}, debconf (>= 0.5) | debconf-2.0, screen, gettext-base, python, python-newt (>= 0.52.2-11)
 Recommends: update-notifier-common, lsb-release
-Suggests: byobu-extras, vim
+Suggests: vim
-Provides: screen-profiles
+Provides: screen-profiles, screen-profiles-extras
-Replaces: screen-profiles (<< 2.0)
+Replaces: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0)
-Conflicts: screen-profiles (<< 2.0)
+Conflicts: screen-profiles (<< 2.0), screen-profiles-extras (<< 2.0)
 Enhances: screen
 Description: a set of useful profiles and a profile-switcher for GNU screen
  byobu includes a set of profiles for the GNU screen window manager.
@@ -26,15 +26,10 @@ Description: a set of useful profiles and a profile-switcher for GNU screen
  their .screenrc to any of the available profiles.
 
 Package: byobu-extras
-Architecture: all
 Depends: ${misc:Depends}, byobu
-Provides: screen-profiles-extras
+Architecture: all
-Replaces: screen-profiles-extras (<< 2.0)
+Description: package subsumed by byobu
-Conflicts: screen-profiles-extras (<< 2.0)
+ This package has been subsumed by 'byobu'.
-Description: additional colored profiles for the byobu package
- The byobu contains a basic set of light and dark screen profiles.
- The byobu-extras package provides additional profiles of various
- different light and dark colors.
 
 Package: screen-profiles
 Depends: ${misc:Depends}, byobu
@@ -43,7 +38,7 @@ Description: package renamed -> byobu
  This package has been renamed to 'byobu'.
 
 Package: screen-profiles-extras
-Depends: ${misc:Depends}, byobu-extras
+Depends: ${misc:Depends}, byobu
 Architecture: all
-Description: package renamed -> byobu-extras
+Description: package renamed -> byobu
- This package has been renamed to 'byobu-extras'.
+ This package has been renamed to 'byobu'.

debian/install

@@ -6,6 +6,7 @@ profiles/NONE usr/share/byobu/profiles
 profiles/black usr/share/byobu/profiles
 profiles/dark usr/share/byobu/profiles
 profiles/light usr/share/byobu/profiles
+profiles/*_* usr/share/byobu/profiles
 keybindings/* usr/share/byobu/keybindings
 statusrc etc/byobu
 windows/common usr/share/byobu/windows

debian/release.sh

@@ -21,7 +21,6 @@ gpg --armor --sign --detach-sig ../"$PKG"_*.orig.tar.gz
 
 # Create the rpm export
 sudo alien --to-rpm ../$PKG"_"$MAJOR.$minor"_all.deb"
-sudo alien --to-rpm ../$PKG"-extras_"$MAJOR.$minor"_all.deb"
 mv -f *.rpm ..
 rsync -aP ../*.rpm kirkland@people.ubuntu.com:~kirkland/public_html/$PKG/rpm
 

debian/rules

@@ -34,7 +34,7 @@ prebuild:
 
 build:
 	# auto-generate the logo'd light/dark profiles
-	./profiles/generate
+	./profiles_generator/generate
 
 clean:
 	dh_clean

profiles_generator/generate

@@ -25,7 +25,7 @@ if [ "$1" = "--clean" ]; then
 	exit 0
 fi
 echo "Generating profiles"
-cat profiles/profile.skel > profiles/light
+cat profiles_generator/profile.skel > profiles/light
 cp profiles/light profiles/dark
 sed -i "s/ Wk/ Kw/g" profiles/dark
 sed -i "s/kW/wK/g" profiles/dark

rpm/byobu.spec

@@ -17,30 +17,6 @@ Requires:       screen, python >= 2.5, newt, gettext
 #   help.txt is in different locations under RPM/DEB
 #   python 2.5 is not available on RHEL 5
 
-%package extras
-Summary:        a set of useful profiles and a profile-switcher for GNU screen
-Group:          Applications/System
-Requires:	byobu
-
-%description
-byobu includes a set of profiles for the GNU screen window manager.
-These profiles are quite useful on server machines which are not running
-a graphical desktop.  The 'screen' command provides a number of advanced
-features are not necessarily exposed in the default profile.  These profiles
-provide features such as status bars, clocks, notifiers (reboot required,
-updates available), etc.  The profile-switcher allows users to quickly switch
-their .screenrc to any of the available profiles.
-
-update-notifier-common provides a more efficient and standard mechanism for
-calculating the number of updates available in the status panel.
-
-
-%description extras
-The byobu package contains a basic set of light and dark profiles.
-The byobu-extras package provides additional profiles of various
-different light and dark colors.
-
-
 %prep
 %setup -q -n %{name}_%{version}.orig
 
@@ -133,18 +109,6 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/byobu/profiles/common
 /usr/share/byobu/profiles/dark
 /usr/share/byobu/profiles/light
-/usr/share/byobu/byobu-launcher-install
-/usr/share/byobu/byobu-launcher-uninstall
-/usr/share/byobu/windows/common
-%doc README
-%doc doc/help.txt
-%doc debian/copyright
-%doc debian/changelog
-%doc COPYING
-
-
-%files extras
-%defattr(-,root,root,-)
 /usr/share/byobu/profiles/dark_blue
 /usr/share/byobu/profiles/dark_cyan
 /usr/share/byobu/profiles/dark_green
@@ -157,6 +121,14 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/byobu/profiles/light_purple
 /usr/share/byobu/profiles/light_red
 /usr/share/byobu/profiles/light_yellow
+/usr/share/byobu/byobu-launcher-install
+/usr/share/byobu/byobu-launcher-uninstall
+/usr/share/byobu/windows/common
+%doc README
+%doc doc/help.txt
+%doc debian/copyright
+%doc debian/changelog
+%doc COPYING
 
 
 %changelog