ubuntustudio-dev team mailing list archive

[Jackson Doak <Doak.jackson@xxxxxxxxx>]

Jackson Doak has proposed merging lp:~noskcaj/ubuntustudio/ubuntustudio-menu into lp:~ubuntustudio-dev/ubuntustudio/ubuntustudio-menu.

Requested reviews:
  Ubuntu Studio Development Team (ubuntustudio-dev)

For more details, see:
https://code.launchpad.net/~noskcaj/ubuntustudio/ubuntustudio-menu/+merge/181658

Some minor changes that help (i think)
-- 
https://code.launchpad.net/~noskcaj/ubuntustudio/ubuntustudio-menu/+merge/181658
Your team Ubuntu Studio Development Team is requested to review the proposed merge of lp:~noskcaj/ubuntustudio/ubuntustudio-menu into lp:~ubuntustudio-dev/ubuntustudio/ubuntustudio-menu.

=== modified file 'debian/control'
--- debian/control	2013-08-17 16:54:07 +0000
+++ debian/control	2013-08-22 20:57:40 +0000
@@ -5,14 +5,15 @@
 XSBC-Original-Maintainer: Luis de Bethencourt Guimerá <bethencourt@xxxxxxxxx>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntustudio-dev/ubuntustudio/ubuntustudio-menu
+Homepage: http://ubuntustudio.org/
+Vcs-Bzr: lp:~ubuntustudio-dev/ubuntustudio/ubuntustudio-menu
+Vcs-browser: https://code.launchpad.net/~ubuntustudio-dev/ubuntustudio/ubuntustudio-menu
 
 Package: ubuntustudio-menu
 Architecture: all
 Depends: ${misc:Depends}, ubuntustudio-installer, xdg-utils
-Conflicts:
 Description: Menu for Ubuntu Studio
- Installs a menu for Ubuntu Studio's use case. This menu has new audio
- production, video production, Graphics, Publishing and Photography
- subsections for Artistic creation. This menu is designed to be merged into
- any xdg (open desktop) menu such as, KDE or Xfce.
+ Menu for Ubuntu Studio's use case. This menu has new audio production, 
+ video production, Graphics, Publishing and Photography subsections for 
+ Artistic creation. This menu is designed to be merged into any 
+ xdg (open desktop) menu such as, KDE or Xfce.

=== modified file 'debian/copyright'
--- debian/copyright	2013-08-16 20:56:38 +0000
+++ debian/copyright	2013-08-22 20:57:40 +0000
@@ -1,8 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ubuntustudio-menu
+Upstream-Contact: Len Ovens <len@xxxxxxxxxxxxx>
 Source: https://code.launchpad.net/~ubuntustudio-dev/ubuntustudio/ubuntustudio-menu
 
 Files: *
-Copyright: 2012-2013 Len Ovens
+Copyright: 2012-2013 Len Ovens <len@xxxxxxxxxxxxx>
 License: GPL-2+
 
 Files: usr/share/icons/*
@@ -274,20 +276,19 @@
 
 
 License: GPL-2+
-   .
-   This package 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 2, or (at your option) 
-   any later version.
-   .
-   This package 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.
-   .
-   You should have received a copy of the GNU General Public License 
-   allong with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-   .
+ This package 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 2, or (at your option) 
+ any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License 
+ allong with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
  On Debian GNU/Linux systems, the complete text of the GNU General 
  Public License can  be found in `/usr/share/common-licenses/GPL-2'. 

=== modified file 'debian/rules'
--- debian/rules	2013-06-03 02:54:39 +0000
+++ debian/rules	2013-08-22 20:57:40 +0000
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 %:
 	dh $@