Update conflicts

pop-os · Jun 20, 2017 · e953dbd · e953dbd
1 parent b080aee
commit e953dbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+pop-theme (1.0.2) zesty; urgency=medium
+
+  * Update conflicts
+
+ -- Jeremy Soller <jeremy@system76.com>  Tue, 20 Jun 2017 09:32:08 -0600
+
 pop-theme (1.0.1) zesty; urgency=medium
 
   * Rename to pop-theme

diff --git a/debian/control b/debian/control
@@ -2,12 +2,13 @@ Source: pop-theme
 Section: gnome
 Priority: optional
 Maintainer: Jeremy Soller <jeremy@system76.com>
-Uploaders: Jeremy Soller <jeremy@system76.com>
+Uploaders: Ian Santopietro <ian@system76.com>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.8
 Homepage: https://github.com/system76/pop-theme
 
 Package: pop-theme
 Architecture: all
 Depends: pop-fonts, pop-gtk-theme, pop-icon-theme
+Conflicts: system76-pop-theme
 Description: Pop Theme Metapackage